Lcarr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55783
Change subject: part 1 of cleaning up files from nagios to icinga
......................................................................
part 1 of cleaning up files from nagios to icinga
Change-Id: Ie70b4a768b43ecf172881168ec3acb5b120e19ed
---
R files/icinga/check_job_queue
R files/icinga/check_to_check_nagios_paging
M manifests/misc/icinga.pp
M manifests/nagios.pp
4 files changed, 2 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/55783/1
diff --git a/files/nagios/check_job_queue b/files/icinga/check_job_queue
similarity index 100%
rename from files/nagios/check_job_queue
rename to files/icinga/check_job_queue
diff --git a/files/nagios/check_to_check_nagios_paging
b/files/icinga/check_to_check_nagios_paging
similarity index 100%
rename from files/nagios/check_to_check_nagios_paging
rename to files/icinga/check_to_check_nagios_paging
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 5794011..866e8aa 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -112,7 +112,7 @@
require icinga::monitor::packages
file {'/usr/lib/nagios/plugins/check_to_check_nagios_paging':
- source => 'puppet:///files/nagios/check_to_check_nagios_paging',
+ source => 'puppet:///files/icinga/check_to_check_nagios_paging',
owner => 'root',
group => 'root',
mode => '0755';
@@ -641,7 +641,7 @@
include applicationserver::packages
file {'/usr/lib/nagios/plugins/check_job_queue':
- source => 'puppet:///files/nagios/check_job_queue',
+ source => 'puppet:///files/icinga/check_job_queue',
owner => 'root',
group => 'root',
mode => '0755';
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index 0446418..5e67167 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -176,41 +176,6 @@
}
-class nagios::monitor::jobqueue {
- include applicationserver::packages
-
- file {"/usr/local/nagios/libexec/check_job_queue":
- source => "puppet:///files/nagios/check_job_queue",
- owner => root,
- group => root,
- mode => 0755;
- }
- monitor_service { "check_job_queue":
- description => "check_job_queue",
- check_command => "check_job_queue",
- normal_check_interval => 15,
- retry_check_interval => 5,
- critical => "false"
- }
-}
-
-# this class is used to check that paging works.
-class nagios::monitor::checkpaging {
- file {"/usr/local/nagios/libexec/check_to_check_nagios_paging":
- source => "puppet:///files/nagios/check_to_check_nagios_paging",
- owner => root,
- group => root,
- mode => 0755;
- }
- monitor_service { "check_to_check_nagios_paging":
- description => "check_to_check_nagios_paging",
- check_command => "check_to_check_nagios_paging",
- normal_check_interval => 1,
- retry_check_interval => 1,
- contact_group => "pager_testing",
- critical => "false"
- }
-}
class nagios::ganglia::ganglios {
include generic::mysql::packages::client,
--
To view, visit https://gerrit.wikimedia.org/r/55783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie70b4a768b43ecf172881168ec3acb5b120e19ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
