Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141952
Change subject: gitblit: remove service monitoring to role class
......................................................................
gitblit: remove service monitoring to role class
Change-Id: I1b818bc63d39c8c19ac0e221d5939f38a763c862
---
M manifests/role/gitblit.pp
M modules/gitblit/manifests/init.pp
D modules/gitblit/manifests/monitor.pp
3 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/141952/1
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index b6bf74e..5fe6aed 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -16,11 +16,16 @@
rule => 'proto tcp dport 8080 { saddr $INTERNAL ACCEPT; }'
}
- monitor_service { 'gitblit':
+ monitor_service { 'gitblit_web':
description => 'gitblit.wikimedia.org',
check_command =>
'check_https_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
}
+ nrpe::monitor_service { 'gitblit_process':
+ description => 'gitblit process',
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar gitblit.jar'"
+ }
+
# Add ytterbium to ssh exceptions for git replication
ferm::rule { 'ytterbium_ssh_git':
rule => 'proto tcp dport ssh { saddr (208.80.154.80
2620:0:861:3:92b1:1cff:fe2a:e60 2620:0:861:3:208:80:154:81) ACCEPT; }'
diff --git a/modules/gitblit/manifests/init.pp
b/modules/gitblit/manifests/init.pp
index a8dfedf..3e0ab29 100644
--- a/modules/gitblit/manifests/init.pp
+++ b/modules/gitblit/manifests/init.pp
@@ -10,7 +10,6 @@
) {
include webserver::apache
- include gitblit::monitor
group { 'gitblit':
ensure => present,
diff --git a/modules/gitblit/manifests/monitor.pp
b/modules/gitblit/manifests/monitor.pp
deleted file mode 100644
index feb783c..0000000
--- a/modules/gitblit/manifests/monitor.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class gitblit::monitor {
- include nrpe
-
- nrpe::monitor_service { 'gitblit_process':
- description => 'gitblit process',
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar gitblit.jar'"
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/141952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b818bc63d39c8c19ac0e221d5939f38a763c862
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
