Ottomata has submitted this change and it was merged.
Change subject: Using monitor_ganglia for udp2log packet_loss_avg and
vanrishkafka drerr
......................................................................
Using monitor_ganglia for udp2log packet_loss_avg and vanrishkafka drerr
Change-Id: I16a0c34e97609ca0899dd8a1f974106f07d47173
---
M manifests/misc/udp2log.pp
M manifests/role/cache.pp
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index d335bff..ee941f0 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -253,9 +253,11 @@
# Set up nagios monitoring of packet loss
# for this udp2log instance.
- monitor_service { "udp2log-${name}-packetloss":
- description => "Packetloss_Average",
- check_command => "check_packet_loss_ave!4!8",
+ monitor_ganglia{ "udp2log-${name}-packetloss":
+ description => 'Packetloss_Average',
+ metric => 'packet_loss_average',
+ warning_threshold => '4',
+ critical_threshold => '8',
contact_group => "admins,analytics",
# ganglia-logtailer only runs every 5.
# let's make nagios check every 2 minutes (to match
ganglia_parser)
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 1f6a204..a12ef1c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -447,10 +447,12 @@
}
# Generate an alert if we ever see any delivery report errors
- monitor_service { 'varnishkafka-drerr':
- description => 'Varnishkafka Delivery Errors',
- check_command => "check_varnishkafka_drerr!0.0!0.0",
- require => Class['::varnishkafka::monitoring'],
+ monitor_ganglia { 'varnishkafka-drerr':
+ description => 'Varnishkafka Delivery Errors',
+ metric =>
'kafka.varnishkafka.kafka_drerr.per_second',
+ warning_threshold => '0.0',
+ critical_threshold => '0.0',
+ require => Class['::varnishkafka::monitoring'],
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/107893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16a0c34e97609ca0899dd8a1f974106f07d47173
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
