Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/132131
Change subject: role class for diamond, move generic into init
......................................................................
role class for diamond, move generic into init
WIP.. to discuss with Chase
Change-Id: I518225d8913c8f10354a487a05be9c1e76dfb595
---
A manifests/role/diamond.pp
M manifests/site.pp
D modules/diamond/manifests/generic.pp
M modules/diamond/manifests/init.pp
4 files changed, 40 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/132131/1
diff --git a/manifests/role/diamond.pp b/manifests/role/diamond.pp
new file mode 100644
index 0000000..f2ac023
--- /dev/null
+++ b/manifests/role/diamond.pp
@@ -0,0 +1,18 @@
+# role class for diamond
+class role::diamond {
+
+ #these are notes just for initial rollout and testing:
+ #tungsten: 10.64.0.18
+ #(labs) athens graphite server: 10.68.17.73
+ #Once https://gerrit.wikimedia.org/r/#/c/131449/ merges
+ #start batching in groups of 10 to start, for now current statsd can't
+ #accept multiple metrics
+ class { 'diamond':
+ settings => {
+ enabled => 'true',
+ host => '10.64.0.18', # tungsten
+ port => '8125',
+ },
+ }
+
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4ad57b1..2a9dd9b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -277,7 +277,7 @@
}
include standard
- include diamond::generic
+ include role::diamond
include subversion::client
include admins::roots
include admins::mortals
@@ -350,7 +350,7 @@
}
include standard
- include diamond::generic
+ include role::diamond
include backup::client
include role::installserver
}
@@ -958,7 +958,7 @@
$cluster = 'misc'
include standard
- include diamond::generic
+ include role::diamond
include admins::roots
include admins::mortals
include admins::restricted
@@ -1018,7 +1018,7 @@
}
include standard
- include diamond::generic
+ include role::diamond
include contint::firewall
include role::ci::master
include role::ci::slave
@@ -1172,7 +1172,7 @@
}
include standard
- include diamond::generic
+ include role::diamond
include admins::roots
include misc::management::ipmi
include role::access_new_install
@@ -1319,7 +1319,7 @@
node 'lanthanum.eqiad.wmnet' {
include standard
- include diamond::generic
+ include role::diamond
include admins::roots
include admins::jenkins
include role::ci::slave # RT #5074
@@ -2547,7 +2547,7 @@
# Primary Graphite, StatsD, and profiling data aggregation host.
node 'tungsten.eqiad.wmnet' {
include standard
- include diamond::generic
+ include role::diamond
include role::graphite
include role::txstatsd
include role::gdash
diff --git a/modules/diamond/manifests/generic.pp
b/modules/diamond/manifests/generic.pp
deleted file mode 100644
index d04b51b..0000000
--- a/modules/diamond/manifests/generic.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-class diamond::generic() {
-
- #these are notes just for initial rollout and testing:
- #tungsten: 10.64.0.18
- #(labs) athens graphite server: 10.68.17.73
- #Once https://gerrit.wikimedia.org/r/#/c/131449/ merges
- #start batching in groups of 10 to start, for now current statsd can't
- #accept multiple metrics
- class { 'diamond':
- settings => {
- enabled => 'true',
- host => '10.64.0.18',
- port => '8125',
- },
- }
-
- diamond::collector { 'CPU':
- settings => {
- enabled => 'true',
- percore => 'false',
- normalize => 'true',
- },
- }
-
- diamond::collector { 'Network':
- settings => {
- enabled => 'true',
- },
- }
-}
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 61a24fb..f1175cc 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -74,4 +74,19 @@
require => Package['python-diamond'],
subscribe => File['/etc/diamond/diamond.conf'],
}
+
+
+ diamond::collector { 'CPU':
+ settings => {
+ enabled => 'true',
+ percore => 'false',
+ normalize => 'true',
+ },
+ }
+
+ diamond::collector { 'Network':
+ settings => {
+ enabled => 'true',
+ },
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/132131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I518225d8913c8f10354a487a05be9c1e76dfb595
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
