Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208631
Change subject: Adjust various Nagios check descriptions
......................................................................
Adjust various Nagios check descriptions
To make them sound more serious :)
Change-Id: I3c5b6111c74b11366992a36f78563663bd1340b8
---
M manifests/role/labsnfs.pp
M manifests/swift.pp
M modules/nagios_common/files/check_commands/check_icinga_config
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/208631/1
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 6d7b5da..d546891 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -80,7 +80,7 @@
# Monitor for high load consistently, is a 'catchall'
monitoring::graphite_threshold { 'high_load':
- description => 'High load for whatever reason',
+ description => 'High load average',
metric => "servers.${::hostname}.cpu.total.iowait",
from => '10min',
warning => '16',
diff --git a/manifests/swift.pp b/manifests/swift.pp
index f29101c..9afe6f9 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -327,7 +327,7 @@
}
include nrpe
nrpe::monitor_service { 'load_average':
- description => 'very high load average likely xfs',
+ description => 'High load average',
nrpe_command => '/usr/lib/nagios/plugins/check_load -w 80,80,80 -c
200,100,100',
}
diff --git a/modules/nagios_common/files/check_commands/check_icinga_config
b/modules/nagios_common/files/check_commands/check_icinga_config
index 208240b..53c8759 100755
--- a/modules/nagios_common/files/check_commands/check_icinga_config
+++ b/modules/nagios_common/files/check_commands/check_icinga_config
@@ -7,5 +7,5 @@
echo "Icinga configuration is correct"
exit 0
fi;
-echo "Icinga configuration contains errors, please check!"
+echo "Icinga configuration contains errors"
exit 2
--
To view, visit https://gerrit.wikimedia.org/r/208631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c5b6111c74b11366992a36f78563663bd1340b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
