Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Fixed error reporting in case of missing files after site setup

by Lars Michelsen

Module: check_mk Branch: master Commit: 626d05ed0c7b5f87a19efdaa1b8d2413b4293528 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=626d05ed0c7b5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 12:07:25 2017 +0100 Fixed error reporting in case of missing files after site setup Change-Id: I99b395561aa38079a42fc2b60ac3af77b8970e71 --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index afe1492..e626014 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -429,7 +429,8 @@ class Site(object): time.sleep(0.5) wait_time -= 0.5 - assert not self._missing_but_required_wato_files(), \ + missing_files = self._missing_but_required_wato_files() + assert not missing_files, \ "Failed to initialize WATO data structures " \ "(Still missing: %s)" % missing_files

7 years, 4 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 619f1038e0a3d9e504b94efdaebf63d841b629b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619f1038e0a3d9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 12:53:36 2017 +0100 minor cleanup Change-Id: I283b7fd899037c95eb15f2f2d0e1363ee8df7d6c --- checks/cisco_power | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_power b/checks/cisco_power index 05b0125..115dc4a 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -73,9 +73,9 @@ def check_cisco_power(item, no_params, info): if cisco_sensor_item(textinfo, sid) == item or\ cisco_sensor_item(textinfo, sid)+" "+sid == item or\ cisco_sensor_item(textinfo, sid)+"/"+sid == item: - state = int(state) + state = int(state) source = int(source) - output = 'state: %s, source: %s' % \ + output = 'Status: %s, Source: %s' % \ (cisco_power_states[state], cisco_power_sources[source]) if state == 1: return 0, "%s" % output

7 years, 4 months

test: added missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 1b59d401a1ff159caba0229efc1476004c8b18f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b59d401a1ff15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 13:02:45 2017 +0100 test: added missing import Change-Id: Iced347285f2b5f584ba8436a8130f06880a3b175 --- tests/web/test_table.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 3375f4d..7ca5a9e 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -40,6 +40,7 @@ class TableTest(html): def test_table(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(False, False, None, 'html', tmpdir)

7 years, 4 months

4306 FIX cisco_fru_power: fixed empty FRU current handling

by Simon Betz

Module: check_mk Branch: master Commit: 6065b6e5a2952a949fa1595a4d1d47c1ad6abb1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6065b6e5a2952a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 13:12:33 2017 +0100 4306 FIX cisco_fru_power: fixed empty FRU current handling Change-Id: Ife2e06cd3bcecb62f9306626e07865df426e9edb --- .werks/4306 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_fru_power | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4306 b/.werks/4306 new file mode 100644 index 0000000..58d6995 --- /dev/null +++ b/.werks/4306 @@ -0,0 +1,10 @@ +Title: cisco_fru_power: fixed empty FRU current handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485778312 + + diff --git a/ChangeLog b/ChangeLog index 02b4fc7..e6a1f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 4305 FIX: postgres_stat_database.size: fixed missing database size perfometer * 4313 FIX: ps: Improved performance of ps check on systems with a large number of processes * 4016 FIX: Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) + * 4306 FIX: cisco_fru_power: fixed empty FRU current handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power index 517642a..7ca7e8a 100644 --- a/checks/cisco_fru_power +++ b/checks/cisco_fru_power @@ -86,7 +86,8 @@ def parse_cisco_fru_power(info): ppre_parsed = {} for end_oid, oper_state, fru_current in info[0]: - if oper_state not in [ "", "0", "1", "5" ] and int(fru_current) >= 0: + if oper_state not in [ "", "0", "1", "5" ] and \ + fru_current and int(fru_current) >= 0: ppre_parsed.setdefault(end_oid, map_states.get(oper_state, (3, "unexpected(%s)" % oper_state))) pre_parsed = {}

7 years, 4 months

test: added missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 99878ec3a0bb6cf449073cce951eced1994d07a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99878ec3a0bb6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 13:02:45 2017 +0100 test: added missing import Change-Id: Iced347285f2b5f584ba8436a8130f06880a3b175 --- tests/web/test_table.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 3375f4d..7ca5a9e 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -40,6 +40,7 @@ class TableTest(html): def test_table(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(False, False, None, 'html', tmpdir)

7 years, 4 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 05701243d5ee4113404b8b9d34f6eb8ad001f848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05701243d5ee41… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 12:53:36 2017 +0100 minor cleanup Change-Id: I283b7fd899037c95eb15f2f2d0e1363ee8df7d6c --- checks/cisco_power | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_power b/checks/cisco_power index 05b0125..115dc4a 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -73,9 +73,9 @@ def check_cisco_power(item, no_params, info): if cisco_sensor_item(textinfo, sid) == item or\ cisco_sensor_item(textinfo, sid)+" "+sid == item or\ cisco_sensor_item(textinfo, sid)+"/"+sid == item: - state = int(state) + state = int(state) source = int(source) - output = 'state: %s, source: %s' % \ + output = 'Status: %s, Source: %s' % \ (cisco_power_states[state], cisco_power_sources[source]) if state == 1: return 0, "%s" % output

7 years, 4 months

4306 FIX cisco_fru_power: fixed empty FRU current handling

by Simon Betz

Module: check_mk Branch: master Commit: dc2ef13f0bd5fdbb48ffe87d13cfd53f58ea81c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc2ef13f0bd5fd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 13:12:33 2017 +0100 4306 FIX cisco_fru_power: fixed empty FRU current handling Change-Id: Ife2e06cd3bcecb62f9306626e07865df426e9edb --- .werks/4306 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_fru_power | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4306 b/.werks/4306 new file mode 100644 index 0000000..58d6995 --- /dev/null +++ b/.werks/4306 @@ -0,0 +1,10 @@ +Title: cisco_fru_power: fixed empty FRU current handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485778312 + + diff --git a/ChangeLog b/ChangeLog index 02b4fc7..e6a1f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 4305 FIX: postgres_stat_database.size: fixed missing database size perfometer * 4313 FIX: ps: Improved performance of ps check on systems with a large number of processes * 4016 FIX: Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) + * 4306 FIX: cisco_fru_power: fixed empty FRU current handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power index 517642a..7ca7e8a 100644 --- a/checks/cisco_fru_power +++ b/checks/cisco_fru_power @@ -86,7 +86,8 @@ def parse_cisco_fru_power(info): ppre_parsed = {} for end_oid, oper_state, fru_current in info[0]: - if oper_state not in [ "", "0", "1", "5" ] and int(fru_current) >= 0: + if oper_state not in [ "", "0", "1", "5" ] and \ + fru_current and int(fru_current) >= 0: ppre_parsed.setdefault(end_oid, map_states.get(oper_state, (3, "unexpected(%s)" % oper_state))) pre_parsed = {}

7 years, 4 months

WATO: Fixed broken randomize secret button for automation users

by Lars Michelsen

Module: check_mk Branch: master Commit: 9802ebb9d40faa29e5bd8aa017a088c60fb3d041 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9802ebb9d40faa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 12:05:58 2017 +0100 WATO: Fixed broken randomize secret button for automation users Change-Id: I8b0191c8f24580a6dc6dfada062a06494b5f4db6 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8b4fe71..05d3aea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10232,7 +10232,7 @@ def mode_edit_user(phase): html.open_ul() html.text_input("secret", user.get("automation_secret", ""), size=30, - id="automation_secret") + id_="automation_secret") html.write_text(" ") html.open_b(style=["position: relative", "top: 4px;"]) html.write("  ")

7 years, 4 months

Check for BFG

by Sven Panne

Module: check_mk Branch: master Commit: bfaab4e28c9cd98c79bbb6dc591eb32cebc2d596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfaab4e28c9cd9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 30 11:54:35 2017 +0100 Check for BFG Change-Id: I81ac6f1514585b73ccb9219ab44b3237ff2d7ad1 ---

7 years, 4 months

Fixed error reporting in case of missing files after site setup

by Lars Michelsen

Module: check_mk Branch: master Commit: a00348a56894b820bdf566642979f4f3a496ad7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a00348a56894b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 12:07:25 2017 +0100 Fixed error reporting in case of missing files after site setup Change-Id: I99b395561aa38079a42fc2b60ac3af77b8970e71 --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index afe1492..e626014 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -429,7 +429,8 @@ class Site(object): time.sleep(0.5) wait_time -= 0.5 - assert not self._missing_but_required_wato_files(), \ + missing_files = self._missing_but_required_wato_files() + assert not missing_files, \ "Failed to initialize WATO data structures " \ "(Still missing: %s)" % missing_files

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017