Module: check_mk
Branch: master
Commit: 8176cdc5cad335faa5f4c5638871a6aa7af60357
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8176cdc5cad335…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jul 22 11:55:10 2013 +0200
Fix problem with outage_statistics in availability
---
web/plugins/views/availability.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index 2b4f147..df09db3 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -334,6 +334,7 @@ def render_availability_options():
# Make sure that parameters are set that have not been present in the
# original version. This code can be dropped in a couple of years.
avoptions.setdefault("notification_period", "honor")
+ avoptions.setdefault("outage_statistics", ([], []))
is_open = False
html.begin_form("avoptions")
Module: check_mk
Branch: master
Commit: c56e37d679c0a319e1ce02776b650ea81e9e89e1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c56e37d679c0a3…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Jul 22 11:43:15 2013 +0200
initial version of check manpage for hp_proliant and hpux_tunables.*
---
checkman/hp_proliant | 9 +++------
checkman/hpux_tunables.maxfiles_lim | 19 ++++++++++++++-----
checkman/hpux_tunables.nkthread | 20 +++++++++++++++-----
checkman/hpux_tunables.nproc | 20 +++++++++++++++-----
checkman/hpux_tunables.semmni | 20 +++++++++++++++-----
checkman/hpux_tunables.semmns | 20 +++++++++++++++-----
checkman/hpux_tunables.shmseg | 19 +++++++++++++++----
7 files changed, 92 insertions(+), 35 deletions(-)
diff --git a/checkman/hp_proliant b/checkman/hp_proliant
index 7bcad3d..fe03fcd 100644
--- a/checkman/hp_proliant
+++ b/checkman/hp_proliant
@@ -1,15 +1,12 @@
-title: HP Proliant servers: general status
+title: HP Proliant servers: General Status
agents: snmp
catalog: hw/server/hp
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
-
This check connects to the SNMP agent installed on an operating system
- on a HP Proliant server and reads the information from the {CPQHLTH-MIB}
- MIB. In addition to the general state it also returns the serial number
- and firmware version.
+ on a HP Proliant server and reads the general status information.
+ In addition it also returns the serial number and firmware version.
The status is {OK} if the agent signals {Unknown} or {Ok}, {WARN} on
{Degraded} and {CRIT} on {Failed}.
diff --git a/checkman/hpux_tunables.maxfiles_lim b/checkman/hpux_tunables.maxfiles_lim
index 38824d5..8b89985 100644
--- a/checkman/hpux_tunables.maxfiles_lim
+++ b/checkman/hpux_tunables.maxfiles_lim
@@ -1,13 +1,22 @@
-title: Kernel tunables: Maximum file limit
+title: Kernel tunables: Number of open files
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
- Title correct?
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current number of open files (maxfiles_lim). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
diff --git a/checkman/hpux_tunables.nkthread b/checkman/hpux_tunables.nkthread
index 83d7d60..ce1291e 100644
--- a/checkman/hpux_tunables.nkthread
+++ b/checkman/hpux_tunables.nkthread
@@ -1,13 +1,23 @@
-title: Kernel tunables: nkthread
+title: Kernel tunables: Number of threads
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
- Title to be improved
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current number of threads (nkthread). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
+
diff --git a/checkman/hpux_tunables.nproc b/checkman/hpux_tunables.nproc
index 1624158..9794752 100644
--- a/checkman/hpux_tunables.nproc
+++ b/checkman/hpux_tunables.nproc
@@ -1,13 +1,23 @@
-title: Kernel tunables: nproc
+title: Kernel tunables: Number of Processes
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
- Title to be improved
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current Number of processes (npoc). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
+
diff --git a/checkman/hpux_tunables.semmni b/checkman/hpux_tunables.semmni
index 2ebcb6c..ea77b39 100644
--- a/checkman/hpux_tunables.semmni
+++ b/checkman/hpux_tunables.semmni
@@ -1,13 +1,23 @@
-title: Kernel tunables: semmni
+title: Kernel tunables: Number of IPC Semaphore IDs
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
- Title to be improved
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current number of IPC semaphore IDs (semmni). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
+
diff --git a/checkman/hpux_tunables.semmns b/checkman/hpux_tunables.semmns
index 31350c0..07426b4 100644
--- a/checkman/hpux_tunables.semmns
+++ b/checkman/hpux_tunables.semmns
@@ -1,13 +1,23 @@
-title: Kernel tunables: semmns
+title: Kernel tunables: Number of IPC Semaphores
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
- Title to be improved
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current number of IPC semaphores (semmns). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
+
diff --git a/checkman/hpux_tunables.shmseg b/checkman/hpux_tunables.shmseg
index 1f57f8d..017dbd7 100644
--- a/checkman/hpux_tunables.shmseg
+++ b/checkman/hpux_tunables.shmseg
@@ -1,12 +1,23 @@
-title: Kernel tunables: Shared memory segments
+title: Kernel tunables: Number of Shared Memory Segments
agents: hpux
catalog: os/kernel
license: GPL
distribution: check_mk
description:
- This is a copy only, FIXME, TODO: BERND
-
The check uses the output of {kcusage -l} for monitoring the
- current usage of shared memory segments. Per default this
+ current number of shared memory segments (semmns). Per default this
check is always {OK}, but you can set levels for the used
percentage.
+
+ See check manpage for hpux_tunables too.
+
+perfdata:
+ See check manpage for hpux_tunables.
+
+inventory:
+ See check manpage for hpux_tunables.
+
+[parameters]
+warn(float): See check manpage for hpux_tunables.
+crit(float): See check manpage for hpux_tunables.
+
Module: check_mk
Branch: master
Commit: f57fbff1275fb9a5e760c86d8685f641864f8fb4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f57fbff1275fb9…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jul 22 11:40:14 2013 +0200
FIX: fix validation of time-of-day input field (24:00)
---
ChangeLog | 1 +
web/htdocs/valuespec.py | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e149c02..b168a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -272,6 +272,7 @@
WATO:
* FIX: fix layout of Auxiliary tags table
* FIX: avoid exception when called first time and first page ist host tags
+ * FIX: fix validation of time-of-day input field (24:00)
1.2.2p2:
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 8129be0..2803593 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -1597,10 +1597,12 @@ class Timeofday(ValueSpec):
def validate_value(self, value, varprefix):
if not self._allow_empty and value == None:
raise MKUserError(varprefix, _("Please enter a time."))
- if self._allow_24_00 and value > (24, 0):
- raise MKUserError(varprefix, _("The time must not be greater than 24:00."))
- elif not self._allow_empty and value > (23, 59):
- raise MKUserError(varprefix, _("The time must not be greater than 23:59."))
+ if self._allow_24_00:
+ max_value = (24, 0)
+ else:
+ max_value = (23, 59)
+ if value > max_value:
+ raise MKUserError(varprefix, _("The time must not be greater than %02d:%02d." % max_value))
elif value[0] < 0 or value[1] < 0 or value[0] > 24 or value[1] > 59:
raise MKUserError(varprefix, _("Hours/Minutes out of range"))
ValueSpec.custom_validate(self, value, varprefix)
Module: check_mk
Branch: master
Commit: b06eec20e94dabc5b67ab7b8a850ed7664e99655
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b06eec20e94dab…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Jul 22 11:02:28 2013 +0200
initial version of check manpage for bluecoat_diskcpu and bluecoat_sensors
---
checkman/bluecoat_diskcpu | 19 ++++++++++++++++++-
checkman/bluecoat_sensors | 19 ++++++++++++++++---
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/checkman/bluecoat_diskcpu b/checkman/bluecoat_diskcpu
index e8f754a..fd4b0dd 100644
--- a/checkman/bluecoat_diskcpu
+++ b/checkman/bluecoat_diskcpu
@@ -1,6 +1,23 @@
title: Blue Coat Systems: Security Gateway: Disk and CPU utilization
+agents: snmp
catalog: hw/network/bluecoat
license: GPL
distribution: check_mk
description:
- BERND
+ The check checks CPU utilization and Disk usage on Blue Coat Security
+ Gateways by SNMP.
+
+ Returns {OK} if SNMP reports OK status for the item and {CRIT} on
+ every other status.
+
+item:
+ The item {Disk} represents the disk usage.
+
+ The item {CPU} represents the CPU utilization.
+
+perfdata:
+ One value representing the usage (for the Disk check) or utilization
+ (for the CPU check)
+
+inventory:
+ Returns two checks for each appliance (machine): {Disk} and {CPU}
diff --git a/checkman/bluecoat_sensors b/checkman/bluecoat_sensors
index ea123e0..923590d 100644
--- a/checkman/bluecoat_sensors
+++ b/checkman/bluecoat_sensors
@@ -1,7 +1,20 @@
-title: Blue Coat Systems: Security Gateway: Sensors
+title: Blue Coat Systems: Security Gateway: Hardware Sensors
+agents: snmp
catalog: hw/network/bluecoat
license: GPL
distribution: check_mk
description:
- BERND
- title to be improved
+ Checks by SNMP the hardware sensors of Blue Coat Security Gateways, such as
+ different temperature sensors, voltage levels and fan speeds.
+
+ Returns {OK} if an ok status is reported by SNMP and {CRIT} on any
+ other status.
+
+item:
+ The sensor description as returned by SNMP
+
+perfdata:
+ One number: The measured value.
+
+inventory:
+ Finds one service for each hardware sensor.
Module: check_mk
Branch: master
Commit: d1ac9e05efb98fa1eb4f71b1116c260790fed13e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1ac9e05efb98f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jul 22 09:20:05 2013 +0200
LDAP: Supporting posixGroup with memberUid as member attribute
---
ChangeLog | 2 +-
web/plugins/userdb/ldap.py | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 55475ea..e149c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,7 +62,6 @@
new script parameters cache_age, retry_count, timeout
new script caching options "off", "async", "sync"
-
Notifications:
* notify.py: Matching service level: Use the hosts service level if a
service has no service level set
@@ -91,6 +90,7 @@
* Implemented search forms for most data tables
* New icons in view footers: export as CSV, export as JSON
* Availability: new columns for shortest, longest, average and count
+ * LDAP: Supporting posixGroup with memberUid as member attribute
* FIX: better error message in case of exception in SNMP handling
* FIX: Inventory screen: Now shows custom checks
* FIX: Fixed locking problem of multisite pages related to user loading/saving
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 0535d56..b3c0174 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -394,10 +394,18 @@ def ldap_user_groups(username, attr = 'cn'):
else:
return g_ldap_group_cache[username][1]
+ # posixGroup objects use the memberUid attribute to specify the group memberships.
+ # This is the username instead of the users DN. So the username needs to be used
+ # for filtering here.
+ if ldap_member_attr().lower() == 'memberuid':
+ user_filter = username
+ else:
+ user_filter = user_dn
+
# Apply configured group ldap filter and only reply with groups
# having the current user as member
filt = '(&%s(%s=%s))' % (ldap_filter('groups'), ldap_member_attr(),
- ldap.filter.escape_filter_chars(user_dn))
+ ldap.filter.escape_filter_chars(user_filter))
# First get all groups
groups_cn = []
groups_dn = []
Module: check_mk
Branch: master
Commit: 25edb9f3c8a0faaf17eaa8f63d5390e4ec407b07
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25edb9f3c8a0fa…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Jul 19 16:37:40 2013 +0200
initial version of check manpage for blade_bx_powermod and blade_bx_temp
---
checkman/blade_bx_powermod | 16 ++++++++++++++--
checkman/blade_bx_temp | 32 ++++++++++++++++++++++++++++++--
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/checkman/blade_bx_powermod b/checkman/blade_bx_powermod
index abe9394..326e873 100644
--- a/checkman/blade_bx_powermod
+++ b/checkman/blade_bx_powermod
@@ -1,7 +1,19 @@
title: Primergy BX600 Blade Server: Power module
+agents: snmp
catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- TODO: BERND
- title correct
+ TODO: BERND, FIXME: Blade Server or Blade Enclosure?
+
+ Checks the state of power modules in Primergy BX600 Blade Servers
+
+ Returns {OK} if the power module reports ok status and {CRIT} on any
+ other status.
+
+item:
+ The index of the power module as returned by SNMP.
+
+inventory:
+ Creates one check per power module.
+
diff --git a/checkman/blade_bx_temp b/checkman/blade_bx_temp
index 229ca62..97df583 100644
--- a/checkman/blade_bx_temp
+++ b/checkman/blade_bx_temp
@@ -1,7 +1,35 @@
title: Primergy BX600 Blade Server: Temperature
+agents: snmp
catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- TODO: BERND
- title correct?
+ TODO: BERND, 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
+ reports a non ok state or if the reported temperature is higher or equal {level_crit}
+
+ Returns {WARN} if the reported temperature is higher or equal {level_warn}
+
+ {OK} is returned otherwise.
+
+item:
+ The index of the temperature sensor as returned by SNMP
+
+perfdata:
+ One value: The temperature in °C
+
+inventory:
+ Creates one check per power module.
+
+[parameters]
+level_warn(int): If you want to set a warning level manually give a number here.
+ Unit is °C. Or leave empty to use the default warning level from the device
+ (reported by SNMP).
+
+level_crit(int): If you want to set a critical level manually give a number here.
+ Unit is °C. Or leave empty to use the default critical level from the device
+ (reported by SNMP).
+
Module: check_mk
Branch: master
Commit: b19d961ab51e17afd84c470e33e65b93da6bfe9d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b19d961ab51e17…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Jul 19 16:03:35 2013 +0200
initial version of check manpage for blade_bx_powerfan
---
checkman/blade_bx_powerfan | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/checkman/blade_bx_powerfan b/checkman/blade_bx_powerfan
index adb4fc4..0339b1b 100644
--- a/checkman/blade_bx_powerfan
+++ b/checkman/blade_bx_powerfan
@@ -1,7 +1,38 @@
title: Primergy BX600 Blade Server: Power fan
+agents: snmp
catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- TODO: BERND
- title correct?
+ TODO: BERND, 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
+ non-OK state or if the speed is less or equal {crit_perc}% of max speed.
+
+ Returns {WARN} if the speed is less or equal {warn_perc}% of max speed.
+
+ And {OK} is returned otherwise.
+
+item:
+ The name of the fan as returned by SNMP.
+
+perfdata:
+ Two values: The pecentage of max speed the fan is running at and the
+ absolute speed of the fan (rpm).
+
+inventory:
+ Returns one Check for each fan.
+
+[parameters]
+warn_perc(int): If the speed is less or equal this percentage of max speed
+ the check results in {WARN} state.
+
+crit_perc(int): If the speed is less or equal this percentage of max speed
+ the check results in {CRIT} state.
+
+[configuration]
+blade_bx_fan_default_error_levels(int, int): A pair of integers: The default
+ levels for {WARN} and {CRIT}. These levels are used for inventorized checks.
+ This variable is preset to {( 50, 40 )}
Module: check_mk
Branch: master
Commit: 51be45dcdc1bef7ee8e27aca1806ae074dd04562
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51be45dcdc1bef…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Jul 19 15:41:03 2013 +0200
initial version of check manpage for blade_bx_load
---
checkman/blade_bx_load | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/checkman/blade_bx_load b/checkman/blade_bx_load
index 0617816..84f90fc 100644
--- a/checkman/blade_bx_load
+++ b/checkman/blade_bx_load
@@ -1,7 +1,38 @@
-title: Primergy BX600 Blade Server: CPU load
+title: Primergy BX600 Blade Enclosure: CPU load
agents: snmp
catalog: hw/server/fujitsu
license: GPL
distribution: check_mk
description:
- TODO: BERND
+ TODO: BERND, FIXME: is this really CPU of enclosure? Bastian tries out on monday...
+
+ 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.
+
+examples:
+ # Set default levels to a load of 4 and 8
+ blade_bx_cpuload_default_levels = (4.0, 8.0).
+
+ checks += [
+ # Use levels 4 (warning) and 8 (critical)
+ # on all hosts with the tag "bx600"
+ (["bx600"], ALL_HOSTS, "blade_bx_load", None, (4, 8)),
+ ]
+
+perfdata:
+ Three values: The load average for 1, 5 and 15 minutes.
+
+inventory:
+ Returns one check on each blade enclosure.
+
+[parameters]
+warn (int): 15 minute average load at which a {WARN} is triggered.
+
+crit (int): 15 minute average load at which {CRIT} state is triggered.
+
+[configuration]
+blade_bx_cpuload_default_levels(int,int): A pair of integers: The default
+ levels for {WARN} and {CRIT}. These levels are used for inventorized checks.
+ This variable is preset to {( 5, 20 )}
+