diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-01-16 00:53:37 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2010-01-16 00:53:37 +0000 |
| commit | ef1094c2f7d048ac0f5697e73102274b29d4a755 (patch) | |
| tree | 470565bcdabdffe03968917f028fee6ef9e6c57c | |
| parent | dfecca22ae9fec74a698c4ccbccd854f8eafbc70 (diff) | |
| download | sitesummary-ef1094c2f7d048ac0f5697e73102274b29d4a755.tar.gz sitesummary-ef1094c2f7d048ac0f5697e73102274b29d4a755.tar.bz2 sitesummary-ef1094c2f7d048ac0f5697e73102274b29d4a755.tar.xz | |
Do not generate nagios checks that need nrpe configuration by default.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/sitesummary.cron.daily | 3 | ||||
| -rwxr-xr-x | sitesummary-nodes | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d27e396..f89f35c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ sitesummary (0.0.54) UNRELEASED; urgency=low * Rewrite how nagios configuration is generated to use a function to generate each service check. + * Do not generate nagios checks that need nrpe configuration by default. -- Petter Reinholdtsen <pere@debian.org> Sat, 16 Jan 2010 01:39:35 +0100 diff --git a/debian/sitesummary.cron.daily b/debian/sitesummary.cron.daily index e408a7a..96545ac 100755 --- a/debian/sitesummary.cron.daily +++ b/debian/sitesummary.cron.daily @@ -7,6 +7,7 @@ set -e daylimit=120 makewebreport=/usr/sbin/sitesummary-makewebreport nodes=/usr/sbin/sitesummary-nodes +nagiosopts=-r # Modify this in collector.cfg to /etc/munin/ to automatically replace # the default munin configuration. @@ -60,7 +61,7 @@ tmpldir /etc/munin/templates EOF fi - sitesummary-nodes -m + sitesummary-nodes -m $nagiosopts [ -f $MUNINDIR/munin.conf.post ] && cat $MUNINDIR/munin.conf.post diff --git a/sitesummary-nodes b/sitesummary-nodes index a4b921a..0d0eaaa 100755 --- a/sitesummary-nodes +++ b/sitesummary-nodes @@ -16,6 +16,7 @@ Usage: $0 [-hmnw] -h Show usage information -m Generate munin configuration for all munin clients -n Generate nagios configuration for all nagios clients + -r Do not generate nagios checks requiring nrpe configuration on remote hosts -w List all client DNS/IP-addresses and MAC addresses EOF } |