Ottomata has submitted this change and it was merged.
Change subject: Extract cache_type from $topic and use it in varnishkafka
statsd prefixes
......................................................................
Extract cache_type from $topic and use it in varnishkafka statsd prefixes
Change-Id: Ibebbab4dd12ff0e2f8a48f0c0f6b56664b00cd9f
---
M manifests/role/cache.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3a4dc65..81170d6 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -508,12 +508,15 @@
# are proven to work on mobiles.
include role::cache::varnish::statsd
+ # Extract cache type name from topic for use in statsd prefix.
+ # There is probably a better way to do this.
+ $cache_type = regsubst($topic, '^webrequest_(.+)$', '\1')
# Test using logster to send varnishkafka stats to statsd ->
graphite.
# This may be moved into the varnishkafka module.
logster::job { 'varnishkafka-webrequest':
parser => 'JsonLogster',
logfile =>
"/var/cache/varnishkafka/webrequest.stats.json",
- logster_options => "-o statsd --statsd-host=localhost:8125
--metric-prefix=varnishkafka.${::hostname}.webrequest.mobile",
+ logster_options => "-o statsd --statsd-host=localhost:8125
--metric-prefix=varnishkafka.${::hostname}.webrequest.${cache_type}",
require => Class['role::cache::varnish::statsd'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/182080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibebbab4dd12ff0e2f8a48f0c0f6b56664b00cd9f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
