Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #1238 FIX check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist.

by Bastian Kuhn

Module: check_mk Branch: master Commit: bdf1dd4ddf767b0490e3b08596b5ecdb9f2eb4ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdf1dd4ddf767b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 13:29:19 2015 +0100 #1238 FIX check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. --- .werks/1238 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1238 b/.werks/1238 new file mode 100644 index 0000000..2f6c5eb --- /dev/null +++ b/.werks/1238 @@ -0,0 +1,10 @@ +Title: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427113707 + + diff --git a/ChangeLog b/ChangeLog index 3615a9d..da02b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,6 +274,7 @@ * 1236 FIX: multipath: Now show correct error in case of removed multipaths instead of check crash * 2152 FIX: apache_status: Fixed plugin to work on CentOS/RedHat 5.x... * 1896 FIX: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery... + * 1238 FIX: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2903421..d6c406c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -250,8 +250,10 @@ cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for # Linux Multipathing if type multipath >/dev/null ; then - echo '<<<multipath>>>' - multipath -l + if [ -f /etc/multipath.conf ] ; then + echo '<<<multipath>>>' + multipath -l + fi fi # Performancecounter Platten

9 years, 3 months

Check_MK Git: check_mk: Fixed segfault when querying host/

by Lars Michelsen

service tables via livestatus Message-ID: <550fe52f.j6dA+3KzOkdrt6Vg%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8926dba5ff6d04f7f23d32d9393eab6a27877f0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8926dba5ff6d04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 23 11:04:19 2015 +0100 Fixed segfault when querying host/service tables via livestatus --- livestatus/.f12 | 1 - livestatus/src/pnp4nagios.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index 0c22846..b550ba2 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -15,6 +15,5 @@ make CFLAGS=-g -j 8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o -echo "$C files copied" echo "Restarting site $SITE" sudo omd restart $SITE nagios diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index fee674f..e001c06 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -32,7 +32,7 @@ #include "pnp4nagios.h" -extern char *g_pnp_path; +extern char g_pnp_path[]; char *cleanup_pnpname(char *name) {

9 years, 3 months

Check_MK Git: check_mk: db2_connections: Fixed case of missing latency informations

by Bastian Kuhn

Module: check_mk Branch: master Commit: fe635e8d4e9fa7f2e08e85e5fda5a09e469ddd78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe635e8d4e9fa7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 10:33:34 2015 +0100 db2_connections: Fixed case of missing latency informations --- checks/db2_connections | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/checks/db2_connections b/checks/db2_connections index 25b9317..d724202 100644 --- a/checks/db2_connections +++ b/checks/db2_connections @@ -55,10 +55,11 @@ def check_db2_connections(item, params, parsed): yield 0, "Connections: %s" % connections, [("connections", connections)] yield 0, "Port: %s" % data["port"] - minutes, rest = data["latency"].split(":") - seconds, mseconds = rest.split(".") - ms = int(minutes) * 60 * 1000 + int(seconds) * 1000 + int(mseconds) - yield 0, "Latency: %.2f ms" % ms, [("latency", ms)] + if "latency" in data: + minutes, rest = data["latency"].split(":") + seconds, mseconds = rest.split(".") + ms = int(minutes) * 60 * 1000 + int(seconds) * 1000 + int(mseconds) + yield 0, "Latency: %.2f ms" % ms, [("latency", ms)] check_info['db2_connections'] = { "parse_function" : parse_db2_dbs,

9 years, 3 months

Check_MK Git: check_mk: cisco_qos: prevent exception

by Bastian Kuhn

Module: check_mk Branch: master Commit: 68ef15c9a71f94f1c56c9ab2101c9a9f3b90f725 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68ef15c9a71f94… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 09:25:38 2015 +0100 cisco_qos: prevent exception --- checks/cisco_qos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index 19f0d18..dbbd7a5 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -136,7 +136,7 @@ def inventory_cisco_qos(info): for class_id, class_name in info[2]: # Get interface ids which use this qos class for policy_id, objects_id in cisco_qos_get_config_entries_by_class_id(config, class_id): - if ifs[policy_id] in if_names: + if ifs.get(policy_id) in if_names: if_name = if_names[ifs[policy_id]] items += [ ('%s: %s' % (if_name, class_name), {}) ]

9 years, 3 months

Check_MK Git: check_mk: cisco_temp: Cleanup for inventory function

by Bastian Kuhn

Module: check_mk Branch: master Commit: fbee0d8783ce75eaa7c9aaab6015eb24dfca0f72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbee0d8783ce75… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 23 09:05:18 2015 +0100 cisco_temp: Cleanup for inventory function --- checks/cisco_temp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/cisco_temp b/checks/cisco_temp index e16c56a..ebfa8ad 100644 --- a/checks/cisco_temp +++ b/checks/cisco_temp @@ -52,7 +52,9 @@ def inventory_cisco_temp(checktyp, info): # Skip sensors with state 5 (not present) - return [ (name, None) for (name, state) in info if state != '5' ] + for name, state in info: + if state != '5': + yield name, None def check_cisco_temp(item, _no_params, info): for name, state in info:

9 years, 3 months

Check_MK Git: check_mk: #1896 FIX ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery

by Konstantin Büttner

Module: check_mk Branch: master Commit: 15dbbdf0643b27096b21e8db3fc4212cef9e378d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15dbbdf0643b27… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Mar 20 18:31:22 2015 +0100 #1896 FIX ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery Some Socomec UPSes report -1 minutes left on battery at 100% capacity, which previously led to the check being critical all the time. The time left on battery subresult has been removed in these cases. --- .werks/1896 | 11 ++++++++++ ChangeLog | 1 + checks/ups_socomec_capacity | 47 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/.werks/1896 b/.werks/1896 new file mode 100644 index 0000000..c66271c --- /dev/null +++ b/.werks/1896 @@ -0,0 +1,11 @@ +Title: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1426872550 +Class: fix + +Some Socomec UPSes report -1 minutes left on battery at 100% capacity, which previously led to the +check being critical all the time. The time left on battery subresult has been removed in these +cases. diff --git a/ChangeLog b/ChangeLog index 669226e..3615a9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 1233 FIX: Fixed fileinfo check for solaris in case of missing files * 1236 FIX: multipath: Now show correct error in case of removed multipaths instead of check crash * 2152 FIX: apache_status: Fixed plugin to work on CentOS/RedHat 5.x... + * 1896 FIX: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ups_socomec_capacity b/checks/ups_socomec_capacity index 5aed2e4..3897008 100644 --- a/checks/ups_socomec_capacity +++ b/checks/ups_socomec_capacity @@ -39,13 +39,56 @@ def inventory_ups_socomec_capacity(info): return [(None, 'ups_capacity_default_levels')] +def check_ups_socomec_capacity(item, params, info): + # To support inventories with the old version + if type(params) is tuple: # old format with 2 params in tuple + warn, crit = params + cap_warn, cap_crit = (95, 90) + elif type(params) is dict: # new dict format + warn, crit = params.get('battime', (0, 0)) + cap_warn, cap_crit = params.get('capacity', (95, 90)) + else: + warn, crit = (0, 0) + cap_warn, cap_crit = (95, 90) + + time_on_bat, minutes_left, percent_fuel = map(int, info[0]) + + # Check time left on battery + if minutes_left != -1: + levelsinfo = "" + if minutes_left <= crit: + state = 2 + levelsinfo = " (crit at %d min)" % cap_crit + elif minutes_left < warn: + state = 1 + levelsinfo = " (warn at %d min)" % cap_warn + else: + state = 0 + yield state, "%d min left on battery" % minutes_left + levelsinfo, [ ('capacity', minutes_left, warn, crit) ] + + # Check percentual capacity + levelsinfo = "" + if percent_fuel <= cap_crit: + state = 2 + levelsinfo = " (crit at %d%%)" % cap_crit + elif percent_fuel < cap_warn: + state = 1 + levelsinfo = " (warn at %d%%)" % cap_warn + else: + state = 0 + yield state, "capacity: %d%%" % percent_fuel + levelsinfo, [ ('percent', percent_fuel, cap_warn, cap_crit) ] + + # Output time on battery + if time_on_bat > 0: + yield 0, "On battery for %d min" % time_on_bat + + check_info["ups_socomec_capacity"] = { - "check_function" : check_ups_capacity, + "check_function" : check_ups_socomec_capacity, "inventory_function" : inventory_ups_socomec_capacity, "service_description" : "Battery capacity", "has_perfdata" : True, "group" : "ups_capacity", "snmp_info" : (".1.3.6.1.4.1.4555.1.1.1.1.2" , [ 2, 3, 4 ] ) , - "includes" : [ "ups_capacity.include" ], "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4555.1.1.1", }

9 years, 3 months

Check_MK Git: check_mk: Metrics: implemented all graphs of df,

by Mathias Kettner

fixed many bugs Message-ID: <550c32ef.9W8Znd77Z0HsNJTn%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: a643003844ecfad535432e8c68a42130f2fc601e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a643003844ecfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 20 15:47:08 2015 +0100 Metrics: implemented all graphs of df, fixed many bugs --- pnp-templates/check_mk-df.php | 6 +- web/htdocs/check_mk.css | 22 ++- web/htdocs/lib.py | 72 ++++++++- web/htdocs/metrics.py | 143 ++++++++--------- web/plugins/metrics/check_mk.py | 334 +++++++++++++++++++++++++++++---------- web/plugins/views/painters.py | 2 + 6 files changed, 416 insertions(+), 163 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a643003844…

9 years, 3 months

Check_MK Git: check_mk: #2063 winperf_if: now also able to detect the interface port state 'lowerLayerDown'

by Andreas Boesl

Module: check_mk Branch: master Commit: ef87c0f949dab50b8dfa0a8589b3d98173d9f732 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef87c0f949dab5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 20 15:29:44 2015 +0100 #2063 winperf_if: now also able to detect the interface port state 'lowerLayerDown' Previous version only reported interface 'down' --- .werks/2063 | 9 +++++++++ ChangeLog | 1 + checks/winperf_if | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2063 b/.werks/2063 new file mode 100644 index 0000000..b21e042 --- /dev/null +++ b/.werks/2063 @@ -0,0 +1,9 @@ +Title: winperf_if: now also able to detect the interface port state 'lowerLayerDown' +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1426861644 +Class: feature + +Previous version only reported interface 'down' diff --git a/ChangeLog b/ChangeLog index 3e843e8..669226e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ * 2062 grouped interfaces: additional information in check output and new port state 'degraded'... NOTE: Please refer to the migration notes! * 2153 siemens_plc.duration siemens_plc.flag siemens_plc.info: New Checks for Siemens PLC devices + * 2063 winperf_if: now also able to detect the interface port state 'lowerLayerDown'... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/winperf_if b/checks/winperf_if index c88b25d..f08edbb 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -194,6 +194,12 @@ def convert_winperf_if(info): if nic.get("GUID") in teaming_info: index_info = ( teaming_info[nic.get("GUID")]["TeamName"], index_info ) + + connection_status = nic.get('NetConnectionStatus') + if connection_status not in ['1', '2', '7']: + # Unknown states are set to down + connection_status = '2' + converted.append(( index_info, nic_name, @@ -201,7 +207,7 @@ def convert_winperf_if(info): bandwidth or nic[10], # Bandwidth # NetConnectionStatus: 2 means 'up', 7 is 'not connected'. If the plugin # wmic_if is missing and we have link information we have to assume 'up': - nic.get('NetConnectionStatus', '2') == '2' and '1' or '2', + connection_status, nic[-246], # ifInOctets, nic[14], # inucast 0, # inmcast

9 years, 3 months

Check_MK Git: check_mk: Fixed wrong named function call

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f5f534868c7c12061ac206b8decce88f3110292 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f5f534868c7c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 20 14:01:11 2015 +0100 Fixed wrong named function call --- web/htdocs/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 11f7f2d..4a6462e 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -275,7 +275,7 @@ def handler(req, fields = None, profiling = True): response_code = apache.HTTP_BAD_GATEWAY if ty in [MKConfigError, MKGeneralException]: - log(LOG_ERR, _("%s: %s") % (plain_title, e)) + logger(LOG_ERR, _("%s: %s") % (plain_title, e)) except (apache.SERVER_RETURN, (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED),

9 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2297

by Goetz Golla

Module: check_mk Branch: master Commit: c08a9087fa0ec6eaf6d9cc7b85dfde83187082e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c08a9087fa0ec6… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 20 13:01:35 2015 +0100 Updated bug entries #2297 --- .bugs/2297 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2297 b/.bugs/2297 new file mode 100644 index 0000000..db8981b --- /dev/null +++ b/.bugs/2297 @@ -0,0 +1,8 @@ +Title: Harmonize Export Functions +Component: multisite +State: open +Date: 2015-03-20 12:58:26 +Targetversion: future +Class: cleanup + +The csv-Export Feature can be reached with a small icon on the lower left of a view. In contrast, there is the PDF Export feature, which is a button oat the top.This could be unified (same location of buttons). Also, when a csv or pdf export is not available, these buttons should not be available.

9 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015