Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/142560
Change subject: rm old puppet_disabled check,replaced by new chk
......................................................................
rm old puppet_disabled check,replaced by new chk
the new "puppet run" check should also detect
those disabled puppet agents, so keeping the old
one would just cause duplicate alarms and longer/slower
Icinga config
Change-Id: I46d8e23ea0a96395252dc9323cb24c49f70614cf
---
D modules/base/files/monitoring/check_puppet_disabled
M modules/base/manifests/monitoring/host.pp
2 files changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/142560/1
diff --git a/modules/base/files/monitoring/check_puppet_disabled
b/modules/base/files/monitoring/check_puppet_disabled
deleted file mode 100755
index becbc99..0000000
--- a/modules/base/files/monitoring/check_puppet_disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/monitoring/check_puppet_disabled
-#####################################################################
-#
-# if lock file exists and has 0 size, then the lock is not part of a puppetrun
-# (Normal puppetrun locks contain process pid)
-#
-
-FILE=/var/lib/puppet/state/puppetdlock
-
-test -f $FILE && ! test -s $FILE && echo "WARNING: Orphan puppetlock detected"
&& exit 1
-
-echo "OK"
-exit 0
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 156581f..6cd36af 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -54,13 +54,6 @@
mode => '0555',
source => 'puppet:///modules/base/monitoring/check-raid.py';
}
- file { '/usr/local/lib/nagios/plugins/check_puppet_disabled':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/base/monitoring/check_puppet_disabled';
- }
file { '/usr/local/lib/nagios/plugins/check_puppetrun':
ensure => present,
owner => 'root',
@@ -112,10 +105,6 @@
nrpe::monitor_service { 'dpkg':
description => 'DPKG',
nrpe_command => '/usr/local/lib/nagios/plugins/check_dpkg',
- }
- nrpe::monitor_service { 'puppet_disabled':
- description => 'puppet disabled',
- nrpe_command => '/usr/local/lib/nagios/plugins/check_puppet_disabled',
}
$warninginterval = $base::puppet::params::freshnessinterval
$criticalinterval = $base::puppet::params::freshnessinterval * 2
--
To view, visit https://gerrit.wikimedia.org/r/142560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46d8e23ea0a96395252dc9323cb24c49f70614cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
