Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 7b69a40cbc2a87fec7b631404e8ce3091e0e3425 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b69a40cbc2a87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 14:24:41 2017 +0100 4415 FIX blade_bays: fixed KeyError Change-Id: Ib3dfd0595a12486bcdc5a4d5c786185799398ba2 --- .werks/4415 | 9 +++++++++ checks/blade_bays | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4415 b/.werks/4415 new file mode 100644 index 0000000..393fc19 --- /dev/null +++ b/.werks/4415 @@ -0,0 +1,9 @@ +Title: blade_bays: fixed KeyError +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0b3 +Date: 1487769557 +Class: fix + + diff --git a/checks/blade_bays b/checks/blade_bays index f5f8fdc..e41e786 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -59,12 +59,14 @@ def parse_blade_bays(info): "device_state" : map_states.get(state, (3, "unhandled[%s]" % state)), "power" : power, }) + + pprint.pprint(parsed) return parsed def inventory_blade_bays(parsed): for entry, attrs in parsed.items(): - if attrs["device_state"][1] in [ "standby", "on" ]: + if attrs["_device_state_"][1] in [ "standby", "on" ]: yield entry, {}

7 years, 6 months

Removed changelog!

by Lars Michelsen

Module: check_mk Branch: master Commit: 5759d32a05e67e43aac68fae89fd5ac6937dcbe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5759d32a05e67e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 14:16:07 2017 +0100 Removed changelog! Change-Id: I2157102f9b6108ff75972a426f366ac97b509f1b --- ChangeLog | 8837 ------------------------------------------------------------- 1 file changed, 8837 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5759d32a05…

7 years, 6 months

4414 FIX oracle_rman: fixed UnboundLocalError if sid level 0 is empty

by Simon Betz

Module: check_mk Branch: master Commit: ee4b122076488d216c67e45a7a68a1c93294b7f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4b122076488d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 14:09:08 2017 +0100 4414 FIX oracle_rman: fixed UnboundLocalError if sid level 0 is empty Change-Id: I402d1cd536fe02951a0611f61d56fdbfd442538f --- .werks/4414 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_rman | 8 ++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.werks/4414 b/.werks/4414 new file mode 100644 index 0000000..62eceae --- /dev/null +++ b/.werks/4414 @@ -0,0 +1,11 @@ +Title: oracle_rman: fixed UnboundLocalError if sid level 0 is empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487768837 + + diff --git a/ChangeLog b/ChangeLog index aa584c5..3c1bfd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 4410 FIX: brocade_fcport: fixed missing info handling * 4412 FIX: haproxy.server: fixed empty uptime info handling * 4413 FIX: mem.linux: handle empty info + * 4414 FIX: oracle_rman: fixed UnboundLocalError if sid level 0 is empty Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT diff --git a/checks/oracle_rman b/checks/oracle_rman index c790478..6a44d23 100644 --- a/checks/oracle_rman +++ b/checks/oracle_rman @@ -60,7 +60,6 @@ def inventory_oracle_rman(info): return inventory def check_oracle_rman(item, params, info): - sid_level0 = '' backupage_level0 = 0 item_found = False @@ -75,8 +74,7 @@ def check_oracle_rman(item, params, info): if len(line) == 6: sid, status, start, end, backuptype, backupage = line - if len(line) == 8: - + elif len(line) == 8: sid, status, not_used_1, end, backuptype, backuplevel, backupage, backupscn = line if backupscn == '': backupscn = -1 @@ -112,14 +110,12 @@ def check_oracle_rman(item, params, info): if item[:-1] == "%s.DB_INCR_" % item[:item.find('.')]: # we are on sid.DB_INCR_ - if item[-1] == '0': - + if item[-1] == '0' and sid_level0: # we are on a DB_INCR_0 # we could have invalid data from for item loop due to 'continue' at backuplevel==0 sid, end, backupage = sid_level0, end_level0, backupage_level0 else: - if item == "%s.%s_%s" % (sid, backuptype, backuplevel): # we got a line from agent # => use the data from agent

7 years, 6 months

CME: GUI werk list: Add option to filter for CME werks

by Lars Michelsen

Module: check_mk Branch: master Commit: e726c3c41f0fcb9f98f3b5858330a0c44487ca4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e726c3c41f0fcb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 13:22:10 2017 +0100 CME: GUI werk list: Add option to filter for CME werks Change-Id: I26abab56bfe7af58f7980bac95f284639166b988 --- .werks/.f12 | 4 ++++ web/htdocs/werks.py | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.werks/.f12 b/.werks/.f12 index 1fc7145..bb0ab06 100644 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -4,4 +4,8 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo mkdir -p /omd/sites/$SITE/share/check_mk/werks/ make -C .. .werks/werks sudo install -m 644 -g $SITE -o $SITE werks /omd/sites/$SITE/share/check_mk/werks/werks +make -C .. enterprise/werks +sudo install -m 644 -g $SITE -o $SITE ../enterprise/werks /omd/sites/$SITE/share/check_mk/werks/werks-cmc +make -C .. managed/werks +sudo install -m 644 -g $SITE -o $SITE ../managed/werks /omd/sites/$SITE/share/check_mk/werks/werks-cme sudo omd restart $SITE apache diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 0a5f9c6..284bdc2 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -245,6 +245,7 @@ def werk_table_option_entries(): title = _("Edition"), choices = [ ( None, _("All editions") ), + ( "cme", _("Werks only concerning the Managed Service Edition") ), ( "cee", _("Werks only concerning the Enterprise Edition") ), ( "cre", _("Werks also concerning the Raw Edition") ), ], @@ -371,11 +372,8 @@ def werk_matches_options(werk, werk_table_options): return False - if werk_table_options["edition"]: - if werk_table_options["edition"] == "cre" and werk["id"] >= 8000: - return False - if werk_table_options["edition"] == "cee" and werk["id"] < 8000: - return False + if werk_table_options["edition"] and werk["edition"] != werk_table_options["edition"]: + return False from_version, to_version = werk_table_options["version"] if from_version and cmp_version(werk["version"], from_version) < 0:

7 years, 6 months

4413 FIX mem.linux: handle empty info

by Simon Betz

Module: check_mk Branch: master Commit: 0d7b81233007187be85e44e918c3363638ac739b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d7b8123300718… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 13:44:35 2017 +0100 4413 FIX mem.linux: handle empty info Change-Id: I66683eef61666e8cb9d555591472fbb72610e790 --- .werks/4413 | 11 +++++++++++ ChangeLog | 1 + checks/mem | 3 +++ 3 files changed, 15 insertions(+) diff --git a/.werks/4413 b/.werks/4413 new file mode 100644 index 0000000..ce8bb34 --- /dev/null +++ b/.werks/4413 @@ -0,0 +1,11 @@ +Title: mem.linux: handle empty info +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487767443 + + diff --git a/ChangeLog b/ChangeLog index 1fffb52..aa584c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 4409 FIX: uptime: fixed missing info handling * 4410 FIX: brocade_fcport: fixed missing info handling * 4412 FIX: haproxy.server: fixed empty uptime info handling + * 4413 FIX: mem.linux: handle empty info Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT diff --git a/checks/mem b/checks/mem index 6c473fd..43a5ce2 100644 --- a/checks/mem +++ b/checks/mem @@ -242,6 +242,9 @@ def check_mem_levels(title, used, total, levels, of_what=None, of_value=None, sh def check_mem_linux(_no_item, params, info): meminfo = parse_proc_meminfo_bytes(info) + if not meminfo: + yield 3, "Data not found in agent output" + return # SReclaimable is not available for older kernels if "SReclaimable" not in meminfo:

7 years, 6 months

4412 FIX haproxy.server: fixed empty uptime info handling

by Simon Betz

Module: check_mk Branch: master Commit: f9facc1c44a9e6508f2cf1a9952b3b3096a80cce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9facc1c44a9e6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 13:34:40 2017 +0100 4412 FIX haproxy.server: fixed empty uptime info handling Change-Id: I918e2b6ae3662aea78a2302a96cd667178d60608 --- .werks/4412 | 11 +++++++++++ ChangeLog | 1 + checks/haproxy | 22 +++++++++++++--------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/4412 b/.werks/4412 new file mode 100644 index 0000000..fafc95c --- /dev/null +++ b/.werks/4412 @@ -0,0 +1,11 @@ +Title: haproxy.server: fixed empty uptime info handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487766850 + + diff --git a/ChangeLog b/ChangeLog index e7feeb8..1fffb52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 4349 FIX: cisco_qos: Fix crashing check for some cases where the QoS class cannot be found... * 4409 FIX: uptime: fixed missing info handling * 4410 FIX: brocade_fcport: fixed missing info handling + * 4412 FIX: haproxy.server: fixed empty uptime info handling Multisite: * 4365 FIX: Service availability: Host down could not be rewritten to other states like CRIT diff --git a/checks/haproxy b/checks/haproxy index 9517a2d..795e4b5 100644 --- a/checks/haproxy +++ b/checks/haproxy @@ -50,9 +50,9 @@ def inventory_haproxy_frontend(info): def check_haproxy_frontend(item, _no_params, info): for line in info: if line[0] == item: - now = time.time() - status = line[17] - stot = int(line[7]) + now = time.time() + status = line[17] + stot = int(line[7]) session_rate = get_rate("sessions.%s" % item, now, stot) infotext = "%s, Session Rate: %.2f/s" % (status, session_rate) @@ -83,25 +83,29 @@ def inventory_haproxy_server(info): def check_haproxy_server(item, _no_params, info): for line in info: if "%s/%s" % (line[0], line[1]) == item: - status = line[17] - uptime = get_age_human_readable(int(line[23])) + status = line[17] + uptime_str = line[23] layer_check = line[36] - active = int(line[19]) - backup = int(line[20]) + active = int(line[19]) + backup = int(line[20]) + + infotext = "Status: %s" % status + if uptime_str: + infotext += " since %s" % get_age_human_readable(int(uptime_str)) if status == "UP" and (active or backup): state = 0 else: state = 2 - infotext = "%s since %s, Layer Check: %s" % \ - (status, uptime, layer_check) + infotext += ", Layer Check: %s" % layer_check if active: infotext += ", active" elif backup: infotext += ", backup" else: infotext += ", neither active nor backup (!!)" + return state, infotext

7 years, 6 months

4407 FIX df: fixed handling of paths including spaces

by Simon Betz

Module: check_mk Branch: master Commit: 4a800f894f76a7029c4d7e47cb184911ac95dafe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a800f894f76a7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 21 15:44:22 2017 +0100 4407 FIX df: fixed handling of paths including spaces Change-Id: Ifa0e803aaa41f47e2f6befa5d210376b494b2c9a --- .werks/4407 | 11 +++++++++++ ChangeLog | 1 + checks/df | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/.werks/4407 b/.werks/4407 new file mode 100644 index 0000000..efed745 --- /dev/null +++ b/.werks/4407 @@ -0,0 +1,11 @@ +Title: df: fixed handling of paths including spaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487688209 + + diff --git a/ChangeLog b/ChangeLog index c09b9ee..e7feeb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 4374 FIX: check_sql: Fixed exception in verbose mode when querying MSSQL... * 4375 FIX: check_sql: Fixed reporting configuration issues to monitoring core... * 4406 FIX: Fixed some invalid keyword arguments in check_info declarations... + * 4407 FIX: df: fixed handling of paths including spaces * 4408 FIX: checkpoint_temp, checkpoint_fan, checkpoint_voltage: fixed status and value handling * 4349 FIX: cisco_qos: Fix crashing check for some cases where the QoS class cannot be found... * 4409 FIX: uptime: fixed missing info handling diff --git a/checks/df b/checks/df index f222dd9..2db54bf 100644 --- a/checks/df +++ b/checks/df @@ -85,6 +85,10 @@ # /dev/sda5 799680 118 799562 0% /persist # [df_inodes_end] +# <<<df>>> +# C:\ NTFS 41838588 21776048 20062540 53% C:\ +# C:\Program Files\Vision Solutions\Double-Take\Service\MountDir\usauhtest0010_c061b170-ad3f-473f-92ce-088c97fce98e_C\ NTFS 41835516 11895180 29940336 29% C:\Program Files\Vision Solutions\Double-Take\Service\MountDir\usauhtest0010_c061b170-ad3f-473f-92ce-088c97fce98e_C\ + def parse_df(info): df_blocks = [] @@ -112,6 +116,11 @@ def parse_df(info): if not is_inode: # Handle known cases, where the file system contains spaces + for index, entry in enumerate(line): + if entry == "NTFS": + line = [ " ".join(line[:index]) ] + [line[index]] + line[index+1:index+5] + [ " ".join(line[index+5:]) ] + break + if line[2] == "File" and line[3] == "System": line = [ line[0], " ".join(line[1:4]) ] + line[4:]

7 years, 6 months

4410 FIX brocade_fcport: fixed missing info handling

by Simon Betz

Module: check_mk Branch: master Commit: 7a44581370f9a5a984999315c36d9f0639404b62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a44581370f9a5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 11:30:44 2017 +0100 4410 FIX brocade_fcport: fixed missing info handling Change-Id: Ifa155730208a28cb492afd215c6c536667735e8b --- .werks/4410 | 11 + ChangeLog | 8833 +++++++++++++++++++++++++++++++++++++++++++++++++ checks/brocade_fcport | 2 + checks/ntp | 13 +- 4 files changed, 8851 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7a44581370…

7 years, 6 months

WATO rule ntp_time: Corrected match type

by Konstantin Büttner

Module: check_mk Branch: master Commit: 198d3c7071c01471b4766ca8d503ee0020987541 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=198d3c7071c014… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 22 11:31:16 2017 +0100 WATO rule ntp_time: Corrected match type Change-Id: If40b21ca7be5e4695b4135a3b4bc74b0aa6d097c --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index abe76b9..15efd7a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -11682,7 +11682,7 @@ register_check_parameters( forth = lambda params: type(params) == tuple and { "ntp_levels" : params } or params ), None, - "first" + "dict" ) register_check_parameters(

7 years, 6 months

Fixed werk tests after recent changes

by Lars Michelsen

Module: check_mk Branch: master Commit: e50b59deef8f04a81de757e9b0903c30c97b12cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e50b59deef8f04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 11:27:16 2017 +0100 Fixed werk tests after recent changes Change-Id: I66987cf0de03a7ed7e4ca3c9266248dd1d1b1a9d --- tests/lib/test_werks.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/lib/test_werks.py b/tests/lib/test_werks.py index 2e647f2..f0cd484 100644 --- a/tests/lib/test_werks.py +++ b/tests/lib/test_werks.py @@ -38,14 +38,16 @@ def test_enterprise_werks(site): def test_write_precompiled_werks(tmpdir, site, monkeypatch): tmp_dir = "%s" % tmpdir - cmk_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmk_path(), ".werks")) + all_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmk_path(), ".werks")) + cmk_werks = dict([ (w["id"], w) for w in all_werks.values() if w["edition"] == "cre" ]) + cmc_werks = dict([ (w["id"], w) for w in all_werks.values() if w["edition"] == "cee" ]) + assert len(cmk_werks) > 1000 assert [ w for w in cmk_werks.keys() if w >= 7500 ] == [] cmk.werks.write_precompiled_werks(os.path.join(tmp_dir, "werks"), cmk_werks) if site.version.edition() == "raw": - cmc_werks = cmk.werks.load_raw_files(os.path.join(testlib.cmc_path(), ".werks")) assert len(cmc_werks) > 1000 assert [ w for w in cmc_werks.keys() if w < 8000 ] == []

7 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017