Lcarr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52713
Change subject: fixing nrpe to be the new standard everywhere. Huzzah!
......................................................................
fixing nrpe to be the new standard everywhere. Huzzah!
Change-Id: I534e450f053639c445dfae04a1aa5f36a3552920
---
M manifests/misc/icinga.pp
M manifests/nrpe.pp
2 files changed, 5 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/52713/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 84a12a2..bdd2c22 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -26,7 +26,7 @@
lvs::monitor,
nagios::gsbmonitoring,
mysql,
- nrpe::new
+ nrpe
systemuser { icinga: name => "icinga", home => "/home/icinga", groups
=> [ "icinga", "dialout", "nagios" ] }
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index a132a21..f2d4920 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -60,88 +60,14 @@
}
}
-class nrpe::packages {
- $nrpe_allowed_hosts = $::realm ? {
- "production" =>
"127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14",
- "labs" => "10.4.0.120"
- }
-
- package { [ "nagios-nrpe-server", "nagios-plugins",
"nagios-plugins-basic", "nagios-plugins-extra", "nagios-plugins-standard" ]:
- ensure => latest;
- }
-
- file {
- "/etc/nagios/nrpe.d":
- owner => root,
- group => root,
- mode => 0755,
- require => Package[nagios-nrpe-server],
- ensure => directory;
- "/etc/nagios/nrpe_local.cfg":
- require => Package[nagios-nrpe-server],
- owner => root,
- group => root,
- mode => 0444,
- notify => Service[nagios-nrpe-server],
- content => template("nagios/nrpe_local.cfg.erb");
- "/usr/lib/nagios/plugins/check_dpkg":
- owner => root,
- group => root,
- mode => 0555,
- source => "puppet:///files/nagios/check_dpkg";
- "/usr/lib/nagios/plugins/check_ram.sh":
- source => "puppet:///files/nagios/check_ram.sh",
- owner => root,
- group => root,
- mode => 0555;
- }
-}
-
-class nrpe::service {
- Class[nrpe::packages] -> Class[nrpe::service]
-
- service { nagios-nrpe-server:
- require => [ Package[nagios-nrpe-server],
File["/etc/nagios/nrpe_local.cfg"], File["/usr/lib/nagios/plugins/check_dpkg"],
File["/etc/init.d/nagios-nrpe-server"] ],
- subscribe => File["/etc/nagios/nrpe_local.cfg"],
- pattern => "/usr/sbin/nrpe",
- ensure => running;
- }
-
- file { "/etc/init.d/nagios-nrpe-server":
- owner => root,
- group => root,
- mode => 0555,
- source => "puppet:///files/nagios/nrpe-server-init";
- }
-
- if $lsbdistid == "Ubuntu" and versioncmp($lsbdistrelease, "10.04") >= 0
{
- file { "/etc/sudoers.d/nrpe":
- owner => root,
- group => root,
- mode => 0440,
- content => "
-nagios ALL = (root) NOPASSWD: /usr/bin/arcconf getconfig 1
-nagios ALL = (root) NOPASSWD: /usr/bin/check-raid.py
-";
- }
- }
-}
-
class nrpe {
include nrpe::packages
include nrpe::service
- # Collect virtual NRPE nagios service checks
+ #Collect virtual NRPE nagios service checks
Monitor_service <| tag == "nrpe" |>
}
-
-class nrpe::new {
- include nrpe::packagesnew
- include nrpe::servicenew
-
- #Collect virtual NRPE nagios service checks
-}
-class nrpe::packagesnew {
+class nrpe::packages {
$nrpe_allowed_hosts = $::realm ? {
"production" =>
"127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14",
"labs" => "10.4.0.34"
@@ -185,8 +111,8 @@
}
}
-class nrpe::servicenew {
- Class[nrpe::packagesnew] -> Class[nrpe::servicenew]
+class nrpe::service {
+ Class[nrpe::packages] -> Class[nrpe::service]
service { nagios-nrpe-server:
require => [ Package[nagios-nrpe-server],
File["/etc/icinga/nrpe_local.cfg"], File["/usr/lib/nagios/plugins/check_dpkg"]
],
--
To view, visit https://gerrit.wikimedia.org/r/52713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I534e450f053639c445dfae04a1aa5f36a3552920
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
