Elukey has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325317
Change subject: Add Nagios process alarms for statsv and EL varnishkafka
instance
......................................................................
Add Nagios process alarms for statsv and EL varnishkafka instance
On cache::text there are two more varnishkafka instances running,
collecting data for statsv and eventlogging.
Change-Id: I1da5280b2040f63a560775c1d9bde34e461897ab
---
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, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/325317/1
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 57802a5..6d7a886 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -27,6 +27,14 @@
include ::standard
+ # Generate icinga alert if varnishkafka is not running.
+ nrpe::monitor_service { 'varnishkafka-eventlogging':
+ description => 'Varnishkafka log producer',
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: -a
/usr/bin/varnishkafka -S /etc/varnishkafka/eventlogging.conf",
+ contact_group => 'admins,analytics',
+ require => Class['::varnishkafka'],
+ }
+
$cache_type = hiera('cache::cluster')
$graphite_metric_prefix =
"varnishkafka.${::hostname}.eventlogging.${cache_type}"
diff --git a/modules/role/manifests/cache/kafka/statsv.pp
b/modules/role/manifests/cache/kafka/statsv.pp
index 15115b4..5186996 100644
--- a/modules/role/manifests/cache/kafka/statsv.pp
+++ b/modules/role/manifests/cache/kafka/statsv.pp
@@ -37,6 +37,14 @@
include ::standard
+ # Generate icinga alert if varnishkafka is not running.
+ nrpe::monitor_service { 'varnishkafka-statsv':
+ description => 'Varnishkafka log producer',
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: -a
/usr/bin/varnishkafka -S /etc/varnishkafka/statsv.conf",
+ contact_group => 'admins,analytics',
+ require => Class['::varnishkafka'],
+ }
+
$cache_type = hiera('cache::cluster')
$graphite_metric_prefix = "varnishkafka.${::hostname}.statsv.${cache_type}"
diff --git a/modules/role/manifests/cache/kafka/webrequest.pp
b/modules/role/manifests/cache/kafka/webrequest.pp
index 447cfa9..95c0c5f 100644
--- a/modules/role/manifests/cache/kafka/webrequest.pp
+++ b/modules/role/manifests/cache/kafka/webrequest.pp
@@ -111,10 +111,11 @@
include ::standard
# Generate icinga alert if varnishkafka is not running.
- nrpe::monitor_service { 'varnishkafka':
- description => 'Varnishkafka log producer',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: -C
varnishkafka',
- require => Class['::varnishkafka'],
+ nrpe::monitor_service { 'varnishkafka-webrequest':
+ description => 'Varnishkafka log producer',
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: -a
/usr/bin/varnishkafka -S /etc/varnishkafka/webrequest.conf",
+ contact_group => 'admins,analytics',
+ require => Class['::varnishkafka'],
}
$cache_type = hiera('cache::cluster')
--
To view, visit https://gerrit.wikimedia.org/r/325317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1da5280b2040f63a560775c1d9bde34e461897ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
