Ottomata has submitted this change and it was merged. Change subject: Don't alert on stopped eventlogging jobs on analytics1010 ......................................................................
Don't alert on stopped eventlogging jobs on analytics1010 Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d --- M manifests/role/eventlogging.pp M modules/eventlogging/manifests/monitoring/jobs.pp 2 files changed, 15 insertions(+), 4 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp index 213f0bc..6eeaac6 100644 --- a/manifests/role/eventlogging.pp +++ b/manifests/role/eventlogging.pp @@ -62,8 +62,6 @@ class { '::eventlogging': } - # make sure any defined eventlogging services are running - class { '::eventlogging::monitoring::jobs': } if $::standard::has_ganglia { class { '::eventlogging::monitoring::ganglia': } @@ -71,6 +69,7 @@ # This check was written for eventlog1001, so only include it there., if $::hostname == 'eventlog1001' { + # Alert when / gets low. (eventlog1001 has a 9.1G /) nrpe::monitor_service { 'eventlogging_root_disk_space': description => 'Eventlogging / disk space', @@ -88,6 +87,18 @@ contact_group => 'analytics', } } + + + # analytics1010 is temporarily being used as a staging perf test + # host for the EventLogging on Kafka project. Disable job alerts there. + $monitor_jobs_ensure = $::hostname ? { + 'analytics1010' => 'absent', + default => 'present', + } + # make sure any defined eventlogging services are running + class { '::eventlogging::monitoring::jobs': + ensure => $monitor_jobs_ensure, + } } diff --git a/modules/eventlogging/manifests/monitoring/jobs.pp b/modules/eventlogging/manifests/monitoring/jobs.pp index 96032da..47364f9 100644 --- a/modules/eventlogging/manifests/monitoring/jobs.pp +++ b/modules/eventlogging/manifests/monitoring/jobs.pp @@ -3,14 +3,14 @@ # Installs an icinga check to make sure all defined # eventlogging services are running. # -class eventlogging::monitoring::jobs { +class eventlogging::monitoring::jobs($ensure = 'present') { file { '/usr/lib/nagios/plugins/check_eventlogging_jobs': source => 'puppet:///modules/eventlogging/check_eventlogging_jobs', mode => '0755', } nrpe::monitor_service { 'eventlogging-jobs': - ensure => 'present', + ensure => $ensure, description => 'Check status of defined EventLogging jobs', nrpe_command => '/usr/lib/nagios/plugins/check_eventlogging_jobs', require => File['/usr/lib/nagios/plugins/check_eventlogging_jobs'], -- To view, visit https://gerrit.wikimedia.org/r/234546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Milimetric <dandree...@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