Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 935c8f999e05b3f50e6b4e0334bce51b16225e1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=935c8f999e05b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 09:48:24 2015 +0100 Testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 03f8db7..ab7d841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale + 1.2.6b1: Core & Setup: * 1439 mk-job: now also available on solaris systems...

9 years, 9 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 64273f79d368c80bf7439e390f233f47e4691b75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64273f79d368c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 09:47:21 2015 +0100 Testcommit --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab7d841..03f8db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,7 +166,6 @@ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale - 1.2.6b1: Core & Setup: * 1439 mk-job: now also available on solaris systems...

9 years, 9 months

Check_MK Git: check_mk: Test commit

by Sven Rueß

Module: check_mk Branch: master Commit: 658745b0b7a9d6db3c2fea3d980b4f9f0bcd1019 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=658745b0b7a9d6… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Jan 22 09:41:09 2015 +0100 Test commit --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 267eb61..ab7d841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ * 1808 FIX: Fixed broken nagios config when using RBN without a host defined... * 1842 FIX: Rewrote implementation of service discovery (formerly inventory)... * 1869 FIX: Deleting outdated persisted agent sections now - + Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... * 1782 msexch_replhealth: new check for monitoring health of MS Exchange DAG

9 years, 9 months

Check_MK Git: check_mk: Test commit

by Sven Rueß

Module: check_mk Branch: master Commit: 4ceacaa8e7a48a3d352978b781755feb7c1ed568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ceacaa8e7a48a… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Jan 22 09:38:55 2015 +0100 Test commit --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab7d841..267eb61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ * 1808 FIX: Fixed broken nagios config when using RBN without a host defined... * 1842 FIX: Rewrote implementation of service discovery (formerly inventory)... * 1869 FIX: Deleting outdated persisted agent sections now - + Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... * 1782 msexch_replhealth: new check for monitoring health of MS Exchange DAG

9 years, 9 months

Check_MK Git: check_mk: check_mk_templates.cfg: change to new syntax --check-discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: a7fa7e86268ef81c38ca6155a1be80fc0b5abf12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7fa7e86268ef8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 22 09:23:44 2015 +0100 check_mk_templates.cfg: change to new syntax --check-discovery --- check_mk_templates.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 77029b5..b45944d 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -307,7 +307,7 @@ define command { # Inventory check define command { command_name check-mk-inventory - command_line @BINDIR@/check_mk --cache --check-inventory "$HOSTNAME$" + command_line @BINDIR@/check_mk --cache --check-discovery "$HOSTNAME$" } define command {

9 years, 9 months

Check_MK Git: check_mk: Smaller code cleanup; cleaner bugfix

by Lars Michelsen

Module: check_mk Branch: master Commit: d2652579b3dc63eaf30985dbf478bff7e72755f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2652579b3dc63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 09:10:27 2015 +0100 Smaller code cleanup; cleaner bugfix --- checks/ps.include | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 5f9b1f1..b3b6a47 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -34,28 +34,28 @@ def inventory_ps_common(invdata, invrules, info): entries = [] # Handle inventory_processes, inventory_processes_perf variables - for inventry in invdata: + for inv_entry in invdata: # New in 1.1.7i1: inventory_processes may be prefixed with list of # host names or tags + ALL_HOSTS tags = None - if len(inventry) == 8: + if len(inv_entry) == 8: tags = [] - hostlist = inventry[0] - inventry = inventry[1:] - elif len(inventry) == 9: - tags = inventry[0] - hostlist = inventry[1] - inventry = inventry[2:] + hostlist = inv_entry[0] + inv_entry = inv_entry[1:] + elif len(inv_entry) == 9: + tags = inv_entry[0] + hostlist = inv_entry[1] + inv_entry = inv_entry[2:] # Filter out entries with do not match our current host if tags != None and ( not hosttags_match_taglist(tags_of_host(g_hostname), tags) or not in_extraconf_hostlist(hostlist, g_hostname)): continue - if len(inventry) == 7: # extend old inventory_processes - inventry += ([],) + if len(inv_entry) == 7: # extend old inventory_processes + inv_entry += ([],) - entries.append(inventry) + entries.append(inv_entry[:3]) # Handle new WATO style inventory rules for rule in invrules: @@ -74,8 +74,7 @@ def inventory_ps_common(invdata, invrules, info): entries.append((v['descr'], v['match'], v.get('user'))) - for entry in entries: - servicedesc, pattern, userspec = entry[:3] + for servicedesc, pattern, userspec in entries: num_perc_s = servicedesc.count("%s") for line in info: # First entry in line is the node name or None for non-clusters

9 years, 9 months

Check_MK Git: check_mk: #1874 FIX ps: Old process inventory configurations work now again

by Lars Michelsen

Module: check_mk Branch: master Commit: c098b97a2c6f7ca63729bcd1d7576c24ffbbc195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c098b97a2c6f7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 08:58:27 2015 +0100 #1874 FIX ps: Old process inventory configurations work now again Since werk #1563 we migrated the way the process inventory is being configured. The intention was that old style configurations remain working after an upgrade. This compatibility was broken and has been fixed again. --- .werks/1874 | 14 ++++++++++++++ ChangeLog | 3 +-- checks/ps.include | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/1874 b/.werks/1874 new file mode 100644 index 0000000..c41e8f9 --- /dev/null +++ b/.werks/1874 @@ -0,0 +1,14 @@ +Title: ps: Old process inventory configurations work now again +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421913153 + +Since werk #1563 we migrated the way the process inventory is being +configured. + +The intention was that old style configurations remain working after +an upgrade. This compatibility was broken and has been fixed again. diff --git a/ChangeLog b/ChangeLog index 0016eb1..ab7d841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,8 +50,6 @@ NOTE: Please refer to the migration notes! * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances - * 1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule... - NOTE: Please refer to the migration notes! * 1857 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! @@ -101,6 +99,7 @@ NOTE: Please refer to the migration notes! * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... + * 1874 FIX: ps: Old process inventory configurations work now again... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ps.include b/checks/ps.include index bcb8de7..5f9b1f1 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -74,7 +74,8 @@ def inventory_ps_common(invdata, invrules, info): entries.append((v['descr'], v['match'], v.get('user'))) - for servicedesc, pattern, userspec in entries: + for entry in entries: + servicedesc, pattern, userspec = entry[:3] num_perc_s = servicedesc.count("%s") for line in info: # First entry in line is the node name or None for non-clusters

9 years, 9 months

Check_MK Git: check_mk: Removed unused fan valuespec

by Konstantin Büttner

Module: check_mk Branch: master Commit: 175714a07d627bd1350d3151f0c541cdbbdbeab3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=175714a07d627b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 18:59:19 2015 +0100 Removed unused fan valuespec --- web/plugins/wato/check_parameters.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5e49f6b..de4bfac 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5635,30 +5635,6 @@ register_check_parameters( ) register_check_parameters( - subgroup_environment, - "fan", - _("Fan speed"), - Tuple( - elements = [ - Integer( - title = _("Warning below"), - default_value = 200, - unit = u"rpm", - ), - Integer( - title = _("Critical below"), - default_value = 100, - unit = u"rpm", - ), - ] - ), - TextAscii( - title = _("Fan Name"), - help = _("The identificator of the fan.")), - None -) - -register_check_parameters( subgroup_os, "pf_used_states", _("Number of used states of OpenBSD PF engine"),

9 years, 9 months

Check_MK Git: check_mk: bintec_sensors, climaveneta_fan:

by Konstantin Büttner

Re-implement upper levels for fan speed Message-ID: <54bfe892.UET2PL4iQ2ofUtkV%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 2e0b910e2876c462801105f30665ff96b2e25e21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0b910e2876c4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 18:57:34 2015 +0100 bintec_sensors, climaveneta_fan: Re-implement upper levels for fan speed --- checks/bintec_sensors | 21 ++++++++++++--------- checks/climaveneta_fan | 11 +++++++---- checks/fan.include | 20 +++++++++++++------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/checks/bintec_sensors b/checks/bintec_sensors index f9104f5..3c2e190 100644 --- a/checks/bintec_sensors +++ b/checks/bintec_sensors @@ -44,13 +44,15 @@ bintec_sensors_info = ( ".1.3.6.1.4.1.272.4.17.7.1.1.1", [ # | | # '----------------------------------------------------------------------' -bintec_sensors_fan_default_levels = (2000, 1000) +factory_settings["bintec_sensors_fan_default_levels" = { + "lower" : (2000, 1000), +} def inventory_bintec_sensors_fan(info): inventory = [] for sensor_id, sensor_descr, sensor_type, sensor_value, sensor_unit in info: if sensor_type == "2": - inventory.append( (sensor_descr, "bintec_sensors_fan_default_levels" ) ) + inventory.append( (sensor_descr, {}) ) return inventory def check_bintec_sensors_fan(item, params, info): @@ -59,13 +61,14 @@ def check_bintec_sensors_fan(item, params, info): return check_fan(int(sensor_value), params) check_info["bintec_sensors.fan"] = { - "check_function" : check_bintec_sensors_fan, - "inventory_function" : inventory_bintec_sensors_fan, - "service_description" : "%s", - "snmp_info" : bintec_sensors_info, - "snmp_scan_function" : bintec_sensors_scan, - "group" : "fan", - "includes" : [ "fan.include" ], + "check_function" : check_bintec_sensors_fan, + "inventory_function" : inventory_bintec_sensors_fan, + "service_description" : "%s", + "snmp_info" : bintec_sensors_info, + "snmp_scan_function" : bintec_sensors_scan, + "default_levels_variable" : "bintec_sensors_fan_default_levels", + "group" : "hw_fans", + "includes" : [ "fan.include" ], } #. diff --git a/checks/climaveneta_fan b/checks/climaveneta_fan index 385dd69..cd0202e 100644 --- a/checks/climaveneta_fan +++ b/checks/climaveneta_fan @@ -25,12 +25,14 @@ # Boston, MA 02110-1301 USA. -climaveneta_fan_default_levels = (200, 100) +factory_settings["climaveneta_fan_default_levels"] = { + "lower": (200, 100), +} def inventory_climaveneta_fan(info): if len(info[0]) == 2: - return [ (1, "climaveneta_fan_default_levels"), (2, "climaveneta_fan_default_levels") ] + return [ (1, {}), (2, {}) ] def check_climaveneta_fan(item, params, info): @@ -44,7 +46,8 @@ check_info["climaveneta_fan"] = { "service_description" : "Fan %s", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "pCO Gateway", "snmp_info" : (".1.3.6.1.4.1.9839.2.1.2", [ 42, 43 ] ), - "group" : "fan", - "includes" : [ "fan.include" ], + "default_levels_variable" : "climaveneta_fan_default_levels", + "group" : "hw_fans", + "includes" : [ "fan.include" ], } diff --git a/checks/fan.include b/checks/fan.include index f88e5ca..02782be 100644 --- a/checks/fan.include +++ b/checks/fan.include @@ -25,16 +25,22 @@ # Boston, MA 02110-1301 USA. def check_fan(rpm, params): - if type(params) == dict: - warn, crit = params["lower"] - else: - warn, crit = params + if type(params) == tuple: + params = { "lower" : params } + + warn, crit = params["lower"] + warn_upper, crit_upper = params.get("upper", (None, None)) message = "Speed at %d rpm" % rpm - levelstext = " (warn/crit at %s/%s rpm)" % params - if rpm < crit: + levelstext = " (warn/crit below %s/%s rpm)" % (warn, crit) + if warn_upper and crit_upper: + levelstext = levelstext[:-1] + \ + " and at or above %s/%s rpm)" % (warn_upper, crit_upper) + + # Note that None < int + if rpm < crit or rpm >= crit_upper: message += levelstext return 2, message - elif rpm < warn: + elif rpm < warn or rpm >= warn_upper: message += levelstext return 1, message else:

9 years, 9 months

Check_MK Git: check_mk: Updated Changelog

by Konstantin Büttner

Module: check_mk Branch: master Commit: dbc3d5c8ea6850e5e6489dc15591ec99894894b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbc3d5c8ea6850… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 21 18:29:34 2015 +0100 Updated Changelog --- .werks/1526 | 10 ---------- .werks/1888 | 9 --------- ChangeLog | 2 -- 3 files changed, 21 deletions(-) diff --git a/.werks/1526 b/.werks/1526 deleted file mode 100644 index 35a4d12..0000000 --- a/.werks/1526 +++ /dev/null @@ -1,10 +0,0 @@ -Title: climaveneta_fan: No longer outputs performance data, now configured via "fan" rule -Level: 1 -Component: checks -Compatible: incomp -Version: 1.2.7i1 -Date: 1421850987 -Class: feature - -This check is now configured via a different WATO rule, so any old rules set will -no longer apply. diff --git a/.werks/1888 b/.werks/1888 deleted file mode 100644 index 126fcfe..0000000 --- a/.werks/1888 +++ /dev/null @@ -1,9 +0,0 @@ -Title: bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule -Level: 1 -Component: checks -Compatible: incomp -Version: 1.2.7i1 -Date: 1421853099 -Class: feature - -This check is now configured via a different WATO rule, so any old rules set will no longer apply. diff --git a/ChangeLog b/ChangeLog index 7281e67..0016eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,8 +50,6 @@ NOTE: Please refer to the migration notes! * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances - * 1526 climaveneta_fan: No longer outputs performance data, now configured via "fan" rule... - NOTE: Please refer to the migration notes! * 1888 bintec_sensors.fan: No longer outputs performance data, now configured via "fan" rule... NOTE: Please refer to the migration notes! * 1857 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices

9 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015