Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326904 )
Change subject: Set systemd dependency correctly for vk statsv/el instances ...................................................................... Set systemd dependency correctly for vk statsv/el instances While checking Varnishkafka graphs in Grafana I noticed that the varnishkafka statsv and eventlogging instances were restarting at the same time sporadically, meanwhile this didn't happen for the webrequest instance. I checked their systemd units and statsv/eventlogging are dependend on the varnish instance, not the varnish-frontend one. Add also some documentation to the role parameters. Change-Id: I3ebf095c2d77dbad4541e6a2808baf345454e561 --- M modules/role/manifests/cache/kafka/eventlogging.pp M modules/role/manifests/cache/kafka/statsv.pp M modules/role/manifests/cache/kafka/webrequest.pp 3 files changed, 42 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/326904/1 diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp b/modules/role/manifests/cache/kafka/eventlogging.pp index c0e2b8b..98bc818 100644 --- a/modules/role/manifests/cache/kafka/eventlogging.pp +++ b/modules/role/manifests/cache/kafka/eventlogging.pp @@ -1,6 +1,22 @@ +# == Class role::cache::kafka::eventlogging +# +# Sets up a varnishkafka logging endpoint for collecting +# analytics events coming from external clients. +# +# More info: https://wikitech.wikimedia.org/wiki/Analytics/EventLogging +# +# === Parameters +# +# [*varnish_name*] +# The name of the varnish instance to read shared logs from. +# Default 'frontend' +# [*varnish_svc_name*] +# The name of the init unit for the above. +# Default 'varnish-frontend' +# class role::cache::kafka::eventlogging( - $varnish_name = $::hostname, - $varnish_svc_name = 'varnish', + $varnish_name = 'frontend', + $varnish_svc_name = 'varnish-frontend' ) inherits role::cache::kafka { # Set varnish.arg.q or varnish.arg.m according to Varnish version diff --git a/modules/role/manifests/cache/kafka/statsv.pp b/modules/role/manifests/cache/kafka/statsv.pp index 29f3e44..1ceb76d 100644 --- a/modules/role/manifests/cache/kafka/statsv.pp +++ b/modules/role/manifests/cache/kafka/statsv.pp @@ -1,16 +1,22 @@ -# == Class role::cache::kafka::statsv +# === Define role::cache::kafka::statsv +# # Sets up a varnishkafka logging endpoint for collecting # application level metrics. We are calling this system # statsv, as it is similar to statsd, but uses varnish # as its logging endpoint. # -# == Parameters -# $varnish_name - the name of the varnish instance to read shared logs from. Default $::hostname -# $varnish_svc_name - the name of the varnish init service to read shared logs from. Default 'varnish' +# === Parameters +# +# [*varnish_name*] +# The name of the varnish instance to read shared logs from. +# Default 'frontend' +# [*varnish_svc_name*] +# The name of the init unit for the above. +# Default 'varnish-frontend' # class role::cache::kafka::statsv( - $varnish_name = $::hostname, - $varnish_svc_name = 'varnish', + $varnish_name = 'frontend', + $varnish_svc_name = 'varnish-frontend' ) inherits role::cache::kafka { $format = "%{fake_tag0@hostname?${::fqdn}}x %{%FT%T@dt}t %{X-Client-IP@ip}o %{@uri_path}U %{@uri_query}q %{User-Agent@user_agent}i" diff --git a/modules/role/manifests/cache/kafka/webrequest.pp b/modules/role/manifests/cache/kafka/webrequest.pp index 4ea2ced..0d6841f 100644 --- a/modules/role/manifests/cache/kafka/webrequest.pp +++ b/modules/role/manifests/cache/kafka/webrequest.pp @@ -1,11 +1,18 @@ -# == Class role::cache::kafka::webrequest +# === Define role::cache::kafka::webrequest +# # Sets up a varnishkafka instance producing varnish # webrequest logs to the analytics Kafka brokers in eqiad. # -# == Parameters -# $topic - the name of kafka topic to which to send messages -# $varnish_name - the name of the varnish instance to read shared logs from. Default 'frontend' -# $varnish_svc_name - the name of the init unit for the above, default 'varnish-frontend' +# === Parameters +# +# [*topic*] +# the name of kafka topic to which to send messages. +# [*varnish_name*] +# The name of the varnish instance to read shared logs from. +# Default 'frontend' +# [*varnish_svc_name*] +# The name of the init unit for the above. +# Default 'varnish-frontend' # class role::cache::kafka::webrequest( $topic, -- To view, visit https://gerrit.wikimedia.org/r/326904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ebf095c2d77dbad4541e6a2808baf345454e561 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
