Module: check_mk
Branch: master
Commit: a1dd993e855a2d43aa5619ba1b4d5a1aea430bd1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1dd993e855a2d…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 23 15:13:47 2013 +0200
Updated bug entries #0902
---
.bugs/902 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.bugs/902 b/.bugs/902
index 90654ba..6947328 100644
--- a/.bugs/902
+++ b/.bugs/902
@@ -19,3 +19,6 @@ when installing check_mk-1.2.2p1 manually (by setup.sh) the directory
and as long as this directory is missing *all* notifications fail
silently!!
directory needs to be created in setup.sh
+
+2013-09-23 bs: should be fixed, added creation of directory to setup.sh
+but TEST IS STILL OPEN, needs to wait for 1055 to be fixed
Module: check_mk
Branch: master
Commit: 0bd4f33fe5feb38c5fea0482dc782c362f2f931c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd4f33fe5feb3…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 23 13:34:14 2013 +0200
added documentation of the new, dict based configuration to check manpage of ps and ps.perf
---
checkman/ps | 27 +++++++++++++++++++++++++++
checkman/ps.perf | 2 ++
2 files changed, 29 insertions(+)
diff --git a/checkman/ps b/checkman/ps
index 7b7c5a5..d0dc807 100644
--- a/checkman/ps
+++ b/checkman/ps
@@ -78,6 +78,20 @@ examples:
# make sure exactly one ntpd is running
( "somehost", "ps", "NTP", ( "/usr/sbin/ntpd", 1, 1, 1, 1 ) ),
+ # or this can be done with the new, dictionary based
+ # syntax; in this case additional parameters cpulevels and
+ # cpu_average can be passed
+ ( 'somehost', 'ps', 'NTP', {
+ 'process': '/usr/sbin/ntpd',
+ 'user': 'ntp',
+ 'warnmin': 1,
+ 'warnmax': 1,
+ 'okmin': 1
+ 'okmax': 1,
+ 'cpulevels': (90.0, 98.0),
+ 'cpu_average': 15,
+ }),
+
# the same, but for all hosts with the tag "lnx"
( ["lnx"], ALL_HOSTS, "ps", "NTPD", ( "/usr/sbin/ntpd", 1, 1, 1, 1 ) ),
@@ -143,3 +157,16 @@ okmin (int): Minimum number for OK state
okmax (int): Maximum number for OK state
warnmax (int): Maximum number for WARNING state. Counts less than warnmin or greater than
warnmax are CRITICAL
+
+parameters (dict): Or the parameters can be given in the new, dictionary based syntax
+ with the elements below.
+ In this case additional parameters cpulevels and cpu_average can be passed.
+
+{"process"}: procname, see above
+{"user"}: see above
+{"warnmin"}: see above
+{"warnmax"}: see above
+{"okmin"}: see above
+{"okmax"}: see above
+{"cpulevels"}: (float, float): levels of CPU usage for {WARN} and {CRIT} in percent
+{"cpu_average"}: int: build average over CPU usage for the given time in minutes
diff --git a/checkman/ps.perf b/checkman/ps.perf
index b1a0231..a45e3cd 100644
--- a/checkman/ps.perf
+++ b/checkman/ps.perf
@@ -28,6 +28,8 @@ inventory:
[parameters]
params (5 or 6 tuple): Please refer to {ps} for information about the parameters.
+parameters (dict): or the parameters can be given in the new, dictionary based syntax.
+ Please refer to {ps} for information about the parameters.
[configuration]
inventory_processes_perf (list): A list of 7-tuples. See {ps} for details.
Module: check_mk
Branch: master
Commit: 6efaada9b8799e3878168cc91ca64de5bcc22285
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6efaada9b8799e…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 23 11:48:19 2013 +0200
removed FIXME notes from check manpages, moved them into a gitbug
---
checkman/blade_bx_load | 2 --
checkman/blade_bx_powerfan | 2 --
checkman/blade_bx_powermod | 6 ++----
checkman/blade_bx_temp | 2 --
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/checkman/blade_bx_load b/checkman/blade_bx_load
index e6b857c..d1dfae1 100644
--- a/checkman/blade_bx_load
+++ b/checkman/blade_bx_load
@@ -4,8 +4,6 @@ catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- FIXME: is this really CPU of enclosure? Asked Bastian to figure this out...
-
This check measures and checks the averaged CPU load of a Primergy
BX600 Blade Enclosure. The values for 1, 5 and 15 minute average are
reported.
diff --git a/checkman/blade_bx_powerfan b/checkman/blade_bx_powerfan
index 3ba4c61..5554605 100644
--- a/checkman/blade_bx_powerfan
+++ b/checkman/blade_bx_powerfan
@@ -4,8 +4,6 @@ catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- FIXME: in Blade or in Enclosure?
-
Checks fans in Primergy BX600 Blade Servers.
Returns {CRIT} if the fan is not present or powered off or reports a
diff --git a/checkman/blade_bx_powermod b/checkman/blade_bx_powermod
index 6eabc1a..f27b8c3 100644
--- a/checkman/blade_bx_powermod
+++ b/checkman/blade_bx_powermod
@@ -1,12 +1,10 @@
-title: Primergy BX600 Blade Server: Power module
+title: Primergy BX600 Blade Enclosure: Power module
agents: snmp
catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- FIXME: Blade Server or Blade Enclosure?
-
- Checks the state of power modules in Primergy BX600 Blade Servers
+ Checks the state of power modules in Primergy BX600 Blade Enclosures
Returns {OK} if the power module reports ok status and {CRIT} on any
other status.
diff --git a/checkman/blade_bx_temp b/checkman/blade_bx_temp
index 1567b3b..70d30e3 100644
--- a/checkman/blade_bx_temp
+++ b/checkman/blade_bx_temp
@@ -4,8 +4,6 @@ catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- FIXME: in Blade Servers or Blade Enclosures?
-
Checks temperature sensors in Primergy BX600 Blade Servers.
Returns {CRIT} if the sensor is not present or powered off or if the sensor