Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: webapi get_host: also report the hosts folder

by Andreas Boesl

Module: check_mk Branch: master Commit: 3ab330db378732ffa042a52a686854a3ae625832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ab330db378732… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Aug 15 16:19:04 2014 +0200 webapi get_host: also report the hosts folder --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b5f1469..8bc7673 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17039,6 +17039,8 @@ class API: the_host = effective_attributes(the_host, the_host[".folder"]) cleaned_host = dict([(k, v) for (k, v) in the_host.iteritems() if not k.startswith('.') ]) + cleaned_host["folder"] = the_host[".folder"][".path"] + return cleaned_host def delete_host(self, hostname):

9 years, 10 months

Check_MK Git: check_mk: removed duplicate <<<windows_updates>>> section

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b8e6d63fb63d0097834ae741aeffadb367a5575 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b8e6d63fb63d0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 14 18:16:01 2014 +0200 removed duplicate <<<windows_updates>>> section --- agents/windows/plugins/windows_updates.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index ce04507..596fce4 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -48,8 +48,8 @@ Set WSHShell = CreateObject("WScript.Shell") Dim RebootTime Dim RegPath -WScript.Echo "<<<windows_updates>>>" If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then + WScript.Echo "<<<windows_updates>>>" WScript.Quit() End If

9 years, 10 months

Check_MK Git: check_mk: webapi: fixed exception in host tag validation function

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d4a1b688803471449028ab1760c810055d41b58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d4a1b68880347… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Aug 15 16:03:03 2014 +0200 webapi: fixed exception in host tag validation function --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index af6fc2b..b5f1469 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16764,10 +16764,10 @@ def activate_changes(): # Checks if the given host_tags are all in known host tag groups and have a valid value def check_host_tags(host_tags): for key, value in host_tags.items(): - for group_name, group_descr, group_tags in configured_host_tags: - if key == group_name: - for name, descr, aux in group_tags: - if name == value: + for group_entry in configured_host_tags: + if group_entry[0] == key: + for value_entry in group_entry[2]: + if value_entry[0] == value: break else: raise MKUserError(None, _("Unknown host tag %s") % html.attrencode(value))

9 years, 10 months

Check_MK Git: check_mk: #1008 Overall check timeout for Check_MK checks now defaults to CRIT state

by Mathias Kettner

Module: check_mk Branch: master Commit: 46582b9f5b243ae9d1ab521d415b78c7692a8762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46582b9f5b243a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 15 11:50:34 2014 +0200 #1008 Overall check timeout for Check_MK checks now defaults to CRIT state When using the Check_MK Micro Core as the core then the service status for Check_MK services that ran into an overal timeout (default is 60 seconds) was UNKNOWN. This has changed to CRIT. Furthermore this is configurable via a new Timeout option in the ruleset Status of the Check_MK service. --- .werks/1008 | 12 ++++++++++++ ChangeLog | 3 +++ modules/check_mk.py | 6 ++++-- web/plugins/wato/check_mk_configuration.py | 8 +++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/1008 b/.werks/1008 new file mode 100644 index 0000000..7627e27 --- /dev/null +++ b/.werks/1008 @@ -0,0 +1,12 @@ +Title: Overall check timeout for Check_MK checks now defaults to CRIT state +Level: 2 +Component: core +Compatible: compat +Version: 1.2.5i6 +Date: 1408096113 +Class: feature + +When using the Check_MK Micro Core as the core then the service status for Check_MK +services that ran into an overal timeout (default is 60 seconds) was UNKNOWN. This +has changed to CRIT. Furthermore this is configurable via a new Timeout +option in the ruleset Status of the Check_MK service. diff --git a/ChangeLog b/ChangeLog index 097f997..15e1a44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i6: + Core & Setup: + * 1008 Overall check timeout for Check_MK checks now defaults to CRIT state... + Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... diff --git a/modules/check_mk.py b/modules/check_mk.py index 8c03880..07e374e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5533,8 +5533,10 @@ def do_check_keepalive(): signal.alarm(0) except MKCheckTimeout: signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc - status = 3 - total_check_output = "UNKNOWN - Check_MK timed out after %d seconds\n" % timeout + spec = exit_code_spec(hostname) + status = spec.get("timeout", 2) + total_check_output = "%s - Check_MK timed out after %d seconds\n" % ( + nagios_state_names[status], timeout) os.write(keepalive_fd, "%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f6e8637..370efdb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2301,6 +2301,11 @@ register_rule(group, default_value = 2, title = _("State in case of connection problems")), ), + ( "timeout", + MonitoringState( + default_value = 2, + title = _("State in case of a overall timeout")), + ), ( "missing_sections", MonitoringState( default_value = 1, @@ -2328,7 +2333,8 @@ register_rule(group, help = _("This ruleset specifies the total status of the Check_MK service in " "case of various error situations. One use case is the monitoring " "of hosts that are not always up. You can have Check_MK an OK status " - "here if the host is not reachable."), + "here if the host is not reachable. Note: the Timeout setting only works " + "when using the Check_MK Micro Core."), match = "dict", )

9 years, 10 months

Check_MK Git: check_mk: #1007 FIX check_mkevents: fix case where events contain binary zeroes

by Mathias Kettner

Module: check_mk Branch: master Commit: 48a82177206d7442a9c9cbda28c57075e3d68102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a82177206d74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 15 11:29:25 2014 +0200 #1007 FIX check_mkevents: fix case where events contain binary zeroes --- .werks/1007 | 9 +++++++++ ChangeLog | 3 +++ mkeventd/lib/check_mkevents.cc | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/1007 b/.werks/1007 new file mode 100644 index 0000000..a964816 --- /dev/null +++ b/.werks/1007 @@ -0,0 +1,9 @@ +Title: check_mkevents: fix case where events contain binary zeroes +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i6 +Date: 1408094945 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 22dfa2c..097f997 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,9 @@ * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + Event Console: + * 1007 FIX: check_mkevents: fix case where events contain binary zeroes + HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... NOTE: Please refer to the migration notes! diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 8f1ceb1..5879af4 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. - #include <stdlib.h> #include <errno.h> #include <stdio.h> @@ -182,11 +181,18 @@ int main(int argc, char** argv) int length = write(sock, query_message.c_str(), query_message.length()); // Get response - char response_chunk[2048]; + char response_chunk[4096]; memset(response_chunk, 0, sizeof(response_chunk)); stringstream response_stream; - while (read(sock, response_chunk, sizeof(response_chunk))){ - response_stream << response_chunk; + int read_length; + while (0 < (read_length = read(sock, response_chunk, sizeof(response_chunk)))) + { + // replace binary 0 in response with space + for (int i=0; i<read_length; i++) { + if (response_chunk[i] == 0) + response_chunk[i] = ' '; + } + response_stream << string(response_chunk, read_length); memset(response_chunk, 0, sizeof(response_chunk)); } close(sock); @@ -226,6 +232,8 @@ int main(int argc, char** argv) // Get data vector< vector<string> > data; while (getline(response_stream, line)) { + if (line.size() < headers.size()) + break; // broken / empty line linestream.str(""); linestream.clear(); linestream << line;

9 years, 10 months

Check_MK Git: check_mk: mem.win: another scaling fix for the prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: db2281a93d207f6af3b9833ec34386321910ea0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2281a93d207f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 15 10:53:02 2014 +0200 mem.win: another scaling fix for the prediction --- checks/mem | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/mem b/checks/mem index 0845b31..176aa6d 100644 --- a/checks/mem +++ b/checks/mem @@ -151,11 +151,11 @@ def check_mem_windows(item, params, info): # Predictive levels else: state, infoadd, perfadd = check_levels( - used_kb, # Current value + used_kb / 1024.0, # Current value stored in MB in RRDs "average" in params and paramname + "_avg" or paramname, # Name of RRD variable params[paramname], unit = "GB", # Levels are specified in GB... - scale = 1024 * 1024, # ... in WATO ValueSpec + scale = 1024, # ... in WATO ValueSpec ) if infoadd: infotext += ", " + infoadd

9 years, 10 months

Check_MK Git: check_mk: removed print from printer_io.include

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a5aca5a25ea91626e1d6c12ee2483d6ccf3465e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a5aca5a25ea91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 14 17:08:33 2014 +0200 removed print from printer_io.include --- checks/printer_io.include | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/printer_io.include b/checks/printer_io.include index 43c7a92..6d076e1 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -119,7 +119,6 @@ def check_printer_io(item, params, info, what): else: # output warn, crit = params['capacity_levels'] # percentage levels - print warn, crit if crit != None and level_perc >= crit: state = 2 levels_txt = ' (>= %0.2f)' % crit

9 years, 10 months

Check_MK Git: check_mk: printer_input, printer_output: fixed precompile and default levels for output

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d62558694c9d4ff52e8163a5855638e75e9db42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d62558694c9d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 14 17:07:55 2014 +0200 printer_input, printer_output: fixed precompile and default levels for output --- checks/printer_input | 47 ++++++++++++++++++++++++++++ checks/{printer_io => printer_io.include} | 48 ++++------------------------- checks/printer_output | 47 ++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 42 deletions(-) diff --git a/checks/printer_input b/checks/printer_input new file mode 100644 index 0000000..e20b867 --- /dev/null +++ b/checks/printer_input @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +check_info["printer_input"] = { + 'inventory_function': inventory_printer_io, + 'check_function': lambda item, params, info: check_printer_io(item, params, info, 'input'), + 'service_description': 'Input %s', + 'has_perfdata': False, + 'snmp_info': ( + '.1.3.6.1.2.1.43.8.2.1', [ + '13', # Printer-MIB::prtInputName + '18', # Printer-MIB::prtInputDescription + '11', # Printer-MIB::prtInputStatus + '8', # Printer-MIB::prtInputCapacityUnit + '9', # Printer-MIB::prtInputMaxCapacity + '10', # Printer-MIB::prtInputCurrentLevel + ] + ), + 'snmp_scan_function': \ + lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, + 'group': 'printer_input', + 'default_levels_variable': 'printer_input_default_levels', + 'includes': [ 'printer_io.include' ], +} diff --git a/checks/printer_io b/checks/printer_io.include similarity index 73% rename from checks/printer_io rename to checks/printer_io.include index 162f68c..43c7a92 100644 --- a/checks/printer_io +++ b/checks/printer_io.include @@ -56,10 +56,14 @@ printer_io_states = { 64: (0, 'Transitioning to intended state'), } -factory_settings['printer_io_default_levels'] = { +factory_settings['printer_default_levels'] = { 'capacity_levels': (0.0, 0.0), } +factory_settings['printer_output_default_levels'] = { + 'capacity_levels': (100.0, 100.0), +} + def inventory_printer_io(info): for line in info: snmp_status = saveint(line[2]) @@ -115,6 +119,7 @@ def check_printer_io(item, params, info, what): else: # output warn, crit = params['capacity_levels'] # percentage levels + print warn, crit if crit != None and level_perc >= crit: state = 2 levels_txt = ' (>= %0.2f)' % crit @@ -125,44 +130,3 @@ def check_printer_io(item, params, info, what): yield state, 'Capacity: %s of %s %s %s%s' % \ (level_txt, capacity_max, capacity_unit, how, levels_txt) -check_info["printer_input"] = { - 'inventory_function': inventory_printer_io, - 'check_function': lambda item, params, info: check_printer_io(item, params, info, 'input'), - 'service_description': 'Input %s', - 'has_perfdata': False, - 'snmp_info': ( - '.1.3.6.1.2.1.43.8.2.1', [ - '13', # Printer-MIB::prtInputName - '18', # Printer-MIB::prtInputDescription - '11', # Printer-MIB::prtInputStatus - '8', # Printer-MIB::prtInputCapacityUnit - '9', # Printer-MIB::prtInputMaxCapacity - '10', # Printer-MIB::prtInputCurrentLevel - ] - ), - 'snmp_scan_function': \ - lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, - 'group': 'printer_input', - 'default_levels_variable': 'printer_io_default_levels', -} - -check_info["printer_output"] = { - 'inventory_function': inventory_printer_io, - 'check_function': lambda item, params, info: check_printer_io(item, params, info, 'output'), - 'service_description': 'Output %s', - 'has_perfdata': False, - 'snmp_info': ( - '.1.3.6.1.2.1.43.9.2.1', [ - '7', # Printer-MIB::prtOutputName - '12', # Printer-MIB::prtOutputDescription - '6', # Printer-MIB::prtOutputStatus - '3', # Printer-MIB::prtOutputCapacityUnit - '4', # Printer-MIB::prtOutputMaxCapacity - '5', # Printer-MIB::prtOutputRemainingCapacity - ] - ), - 'snmp_scan_function': \ - lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, - 'group': 'printer_output', - 'default_levels_variable': 'printer_io_default_levels', -} diff --git a/checks/printer_output b/checks/printer_output new file mode 100644 index 0000000..9fea20a --- /dev/null +++ b/checks/printer_output @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +check_info["printer_output"] = { + 'inventory_function': inventory_printer_io, + 'check_function': lambda item, params, info: check_printer_io(item, params, info, 'output'), + 'service_description': 'Output %s', + 'has_perfdata': False, + 'snmp_info': ( + '.1.3.6.1.2.1.43.9.2.1', [ + '7', # Printer-MIB::prtOutputName + '12', # Printer-MIB::prtOutputDescription + '6', # Printer-MIB::prtOutputStatus + '3', # Printer-MIB::prtOutputCapacityUnit + '4', # Printer-MIB::prtOutputMaxCapacity + '5', # Printer-MIB::prtOutputRemainingCapacity + ] + ), + 'snmp_scan_function': \ + lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, + 'group': 'printer_output', + 'default_levels_variable': 'printer_output_default_levels', + 'includes': [ 'printer_io.include' ], +}

9 years, 10 months

Check_MK Git: check_mk: cisco_temp_sensor: fixed various issues on parsing data

by Andreas Boesl

Module: check_mk Branch: master Commit: 7f4ca1e7f73fe6e02f38527022fba95330c6e8cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f4ca1e7f73fe6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 14 16:50:52 2014 +0200 cisco_temp_sensor: fixed various issues on parsing data --- checks/cisco_temp_sensor | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 66cdff4..c0c0cbf 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -122,10 +122,10 @@ def parse_cisco_temp_sensor(info): for endoid, levels in levels_info: # endoid is e.g. 21549.9 or 21459.10 level = saveint(levels) - if level > 70: + if level > 150: level = level / 10 id, subid = endoid.split('.') - thresholds.setdefault(id, []).append(levels) + thresholds.setdefault(id, []).append(level) # Create main dictionary (only of temperature sensors) sensors = [] @@ -133,9 +133,9 @@ def parse_cisco_temp_sensor(info): # Poor try to find temperature values, which are given in tenths of degrees. # Seems that some new firmware shows this behaviour. # A normal temperature sensor has only a range up to - # 60 degree, so we've chosen 70. + # 60 degree, so we've chosen 150. value = saveint(value) - if value > 70: + if value > 150: value = value / 10 sensors.append( ( id, descriptions.get(id), sensortype, value, sensorstate, thresholds[id] ) ) @@ -147,7 +147,8 @@ def inventory_cisco_temp_sensor(info): for id, descr, sensortype, value, sensorstate, levels in sensors: # Use all temperature sensors with a non-empty description and valid threshold if descr != None and sensortype == '8' and len(levels) in [ 2, 4 ]: - inventory.append(( descr, levels[0:2] )) + warn, crit = saveint(levels[0]), saveint(levels[1]) + inventory.append(( descr, (warn, crit) )) return inventory def check_cisco_temp_sensor(item, params, info): @@ -165,18 +166,19 @@ def check_cisco_temp_sensor(item, params, info): perfdata = [ ( "temperature", temp, warn, crit ) ] state = 0 - if sensorstate == "2": - return (3, "Data from sensor currently not available") - elif sensorstate == "3": - return (3, "Sensor is broken") - - if temp >= crit: - state = 2 - infotext += levels - elif temp >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata + if sensorstate == "2": + return (3, "Data from sensor currently not available") + elif sensorstate == "3": + return (3, "Sensor is broken") + + if temp >= crit: + state = 2 + infotext += levels + elif temp >= warn: + state = 1 + infotext += levels + return state, infotext, perfdata + return (3, "Sensor not found in SNMP data")

9 years, 10 months

Check_MK Git: check_mk: #1006 printer_pages: add Perf-O-Meter and PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 675be85495632e8280d49972032fb6781556793a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=675be85495632e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 14 16:49:05 2014 +0200 #1006 printer_pages: add Perf-O-Meter and PNP template --- .werks/1006 | 9 +++++++++ ChangeLog | 1 + checks/canon_pages | 16 +++++++++------- checks/printer_pages | 2 +- web/plugins/perfometer/check_mk.py | 7 +++++++ 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/1006 b/.werks/1006 new file mode 100644 index 0000000..e8adc7c --- /dev/null +++ b/.werks/1006 @@ -0,0 +1,9 @@ +Title: printer_pages: add Perf-O-Meter and PNP template +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408027731 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1a8592e..455cfaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ NOTE: Please refer to the migration notes! * 1174 rms200_temp: New Temperature check for RMS200 Devices * 1175 dell_idrac_disks: New Check for Harddisks using Dell iDrac + * 1006 printer_pages: add Perf-O-Meter and PNP template * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/canon_pages b/checks/canon_pages index 17b1cea..2e2af46 100644 --- a/checks/canon_pages +++ b/checks/canon_pages @@ -49,14 +49,16 @@ def check_canon_pages(item, _no_params, info): return (3, "unknown counter type %s" % item) for endoid, value in info: if endoid == canon_pages_map[item]: - return (0, 'Current count: %s' % value, [('count', int(value))]) + return (0, '%s pages printed' % value, [('count', int(value))]) return (3, 'Item not found in SNMP data') +check_info["canon_pages"] = { + 'check_function': check_canon_pages, + 'inventory_function': inventory_canon_pages, + 'service_description': 'Pages %s', + 'has_perfdata': True, + 'snmp_info': ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, "" ]), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None +} -check_info['canon_pages'] = (check_canon_pages, "Pages %s", 1, inventory_canon_pages) - -snmp_info['canon_pages'] = \ - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, "" ]) - -snmp_scan_functions['canon_pages'] = lambda oid: oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None diff --git a/checks/printer_pages b/checks/printer_pages index 81d21bc..809cf6f 100644 --- a/checks/printer_pages +++ b/checks/printer_pages @@ -29,7 +29,7 @@ def inventory_printer_pages(info): def check_printer_pages(_no_item, _no_params, info): pages = saveint(info[0][0]) - infotext = "%d Pages printed" % pages + infotext = "%d pages printed" % pages perfdata = [ ( "pages", pages ) ] return (0, "%s" % infotext, perfdata) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 856ba19..f33f983 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -731,6 +731,13 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): perfometers["check_mk-printer_supply"] = perfometer_check_mk_printer_supply perfometers["check_mk-printer_supply_ricon"] = perfometer_check_mk_printer_supply +def perfometer_printer_pages(row, check_command, perf_data): + color = "#909090" + return "%d" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 50000, 6, color) + +perfometers["check_mk-printer_pages"] = perfometer_printer_pages +perfometers["check_mk-canon_pages"] = perfometer_printer_pages + def perfometer_msx_queues(row, check_command, perf_data): length = int(perf_data[0][1]) state = row["service_state"]

9 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014