Module: check_mk
Branch: master
Commit: 47fe70da86a965fcfc99238b9a884303269777df
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47fe70da86a965…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Aug 25 10:32:17 2015 +0200
Fixed check result sanitize in case of single yielded result
---
modules/check_mk_base.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 4b002db..2e4e8e3 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1670,7 +1670,11 @@ def sanitize_yield_check_result(result, is_snmp):
# Simple check with no separate subchecks (yield wouldn't have been neccessary here!)
if len(subresults) == 1:
- return sanitize_tuple_check_result(subresults[0])
+ state, infotext, perfdata = sanitize_tuple_check_result(subresults[0], allow_missing_infotext=True)
+ if infotext == None:
+ return state, u"", perfdata
+ else:
+ return state, infotext, perfdata
# Several sub results issued with multiple yields. Make that worst sub check
# decide the total state, join the texts and performance data. Subresults with
@@ -1683,6 +1687,7 @@ def sanitize_yield_check_result(result, is_snmp):
for subresult in subresults:
st, text, perf = sanitize_tuple_check_result(subresult, allow_missing_infotext=True)
+ # FIXME/TODO: Why is the state only aggregated when having text != None?
if text != None:
infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st])
if st == 2 or status == 2:
@@ -1710,14 +1715,13 @@ def sanitize_tuple_check_result(result, allow_missing_infotext=False):
state, infotext = result
perfdata = None
- if not allow_missing_infotext or infotext != None:
- infotext = sanitize_check_result_infotext(infotext)
+ infotext = sanitize_check_result_infotext(infotext, allow_missing_infotext)
return state, infotext, perfdata
-def sanitize_check_result_infotext(infotext):
- if infotext == None:
+def sanitize_check_result_infotext(infotext, allow_missing_infotext):
+ if infotext == None and not allow_missing_infotext:
raise MKGeneralException("Invalid infotext from check: \"None\"")
if type(infotext) == str:
Module: check_mk
Branch: master
Commit: 2c054d00a0dbbb228407bdc38c83d325b5bd100a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c054d00a0dbbb…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Aug 25 08:45:47 2015 +0200
#2521 new check juniper_trpz_aps_sessions: shows the radio data and sessions per online access point
This check monitors the status of online access points of a junioer wla device.
Furthermore it shows the IO, errors, resets, retries, sessions and noise floor
per radio of the access points.
This check is cluster-aware
---
.werks/2521 | 13 +++
ChangeLog | 1 +
checkman/juniper_trpz_aps_sessions | 22 +++++
checks/juniper_trpz_aps_sessions | 187 ++++++++++++++++++++++++++++++++++++
4 files changed, 223 insertions(+)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c054d00a0…
Module: check_mk
Branch: master
Commit: 8edb0812916ca1cf466ec9b4c5ee076e699e0312
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8edb0812916ca1…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Aug 21 16:50:27 2015 +0200
#1283 hyperv_checkpoints,hyperv_vmstatus: Checkpoints and Integration Services Check for HyperV VMs
A new agent plugin on the HyperV Host is needed: hyperv_vms_guestinfos.ps1.
All information a returned as Piggyback informations. So you can not see anything directly under the hostsystem.
---
.werks/1283 | 11 +++
ChangeLog | 1 +
agents/windows/plugins/hyperv_vms_guestinfos.ps1 | 110 ++++++++++++++++++++++
checkman/hyperv_checkpoints | 15 +++
checkman/hyperv_vmstatus | 13 +++
checks/hyperv_checkpoints | 65 +++++++++++++
checks/hyperv_vmstatus | 46 +++++++++
7 files changed, 261 insertions(+)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8edb081291…
Module: check_mk
Branch: master
Commit: 799c655a899b6187a75fa31f9338c49cfdf92735
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799c655a899b61…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Aug 21 11:26:04 2015 +0200
#2518 veritas_vcs: New check which monitors the Veritas Cluster Service
The check needs the {check_mk_agent.linux} agent which provides information
about the Veritas Cluster Service if it is installed.
The check veritas_vcs monitors the cluster state of a Veritas Cluster Service.
Its subchecks veritas_vcs.system, veritas_vcs.resource and veritas_vcs.servicegroup
monitor the related states of the Veritas cluster Service.
---
.werks/2518 | 14 ++++++++++++++
ChangeLog | 1 +
checkman/veritas_vcs | 21 +++++++++++++++++++++
checkman/veritas_vcs.resource | 27 +++++++++++++++++++++++++++
checkman/veritas_vcs.servicegroup | 25 +++++++++++++++++++++++++
checkman/veritas_vcs.system | 24 ++++++++++++++++++++++++
6 files changed, 112 insertions(+)
diff --git a/.werks/2518 b/.werks/2518
new file mode 100644
index 0000000..4b6234b
--- /dev/null
+++ b/.werks/2518
@@ -0,0 +1,14 @@
+Title: veritas_vcs: New check which monitors the Veritas Cluster Service
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1440148378
+Class: feature
+
+The check needs the {check_mk_agent.linux} agent which provides information
+about the Veritas Cluster Service if it is installed.
+
+The check veritas_vcs monitors the cluster state of a Veritas Cluster Service.
+Its subchecks veritas_vcs.system, veritas_vcs.resource and veritas_vcs.servicegroup
+monitor the related states of the Veritas cluster Service.
diff --git a/ChangeLog b/ChangeLog
index d1f39d7..0b2cf54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@
* 1281 Microsoft Azure special agent (treasures)...
* 2420 mk_db2.aix: now able to monitor partitioned databases...
* 2530 ups_modulys_alarms ups_modulys_battery ups_modulys_battery_temp ups_modulys_inphase ups_modulys_outphase: New checks for the Socomec Modulys UPS
+ * 2518 veritas_vcs: New check which monitors the Veritas Cluster Service...
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
* 2316 FIX: windows agent: fix garbled output of cached agent plugins...
* 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...
diff --git a/checkman/veritas_vcs b/checkman/veritas_vcs
new file mode 100644
index 0000000..b53b116
--- /dev/null
+++ b/checkman/veritas_vcs
@@ -0,0 +1,21 @@
+title: Veritas Cluster Service: Cluster State
+agents: linux
+catalog: os/services
+license: GPL
+distribution: check_mk
+description:
+ This check needs the {check_mk_agent.linux} agent which provides
+ information about the Veritas Cluster Service if it is installed.
+
+ The check monitors the cluster state. If the state of the cluster is
+ - "RUNNING" then the service state will be OK,
+ - otherwise CRIT.
+
+ The check is cluster-aware. If the cluster is running on at
+ least one node then the state will be OK otherwise WARN.
+
+item:
+ The cluster name.
+
+inventory:
+ One service per cluster is created.
diff --git a/checkman/veritas_vcs.resource b/checkman/veritas_vcs.resource
new file mode 100644
index 0000000..8831a4d
--- /dev/null
+++ b/checkman/veritas_vcs.resource
@@ -0,0 +1,27 @@
+title: Veritas Cluster Service: Resource
+agents: linux
+catalog: os/services
+license: GPL
+distribution: check_mk
+description:
+ This check needs the {check_mk_agent.linux} agent which provides
+ information about the Veritas Cluster Service if it is installed.
+
+ The check monitors the resource state and can have the following states:
+ - "ONLINE" will be OK,
+ - "OFFLINE" will be WARN,
+ - "FAULTED" will be "CRIT",
+ - "OFFLINE|STATE UNKNOWN" or "ONLINE|STATE UNKNOWNEXITED" will be UNKNOWN.
+
+ The check is cluster-aware. In this case we have:
+ - If one resource reports "FAULTED" the service state will be CRIT,
+ - if one reports "UNKNOWN" it will be UNKNOWN,
+ - if one reports "ONLINE" the state will be OK,
+ - if all resources are "OFFLINE" the service state will be CRIT,
+ - otherwise it will be WARN.
+
+item:
+ The resource name.
+
+inventory:
+ One service per resource is created.
diff --git a/checkman/veritas_vcs.servicegroup b/checkman/veritas_vcs.servicegroup
new file mode 100644
index 0000000..4a6142d
--- /dev/null
+++ b/checkman/veritas_vcs.servicegroup
@@ -0,0 +1,25 @@
+title: Veritas Cluster Service: Service Group
+agents: linux
+catalog: os/services
+license: GPL
+distribution: check_mk
+description:
+ This check needs the {check_mk_agent.linux} agent which provides
+ information about the Veritas Cluster Service if it is installed.
+
+ The check monitors the service group state and can have the following states:
+ - "ONLINE" will be OK,
+ - "OFFLINE" will be WARN,
+ - "FAULTED" will be CRIT.
+
+ The check is cluster-aware. In this case we have:
+ - If one service group reports "FAULTED" the service state will be CRIT,
+ - if one reports "ONLINE" the state will be OK,
+ - if all service groups are "OFFLINE" the service state will be CRIT,
+ - otherwise it will be WARN.
+
+item:
+ The service group name.
+
+inventory:
+ One service per service group is created.
diff --git a/checkman/veritas_vcs.system b/checkman/veritas_vcs.system
new file mode 100644
index 0000000..8f32c59
--- /dev/null
+++ b/checkman/veritas_vcs.system
@@ -0,0 +1,24 @@
+title: Veritas Cluster Service: System
+agents: linux
+catalog: os/services
+license: GPL
+distribution: check_mk
+description:
+ This check needs the {check_mk_agent.linux} agent which provides
+ information about the Veritas Cluster Service if it is installed.
+
+ The check monitors the system state and can have the following states:
+ - "RUNNING" will be OK,
+ - "EXITED" will be WARN,
+ - "FAULTED" will be CRIT.
+
+ The check is cluster-aware. In this case we have:
+ - If one system reports "FAULTED" the service state will be CRIT,
+ - if one reports "ONLINE" the state will be OK,
+ - otherwise it will be WARN.
+
+item:
+ The system name.
+
+inventory:
+ One service per system is created.
Module: check_mk
Branch: master
Commit: 5d1671fc78eeebade7341e732e891566e8b5c979
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d1671fc78eeeb…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Aug 21 11:29:19 2015 +0200
#2519 check_mk_agent.linux: New section for a Veritas Cluster Service
New section for the check veritas_vcs and its subchecks which monitor
the cluster state, systems, resources and service groups state
of a Veritas Cluster Service if it is installed.
---
.werks/2519 | 11 +++++++++++
ChangeLog | 1 +
2 files changed, 12 insertions(+)
diff --git a/.werks/2519 b/.werks/2519
new file mode 100644
index 0000000..3b08ad3
--- /dev/null
+++ b/.werks/2519
@@ -0,0 +1,11 @@
+Title: check_mk_agent.linux: New section for a Veritas Cluster Service
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1440149184
+Class: feature
+
+New section for the check veritas_vcs and its subchecks which monitor
+the cluster state, systems, resources and service groups state
+of a Veritas Cluster Service if it is installed.
diff --git a/ChangeLog b/ChangeLog
index 0b2cf54..c0de7e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@
* 2420 mk_db2.aix: now able to monitor partitioned databases...
* 2530 ups_modulys_alarms ups_modulys_battery ups_modulys_battery_temp ups_modulys_inphase ups_modulys_outphase: New checks for the Socomec Modulys UPS
* 2518 veritas_vcs: New check which monitors the Veritas Cluster Service...
+ * 2519 check_mk_agent.linux: New section for a Veritas Cluster Service...
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
* 2316 FIX: windows agent: fix garbled output of cached agent plugins...
* 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...