Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154401
Change subject: diamond dupe def with apache::monitoring on labs
......................................................................
diamond dupe def with apache::monitoring on labs
I have an instance (integration-dev) which has apache::monitoring
applied which includes ::diamond. Since labs instances always have
::diamond included, I end up with a duplicate declaration:
Duplicate declaration: Class[Diamond] is already declared; cannot
redeclare at /etc/puppet/manifests/role/diamond.pp:40 on node
i-00000311.eqiad.wmflabs
Change-Id: I359299e7e19679e16cbae6975fc9c661f635670a
---
M modules/apache/manifests/monitoring.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/154401/1
diff --git a/modules/apache/manifests/monitoring.pp
b/modules/apache/manifests/monitoring.pp
index 5185615..e1ce1a3 100644
--- a/modules/apache/manifests/monitoring.pp
+++ b/modules/apache/manifests/monitoring.pp
@@ -7,9 +7,13 @@
#
class apache::monitoring {
include ::apache::mod::status
- include ::diamond
include ::ganglia
+ # Labs instance always have diamond
+ if $::realm != 'labs' {
+ include ::diamond
+ }
+
diamond::collector { 'Httpd': }
file { '/usr/lib/ganglia/python_modules/apache_status.py':
--
To view, visit https://gerrit.wikimedia.org/r/154401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I359299e7e19679e16cbae6975fc9c661f635670a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
