aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2007-12-03 09:29:24 +0000
committerPetter Reinholdtsen <pere@hungry.com>2007-12-03 09:29:24 +0000
commit0755244ba71fa900f7a866cb4cd344fa1add77ab (patch)
tree5c966657f4db40b40dc5cfe556cdc83fd446601e
parentc9a08d7073e7d5d004a7af814b4cf0dd36621d11 (diff)
downloadsitesummary-0755244ba71fa900f7a866cb4cd344fa1add77ab.tar.gz
sitesummary-0755244ba71fa900f7a866cb4cd344fa1add77ab.tar.bz2
sitesummary-0755244ba71fa900f7a866cb4cd344fa1add77ab.tar.xz
* Recognice nagios2 as a nagios client/server indicator.
-rw-r--r--debian/changelog6
-rwxr-xr-xsitesummary-nodes3
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c9e5329..0ac28fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sitesummary (0.0.35) UNRELEASED; urgency=low
+
+ * Recognice nagios2 as a nagios client/server indicator.
+
+ -- Petter Reinholdtsen <pere@debian.org> Mon, 3 Dec 2007 10:28:51 +0100
+
sitesummary (0.0.34) unstable; urgency=low
* Prefer REMOTE_ADDR over the output from gethostbyaddr() in
diff --git a/sitesummary-nodes b/sitesummary-nodes
index 9329cd4..2d235c7 100755
--- a/sitesummary-nodes
+++ b/sitesummary-nodes
@@ -60,7 +60,8 @@ sub is_munin_client {
sub is_nagios_client {
my $hostid = shift;
return is_pkg_installed($hostid, "nagios-nrpe-server") ||
- is_pkg_installed($hostid, "nagios-text");
+ is_pkg_installed($hostid, "nagios-text") ||
+ is_pkg_installed($hostid, "nagios2");
}
sub print_munin_list {