Filippo Giunchedi has submitted this change and it was merged.
Change subject: diamond: send labs instance metrics via graphite/carbon
......................................................................
diamond: send labs instance metrics via graphite/carbon
use carbon line protocol, to be received by carbon-c-relay
Bug: T121861
Change-Id: I2b7abaa44678a7b26c988cade898313d1e42085b
---
M modules/standard/manifests/diamond.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/standard/manifests/diamond.pp
b/modules/standard/manifests/diamond.pp
index aa05afb..0d52ad8 100644
--- a/modules/standard/manifests/diamond.pp
+++ b/modules/standard/manifests/diamond.pp
@@ -4,20 +4,25 @@
case $::realm {
'labs': {
$host = '10.64.37.13' # labmon1001
+ $port = '2003'
# Prefix labs metrics with project name
$path_prefix = $::labsproject
$keep_logs_for = '0' # Current day only
$service = true
+ $handler = 'diamond.handler.graphite.GraphiteHandler'
}
default: {
$host = '10.64.32.155' # graphite1001
+ $port = '8125'
$path_prefix = 'servers'
$keep_logs_for = '5'
$service = true
+ $handler = 'diamond.handler.stats_d.StatsdHandler'
}
}
class { '::diamond':
+ handler => $handler,
path_prefix => $path_prefix,
keep_logs_for => $keep_logs_for,
service => $service,
@@ -27,7 +32,7 @@
enabled => 'true',
# lint:endignore
host => $host,
- port => '8125',
+ port => $port,
batch => '20',
},
}
--
To view, visit https://gerrit.wikimedia.org/r/268360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b7abaa44678a7b26c988cade898313d1e42085b
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
