Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/51792


Change subject: move all monitoring related stuff into new monitoring directory 
and include that in site.pp
......................................................................

move all monitoring related stuff into new monitoring directory and include 
that in site.pp

Change-Id: Ie519b59424c0d8060c33da50000579d1e6a01a01
---
R manifests/monitoring/ganglia.pp
R manifests/monitoring/icinga.pp
R manifests/monitoring/nagios.pp
R manifests/monitoring/nrpe.pp
M manifests/site.pp
5 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/51792/1

diff --git a/manifests/ganglia.pp b/manifests/monitoring/ganglia.pp
similarity index 100%
rename from manifests/ganglia.pp
rename to manifests/monitoring/ganglia.pp
diff --git a/manifests/misc/icinga.pp b/manifests/monitoring/icinga.pp
similarity index 100%
rename from manifests/misc/icinga.pp
rename to manifests/monitoring/icinga.pp
diff --git a/manifests/nagios.pp b/manifests/monitoring/nagios.pp
similarity index 100%
rename from manifests/nagios.pp
rename to manifests/monitoring/nagios.pp
diff --git a/manifests/nrpe.pp b/manifests/monitoring/nrpe.pp
similarity index 100%
rename from manifests/nrpe.pp
rename to manifests/monitoring/nrpe.pp
diff --git a/manifests/site.pp b/manifests/site.pp
index 3478437..9c01162 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -10,7 +10,6 @@
 import "dns.pp"
 import "drac.pp"
 import "facilities.pp"
-import "ganglia.pp"
 import "geoip.pp"
 import "gerrit.pp"
 import "imagescaler.pp"
@@ -21,12 +20,11 @@
 import "media-storage.pp"
 import "memcached.pp"
 import "misc/*.pp"
+import "monitoring/*.pp"
 import "mobile.pp"
 import "mysql.pp"
-import "nagios.pp"
 import "network.pp"
 import "nfs.pp"
-import "nrpe.pp"
 import "openstack.pp"
 import "poolcounter.pp"
 import "protoproxy.pp"

-- 
To view, visit https://gerrit.wikimedia.org/r/51792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie519b59424c0d8060c33da50000579d1e6a01a01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to