Ori.livneh has submitted this change and it was merged.
Change subject: remove ori weekend commit check
......................................................................
remove ori weekend commit check
I've been behaving myself.
Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4
---
D files/icinga/check-ori-weekend-commits
M manifests/misc/monitoring.pp
M manifests/site.pp
3 files changed, 0 insertions(+), 37 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/files/icinga/check-ori-weekend-commits
b/files/icinga/check-ori-weekend-commits
deleted file mode 100755
index d2d9552..0000000
--- a/files/icinga/check-ori-weekend-commits
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Icinga alert script for Ori weekend commits
-#
-# Alerts if the time is between 21:00 on Friday and 01:00 on Monday
-# (my time zone) and there exists a commit from me in the last hour.
-
-TZ="America/Los_Angeles"
- /usr/bin/git \
- --git-dir=/var/lib/git/operations/puppet/.git log \
- --author=o...@wikimedia.org \
- --since=1hour \
- --format=%cd | /bin/grep -Pq '(Fri .* 2.:|Sat|Sun)'
-
-if [ $? -eq 0 ]; then
- echo "CRITICAL: Ori committed a change on a weekend"
- exit 2
-else
- echo "OK: Ori is behaving himself"
- exit 0
-fi
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index d243ed6..70f350c 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -612,19 +612,3 @@
],
}
}
-
-
-class misc::monitoring::ori_weekend_commits {
- file { '/usr/local/lib/nagios/plugins/check-ori-weekend-commits':
- source => 'puppet:///files/icinga/check-ori-weekend-commits',
- owner => 'root',
- group => 'root',
- mode => '0555',
- }
-
- nrpe::monitor_service { 'ori_weekend_commits':
- description => 'Ori committing changes on the weekend',
- nrpe_command =>
'/usr/local/lib/nagios/plugins/check-ori-weekend-commits',
- require =>
File['/usr/local/lib/nagios/plugins/check-ori-weekend-commits'],
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 7be6c5a..e4cd688 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2126,7 +2126,6 @@
include role::access_new_install
include role::puppetmaster::frontend
include role::pybal_config
- include misc::monitoring::ori_weekend_commits
}
node /pc100[1-3]\.eqiad\.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/198389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
