Yuvipanda has submitted this change and it was merged.
Change subject: labs: Move labmon role to labs::graphite role
......................................................................
labs: Move labmon role to labs::graphite role
And some small misc cleanup and consolidation
Change-Id: Ida0ee5059350853684abd859bd0fcf2a051947ba
---
R hieradata/role/common/labs/graphite.yaml
M manifests/role/graphite.pp
D manifests/role/labmon.pp
M manifests/site.pp
A modules/role/manifests/labs/graphite.pp
5 files changed, 24 insertions(+), 32 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/labmon.yaml
b/hieradata/role/common/labs/graphite.yaml
similarity index 100%
rename from hieradata/role/common/labmon.yaml
rename to hieradata/role/common/labs/graphite.yaml
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index ada0f35..665cbf9 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -316,17 +316,3 @@
}
}
-
-# == Class: role::graphite::labmon
-#
-# Sets up graphite instance for monitoring labs, running on production
hardware.
-# Instance is open to all, no password required to see metrics
-class role::graphite::labmon {
- class { 'role::graphite::base':
- storage_dir => '/srv/carbon',
- auth => false,
- hostname => 'graphite.wmflabs.org',
- }
-
- include graphite::labs::archiver
-}
diff --git a/manifests/role/labmon.pp b/manifests/role/labmon.pp
deleted file mode 100644
index 1b38836..0000000
--- a/manifests/role/labmon.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: labmon
-# Role for misc. setup of labs monitoring
-
-class role::labmon {
-
- class { 'role::graphite::labmon': }
-
- file { '/var/lib/carbon':
- ensure => link,
- target => '/srv/carbon',
- owner => '_graphite',
- group => '_graphite',
- require => Class['role::graphite::labmon']
- }
-
- include role::statsite
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index ca17275..c3f2b34 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1195,7 +1195,7 @@
# Labs Graphite and StatsD host
node 'labmon1001.eqiad.wmnet' {
- role labmon
+ role labs::graphite
include standard
}
diff --git a/modules/role/manifests/labs/graphite.pp
b/modules/role/manifests/labs/graphite.pp
new file mode 100644
index 0000000..2bf3ce1
--- /dev/null
+++ b/modules/role/manifests/labs/graphite.pp
@@ -0,0 +1,23 @@
+# = Class: role::labs::graphite
+# Sets up graphite instance for monitoring labs, running on production
hardware.
+# Instance is open to all, no password required to see metrics
+class role::labs::graphite {
+
+ class { 'role::graphite::base':
+ storage_dir => '/srv/carbon',
+ auth => false,
+ hostname => 'graphite.wmflabs.org',
+ }
+
+ include graphite::labs::archiver
+
+ file { '/var/lib/carbon':
+ ensure => link,
+ target => '/srv/carbon',
+ owner => '_graphite',
+ group => '_graphite',
+ require => Class['role::graphite::base']
+ }
+
+ include role::statsite
+}
--
To view, visit https://gerrit.wikimedia.org/r/255067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida0ee5059350853684abd859bd0fcf2a051947ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
