Module: check_mk
Branch: master
Commit: ebc91c1992a3d6cd2bf3e5b13803b70f56145020
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebc91c1992a3d6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 9 15:31:55 2014 +0200
Fixed some trailing spaces
---
checkman/cisco_secure | 2 +-
checkman/enterasys_lsnat | 2 +-
checks/cisco_secure | 8 ++++----
checks/enterasys_cpu_util | 2 +-
checks/ibm_svc_nodestats | 4 ++--
checks/ibm_svc_systemstats | 2 +-
web/plugins/views/availability.py | 12 ++++++------
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/checkman/cisco_secure b/checkman/cisco_secure
index c79b9cd..41a508f 100644
--- a/checkman/cisco_secure
+++ b/checkman/cisco_secure
@@ -6,7 +6,7 @@ distribution: check_mk
description:
This check monitors the port Security feature of cisco_switches. It returns a {CRITICAL} state for
each port which is locked due a security isse. If is port security configured but cant be enabled
- the check returns {WARNING}. If a port goes down, the check ignores that and only shows a information in the
+ the check returns {WARNING}. If a port goes down, the check ignores that and only shows a information in the
check output.
item:
diff --git a/checkman/enterasys_lsnat b/checkman/enterasys_lsnat
index 4c4953b..c3c1b16 100644
--- a/checkman/enterasys_lsnat
+++ b/checkman/enterasys_lsnat
@@ -4,7 +4,7 @@ catalog: hw/network/enterasys
license: GPL
distribution: check_mk
description:
- This check monitors the number of current LSNAT bindings if the feature is activated
+ This check monitors the number of current LSNAT bindings if the feature is activated
on this device (oid .1.3.6.1.4.1.5624.1.2.74.1.1.5.0 must contain a value)
inventory:
diff --git a/checks/cisco_secure b/checks/cisco_secure
index f3e9fa6..aa7e030 100644
--- a/checks/cisco_secure
+++ b/checks/cisco_secure
@@ -38,9 +38,9 @@ def inventory_cisco_secure(info):
inventory = []
for name, op_state, enabled, status, violationCount, lastmac in info:
#if portsecurity enabled and port up OR currently there is sercurity issue`
- if ( enabled == 1 and op_state == 1) or status == 3:
+ if ( enabled == 1 and op_state == 1) or status == 3:
inventory.append( (name, None) )
- return inventory
+ return inventory
def check_cisco_secure(item, params, info):
secure_states = {
@@ -72,9 +72,9 @@ check_info["cisco_secure"] = {
"service_description" : "Security Port %s",
"snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \
oid(".1.3.6.1.4.1.9.9.315.1.2.1.1.1.*"),
- "snmp_info" : [ (".1.3.6.1.2.1.2.2.1", [OID_END, 2, 8 ] ),
+ "snmp_info" : [ (".1.3.6.1.2.1.2.2.1", [OID_END, 2, 8 ] ),
( ".1.3.6.1.4.1.9.9.315.1.2.1.1",
- [
+ [
OID_END,
"1", # cpsIfPortSecurityEnable
"2", # cpsIfPortSecurityStatus
diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util
index fc0de09..0f8317b 100644
--- a/checks/enterasys_cpu_util
+++ b/checks/enterasys_cpu_util
@@ -27,7 +27,7 @@ enterasys_cpu_default_levels = (90, 95)
def inventory_enterasys_cpu_util(info):
# [:-2] to remove the oid end
- return [ ( x[0][:-2], "enterasys_cpu_default_levels" ) for x in info ]
+ return [ ( x[0][:-2], "enterasys_cpu_default_levels" ) for x in info ]
def check_enterasys_cpu_util( item, params, info):
for core, util in info:
diff --git a/checks/ibm_svc_nodestats b/checks/ibm_svc_nodestats
index 5a70883..2e25110 100644
--- a/checks/ibm_svc_nodestats
+++ b/checks/ibm_svc_nodestats
@@ -77,8 +77,8 @@
# 'Drives BLUBBSVC03': {'r_mb': 0, 'w_mb': 0, 'r_io': 0, 'w_io': 0},
# 'Drives BLUBBSVC04': {'r_mb': 0, 'w_mb': 0, 'r_io': 0, 'w_io': 0},
# 'MDisks BLUBBSVC01': {'r_mb': 1, 'w_mb': 16, 'r_io': 15, 'w_io': 865},
-# 'MDisks BLUBBSVC02': {'r_mb': 3, 'w_mb': 6, 'r_io': 245, 'w_io': 361},
-# 'MDisks BLUBBSVC03': {'r_mb': 28, 'w_mb': 5, 'r_io': 1194, 'w_io': 901},
+# 'MDisks BLUBBSVC02': {'r_mb': 3, 'w_mb': 6, 'r_io': 245, 'w_io': 361},
+# 'MDisks BLUBBSVC03': {'r_mb': 28, 'w_mb': 5, 'r_io': 1194, 'w_io': 901},
# 'MDisks BLUBBSVC04': {'r_mb': 0, 'w_mb': 162, 'r_io': 0, 'w_io': 1414},
# 'VDisks BLUBBSVC01': {'r_mb': 0, 'w_mb': 0, 'r_io': 19, 'w_io': 110},
# 'VDisks BLUBBSVC02': {'r_mb': 101, 'w_mb': 13, 'r_io': 1105, 'r_mb': 101},
diff --git a/checks/ibm_svc_systemstats b/checks/ibm_svc_systemstats
index ace12ce..9610fac 100644
--- a/checks/ibm_svc_systemstats
+++ b/checks/ibm_svc_systemstats
@@ -98,7 +98,7 @@ def ibm_svc_systemstats_parse(info):
# | |
# '----------------------------------------------------------------------'
-def inventory_ibm_svc_systemstats_diskio(info):
+def inventory_ibm_svc_systemstats_diskio(info):
inventory = []
parsed = ibm_svc_systemstats_parse(info)
for key in parsed.keys():
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index d55c04e..e57dcaa 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -40,17 +40,17 @@
# done in get_availability_data().
#
# - htdocs/views.py:show_view()
-# - plugins/views/availability.py:render_availability()
+# - plugins/views/availability.py:render_availability()
# - plugins/views/availability.py:get_availability_data()
# - plugins/views/availability.py:do_render_availability()
# - plugins/views/availability.py:render_availability_table()
-#
+#
# 2a) timeline of hosts/services
# It is much the same as for 1a), just that in get_availability_data()
# an additional filter is being added for selecting just one host/serivce.
#
# - htdocs/views.py:show_view()
-# - plugins/views/availability.py:render_availability()
+# - plugins/views/availability.py:render_availability()
# - plugins/views/availability.py:get_availability_data()
# - plugins/views/availability.py:do_render_availability()
# - plugins/views/availability.py:render_timeline()
@@ -59,18 +59,18 @@
# In order to use the filter logic of the aggr datasource, we
# also start in show_view(). But this time we let the actual
# rows being computed - just we make sure that only the two
-# columns aggr_name, aggr_group and aggr_tree are being fetched. The
+# columns aggr_name, aggr_group and aggr_tree are being fetched. The
# other columns won't be displayed. We just need the correct
# result set. With that we fork into render_bi_availability().
# This computes the historic states of the aggregate by using
# data from hosts/services from state_hist.
#
# - htdocs/views.py:show_view()
-# - plugins/views/availability.py:render_bi_availability()
+# - plugins/views/availability.py:render_bi_availability()
# - plugins/views/availability.py:get_bi_timeline()
# - plugins/views/availability.py:do_render_availability()
# - plugins/views/availability.py:render_availability_table()
-#
+#
# 2b) timeline of bi aggregates
# In this case we do not need any logic from the view, since
# we just diplay one element - which is identified by aggr_group
Module: check_mk
Branch: master
Commit: 338bc0d16ab2eaa26a798fbaa6962b5a412832b9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338bc0d16ab2ea…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 9 15:21:40 2014 +0200
Small update of manpage of brocade_fcport
---
checkman/brocade_fcport | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport
index 4f52495..8e5b950 100644
--- a/checkman/brocade_fcport
+++ b/checkman/brocade_fcport
@@ -17,12 +17,16 @@ description:
{[3]} An error counter exceeds its configured levels (CRC errors, Enc-OUT
frames, no Tx credits, C3 discards)
- {Averaging}: This check supports averaging on all counters. Averaging is
+ Averaging: This check supports averaging on all counters. Averaging is
turned on but setting the check parameter {"average"} to a number of minutes.
In that case the check produces additional performance data for each parameter
and all warning/error levels are only applied on the averaged value, not on
the current one. This is especially helpful when using levels on the throughput.
+ Note: The counters CRC errors and Enc-OUT are represented as percentages in
+ relation to the number of received frames. C3 discards and no Tx credits are
+ in relation to the number of sent frames.
+
item:
The item is the port-number as two-digit or three-digit string (on switches
with 100 or more ports) as printed on the switch (note: the SNMP-index of
Module: check_mk
Branch: master
Commit: 8242786b8d2d30fda29ce09c5e839e3dd786cbcc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8242786b8d2d30…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Apr 9 14:40:55 2014 +0200
f5_bigip_cluster: fixed inventory function
---
checks/f5_bigip_cluster | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/checks/f5_bigip_cluster b/checks/f5_bigip_cluster
index 34f5e32..874379d 100644
--- a/checks/f5_bigip_cluster
+++ b/checks/f5_bigip_cluster
@@ -35,8 +35,8 @@
def inventory_f5_bigip_cluster(info):
# run inventory unless we found a device in unconfigured state
- # don't need to loop over the input as there's only one status.
- if len(info) == 1 and not info[0][0].startswith("-1"):
+ # don't need to loop over the input as there's only one status
+ if len(info) == 1 and not ( info[0][0].startswith("-1") or info[0][0] == '' ):
return [(None, None)]
return []
Module: check_mk
Branch: master
Commit: ff354002d0d69998e33459267a327e6fc1bc328f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff354002d0d699…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 9 12:54:03 2014 +0200
windows_tasks: output last and next run time
---
.werks/879 | 8 ++++++++
ChangeLog | 3 ++-
checks/windows_tasks | 29 ++++++++++++++++++-----------
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/.werks/879 b/.werks/879
new file mode 100644
index 0000000..58ea5db
--- /dev/null
+++ b/.werks/879
@@ -0,0 +1,8 @@
+Title: windows_tasks: output last and next run time
+Level: 1
+Component: checks
+Version: 1.2.5i3
+Date: 1397040831
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index d064fba..b4f7ed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,14 +18,15 @@
* 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors
* 0829 oracle_tablespaces: improved formatting of levels text in check output...
* 0757 Linux multipath check can now use the alias instead of the UUID as item...
+ * 0879 windows_tasks: output last and next run time
* 0777 FIX: special agent emcvnx: did not work with security file authentication...
* 0786 FIX: zfsget: fixed compatibility with older Solaris agents...
* 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection
* 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used...
- * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks
* 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format...
* 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels...
* 0789 FIX: oracle_tablespaces: fixed bug when using dynamic filesystem levels...
+ * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks
Multisite:
* 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter)
diff --git a/checks/windows_tasks b/checks/windows_tasks
index 7aec0c7..46aca6b 100644
--- a/checks/windows_tasks
+++ b/checks/windows_tasks
@@ -25,17 +25,18 @@
# Boston, MA 02110-1301 USA.
# Example output from agent:
-#TaskName : \WebShopPictureUpload
-#Last Run Time : 17.10.2013 23:00:00
-#Next Run Time : 18.10.2013 23:00:00
-#Last Result : 0
-#Scheduled Task State : Enabled
+# <<<windows_tasks:sep(58)>>>
+# TaskName : \WebShopPictureUpload
+# Last Run Time : 17.10.2013 23:00:00
+# Next Run Time : 18.10.2013 23:00:00
+# Last Result : 0
+# Scheduled Task State : Enabled
#
-#TaskName : \OfficeSoftwareProtectionPlatform\SvcRestartTask
-#Last Run Time : N/A
-#Next Run Time : Disabled
-#Last Result : 1
-#Scheduled Task State : Disabled
+# TaskName : \OfficeSoftwareProtectionPlatform\SvcRestartTask
+# Last Run Time : N/A
+# Next Run Time : Disabled
+# Last Result : 1
+# Scheduled Task State : Disabled
def windows_tasks_convert(info):
@@ -43,7 +44,7 @@ def windows_tasks_convert(info):
last_task = False
for line in info:
name = line[0].strip()
- value = "".join(line[1:]).strip()
+ value = ":".join(line[1:]).strip()
if last_task and name != "TaskName":
data[last_task][name] = value
@@ -73,6 +74,12 @@ def check_windows_tasks(item, _no_params, info):
msg.append("Task not Enabled(!!)")
state = 2
+ if "Last Run Time" in values:
+ msg.append("last run time: %s" % values["Last Run Time"])
+
+ if "Next Run Time" in values:
+ msg.append("next run time: %s" % values["Next Run Time"])
+
return state, ", ".join(msg)
return 3, "Task not found on server"