Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #2342

by Goetz Golla

Module: check_mk Branch: master Commit: 0a674eef430f59490108c0ff254d63acc80097d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a674eef430f59… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 12:19:29 2015 +0200 Updated bug entries #2342 --- .bugs/2342 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2342 b/.bugs/2342 index bb74747..071b8f5 100644 --- a/.bugs/2342 +++ b/.bugs/2342 @@ -1,9 +1,9 @@ Title: cli service discovery in debug mode gives traceback when not using inline snmp Component: checks -State: open +Class: bug +State: done Date: 2015-06-12 09:34:21 Targetversion: 1.2.6 -Class: bug OMD[heute]:~$ cmk --debug -vII heute Discovering services on heute: @@ -52,3 +52,6 @@ index 9906bc7..6aedca7 100755 value = value[1:-1] return value + +2015-06-12 12:19:24: changed state open -> done +applied the above fix

9 years

Check_MK Git: check_mk: FIX for traceback in CLI of check_mk service discovery

by Goetz Golla

Module: check_mk Branch: master Commit: a899b4a4f953df3104ad55214dbbd67506ffc8e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a899b4a4f953df… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 12:14:00 2015 +0200 FIX for traceback in CLI of check_mk service discovery --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9906bc7..6aedca7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -776,7 +776,7 @@ def snmp_get_oid(hostname, ipaddress, oid): value = None # Strip quotes - if value.startswith('"') and value.endswith('"'): + if value and value.startswith('"') and value.endswith('"'): value = value[1:-1] return value

9 years

Check_MK Git: check_mk: datapower_mem, datapower_cpu: metrics and include function corrected

by Goetz Golla

Module: check_mk Branch: master Commit: 03bc7801f3909130a5926d3e2239b5e77e913419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03bc7801f39091… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 11:59:49 2015 +0200 datapower_mem, datapower_cpu: metrics and include function corrected --- checks/datapower_mem | 2 +- web/plugins/metrics/check_mk.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/datapower_mem b/checks/datapower_mem index 89d3407..d9591ff 100644 --- a/checks/datapower_mem +++ b/checks/datapower_mem @@ -49,7 +49,7 @@ check_info['datapower_mem'] = { "3", # dpStatusMemoryStatusUsedMemory ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", - "includes" : [ "mem.include" ], + "includes" : [ "memory.include" ], "group" : "memory_simple", "default_levels_variable" : "datapower_mem_default_levels", "has_perfdata" : True, diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3190c77..f925db1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1458,6 +1458,7 @@ check_metrics["check_mk-logwatch.ec"] = {} check_metrics["check_mk-logwatch.ec_single"] = {} check_metrics["check_mk-omd_apache"] = {} check_metrics["check_mk-postfix_mailq"] = {} +check_metrics["check_mk-datapower_cpu"] = {} #. # .--Perf-O-Meters-------------------------------------------------------.

9 years

Check_MK Git: check_mk: cisco_temperature: Fixed inventory to return empty dict instead of None parameters

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8406efb2ba0d76f532df54443bf42437072681a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8406efb2ba0d76… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 12 10:20:22 2015 +0200 cisco_temperature: Fixed inventory to return empty dict instead of None parameters --- checks/cisco_temperature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 01c6051..144e196 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -115,7 +115,7 @@ def parse_cisco_temperature(info): def inventory_cisco_temperature(parsed): for item in parsed.keys(): - yield item, None + yield item, {} def check_cisco_temperature(item, params, parsed):

9 years

Check_MK Git: check_mk: Recurring downtimes: fix display for Nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: d0cb1adab58c990094564fcca9984c07c4dd2d62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cb1adab58c99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 12 09:53:03 2015 +0200 Recurring downtimes: fix display for Nagios core --- web/plugins/views/painters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b21244c..b945027 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1857,13 +1857,14 @@ multisite_painters["downtime_origin"] = { "title" : _("Downtime origin"), "short" : _("Origin"), "columns" : ["downtime_origin"], - "paint" : lambda row: (None, row["downtime_origin"] == 0 and _("command") or _("configuration")), + "paint" : lambda row: (None, row["downtime_origin"] == 1 and _("configuration") or _("command")), } def paint_downtime_recurring(row): r = row["downtime_recurring"] return "", { 0: _("no"), + None: _("no"), 1: _("hourly"), 2: _("daily"), 3: _("weekly"),

9 years

Check_MK Git: check_mk: Implement recurring downtimes (CMC needed)

by Mathias Kettner

Module: check_mk Branch: master Commit: c909636fe1eb4085d346f650c9f8387d7780c913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c909636fe1eb40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 12 09:51:18 2015 +0200 Implement recurring downtimes (CMC needed) --- web/plugins/views/builtin.py | 14 +++++++-- web/plugins/views/commands.py | 43 ++++++++++++++++++++++------ web/plugins/views/painters.py | 42 +++++++++++++++++++++++---- web/plugins/wato/check_mk_configuration.py | 1 + 4 files changed, 84 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c909636fe1…

9 years

Check_MK Git: check_mk: Updated bug entries #2342

by Goetz Golla

Module: check_mk Branch: master Commit: 90a75e243cbddea5c6bede342f63ceea9c766f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90a75e243cbdde… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 09:45:31 2015 +0200 Updated bug entries #2342 --- .bugs/2342 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/2342 b/.bugs/2342 index b4da4ef..bb74747 100644 --- a/.bugs/2342 +++ b/.bugs/2342 @@ -35,3 +35,20 @@ Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/modules/check_mk.py", line 779, in snmp_get_oid if value.startswith('"') and value.endswith('"'): AttributeError: 'NoneType' object has no attribute 'startswith' + +============================================================ +possible solution: + +diff --git a/modules/check_mk.py b/modules/check_mk.py +index 9906bc7..6aedca7 100755 +--- a/modules/check_mk.py ++++ b/modules/check_mk.py +@@ -776,7 +776,7 @@ def snmp_get_oid(hostname, ipaddress, oid): + value = None + + # Strip quotes +- if value.startswith('"') and value.endswith('"'): ++ if value and value.startswith('"') and value.endswith('"'): + value = value[1:-1] + return value +

9 years

Check_MK Git: check_mk: Updated bug entries #2342

by Goetz Golla

Module: check_mk Branch: master Commit: 265b3c602153f64ee9d01c7b829c36491c0264c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=265b3c602153f6… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 09:36:05 2015 +0200 Updated bug entries #2342 --- .bugs/2342 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.bugs/2342 b/.bugs/2342 new file mode 100644 index 0000000..b4da4ef --- /dev/null +++ b/.bugs/2342 @@ -0,0 +1,37 @@ +Title: cli service discovery in debug mode gives traceback when not using inline snmp +Component: checks +State: open +Date: 2015-06-12 09:34:21 +Targetversion: 1.2.6 +Class: bug + +OMD[heute]:~$ cmk --debug -vII heute +Discovering services on heute: +heute: +Running 'snmpget -v2c -c 'public' -m '' -M '' -On -OQ -Oe -Ot 127.0.0.1 .1.3.6.1.2.1.1.1.0' +SNMP answer: ==> ["Linux klappmesser 3.16.0-0.bpo.4-amd64 #1 SMP Debian 3.16.7-ckt9-3~deb8u1~bpo70+1 (2015-04-27) x86_64"] +Running 'snmpget -v2c -c 'public' -m '' -M '' -On -OQ -Oe -Ot 127.0.0.1 .1.3.6.1.2.1.1.2.0' +SNMP answer: ==> [.1.3.6.1.4.1.8072.3.2.10] +Running 'snmpget -v2c -c 'public' -m '' -M '' -On -OQ -Oe -Ot 127.0.0.1 .1.3.6.1.4.1.231.2.10.2.1.1.0' +SNMP answer: ==> [No Such Object available on this agent at this OID] + WARNING: Exception in SNMP scan function of fsc_fans +Traceback (most recent call last): + File "/omd/sites/heute/share/check_mk/modules/check_mk.py", line 5968, in <module> + do_discovery(hostnames, check_types, seen_I == 1) + File "/omd/sites/heute/share/check_mk/modules/discovery.py", line 72, in do_discovery + do_discovery_for(hostname, check_types, only_new, use_caches, on_error) + File "/omd/sites/heute/share/check_mk/modules/discovery.py", line 85, in do_discovery_for + new_items = discover_services(hostname, check_types, use_caches, do_snmp_scan, on_error) + File "/omd/sites/heute/share/check_mk/modules/discovery.py", line 304, in discover_services + check_types = snmp_scan(hostname, ipaddress, on_error) + File "/omd/sites/heute/share/check_mk/modules/discovery.py", line 387, in snmp_scan + result = scan_function(oid_function) + File "/omd/sites/heute/share/check_mk/checks/fsc_fans", line 49, in <lambda> + oid(".1.3.6.1.4.1.231.2.10.2.1.1.0"), + File "/omd/sites/heute/share/check_mk/modules/discovery.py", line 382, in oid_function + value = get_single_oid(hostname, ipaddress, oid) + File "/omd/sites/heute/share/check_mk/modules/check_mk.py", line 817, in get_single_oid + value = snmp_get_oid(hostname, ipaddress, oid) + File "/omd/sites/heute/share/check_mk/modules/check_mk.py", line 779, in snmp_get_oid + if value.startswith('"') and value.endswith('"'): +AttributeError: 'NoneType' object has no attribute 'startswith'

9 years

Check_MK Git: check_mk: Reserved 10 bug IDS

by Goetz Golla

Module: check_mk Branch: master Commit: 7e3a6bc87ecff06724b7cb0235586d7ef26c0c9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3a6bc87ecff0… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 12 09:34:07 2015 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 4f98fcf..680676a 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2342 +2352

9 years

Check_MK Git: check_mk: datapower_mem: units corrected

by Goetz Golla

Module: check_mk Branch: master Commit: cc257c13524cde692318c77e3deb4fd95e04f9b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc257c13524cde… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jun 11 18:18:53 2015 +0200 datapower_mem: units corrected --- checks/datapower_mem | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/datapower_mem b/checks/datapower_mem index 3f27ac3..89d3407 100644 --- a/checks/datapower_mem +++ b/checks/datapower_mem @@ -34,10 +34,10 @@ def inventory_datapower_mem(info): def check_datapower_mem(_no_item, params, info): - mem_total_kb = int(info[0][0]) - mem_used_kb = int(info[0][1]) + mem_total_bytes = int(info[0][0]) * 1024 + mem_used_bytes = int(info[0][1]) * 1024 - return check_memory_simple(mem_used_kb, mem_total_kb, params) + return check_memory_simple(mem_used_bytes, mem_total_bytes, params) check_info['datapower_mem'] = {

9 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015