Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/142210
Change subject: Enable diamond collection on labs as well
......................................................................
Enable diamond collection on labs as well
Change-Id: I74f46f41cb81e756a920b2fdc545eb21a1f978d3
---
M manifests/role/diamond.pp
1 file changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/142210/1
diff --git a/manifests/role/diamond.pp b/manifests/role/diamond.pp
index 3fc1a7c..d2f8d99 100644
--- a/manifests/role/diamond.pp
+++ b/manifests/role/diamond.pp
@@ -8,27 +8,30 @@
#start batching in groups of 10 to start, for now current statsd can't
#accept multiple metrics
- if $::realm == 'production' {
+ # Point to diamond-collector on labs and tungsten on prod
+ case $::realm {
+ 'labs': { $host = '10.68.17.169' }
+ default: { $host = '10.64.0.18' }
+ }
- class { '::diamond':
- settings => {
- enabled => 'true',
- host => '10.64.0.18', # tungsten
- port => '8125',
- },
- }
+ class { '::diamond':
+ settings => {
+ enabled => 'true',
+ host => $host,
+ port => '8125',
+ },
+ }
- #IPVS collector seems to be enabled by default on trusty
- #causes non LVS hosts to spam with sudo violations for
- #stats collection among other things. Explicit disable
- #for now this needs to dealt with upstream.
- case $::operatingsystemrelease {
- '14.04': {
- diamond::collector { 'IPVS':
- settings => {
- enabled => 'false',
- },
- }
+ #IPVS collector seems to be enabled by default on trusty
+ #causes non LVS hosts to spam with sudo violations for
+ #stats collection among other things. Explicit disable
+ #for now this needs to dealt with upstream.
+ case $::operatingsystemrelease {
+ '14.04': {
+ diamond::collector { 'IPVS':
+ settings => {
+ enabled => 'false',
+ },
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/142210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74f46f41cb81e756a920b2fdc545eb21a1f978d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
