aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xsitesummary-nodes6
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 389c95d..399f77b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ sitesummary (0.1.2) UNRELEASED; urgency=low
* Add support in nagios plugin check_etc_hosts for ignoring entires
tagged '# NAGIOSIGNORE'.
+ * Drop Nagios check for user count, as the check do not check anything
+ useful, and the default nrpe setup do not allow us to raise the
+ warning levels.
-- Petter Reinholdtsen <pere@debian.org> Tue, 31 Jan 2012 19:55:29 +0100
diff --git a/sitesummary-nodes b/sitesummary-nodes
index eb2f599..6778146 100755
--- a/sitesummary-nodes
+++ b/sitesummary-nodes
@@ -443,17 +443,13 @@ sub generate_nagios_config {
print_nagios_service_check($remote, $hostname, "swap",
"check_swap", "10%!5%");
- my $userlimit = "20!50";
my $proclimit = "500!1000";
- # Raise user and process count limits for thin clients, as
+ # Raise process count limits for thin clients, as
# lots of users can log into these machines and run their
# desktops from there.
if (is_pkg_installed($hostid, "ltsp-server")) {
- my $userlimit = "150!200";
my $proclimit = "1500!2500";
}
- print_nagios_service_check($remote, $hostname, "current users",
- "check_users", $userlimit);
print_nagios_service_check($remote, $hostname, "processes total",
"check_procs", $proclimit);
print_nagios_service_check($remote, $hostname, "processes zombie",