Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Fixed displayed number of tables if rowlimit is reached.

by Roland Halbig

Module: check_mk Branch: master Commit: c548e8f19f06f3e226226391be8cb92226eafd20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c548e8f19f06f3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 13:29:46 2017 +0100 Fixed displayed number of tables if rowlimit is reached. Change-Id: Ibc34b30cdad478b214bc519a56063e916e768de5 --- web/htdocs/table.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 175e311..e2851ba 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -179,6 +179,8 @@ def end(): if limit is not None: # only use rows up to the limit plus the fixed rows rows = [ rows[i] for i in range(num_rows_unlimited) if i < limit or rows[i][3]] + # Display corrected number of rows + num_rows_unlimited -= len([row for row in rows if row[3]]) # Render header _write_table(table, rows, actions_enabled, actions_visible, search_term)

7 years, 7 months

Updated service discovery icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 9bf43db74472a96fa937a6cc493aa2add4418cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf43db74472a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 13:07:32 2017 +0100 Updated service discovery icons Change-Id: I0e1c342f022d3caa88019bf9f4712ffb8b811fab --- web/htdocs/images/icon_service_to_disabled.png | Bin 3992 -> 3875 bytes web/htdocs/images/icon_service_to_enabled.png | Bin 2475 -> 0 bytes web/htdocs/images/icon_service_to_monitored.png | Bin 4523 -> 4422 bytes web/htdocs/images/icon_service_to_new.png | Bin 3779 -> 0 bytes web/htdocs/images/icon_service_to_removed.png | Bin 3234 -> 3376 bytes web/htdocs/images/icon_service_to_undecided.png | Bin 4075 -> 4159 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_service_to_disabled.png b/web/htdocs/images/icon_service_to_disabled.png index aada0e1..c718cea 100644 Binary files a/web/htdocs/images/icon_service_to_disabled.png and b/web/htdocs/images/icon_service_to_disabled.png differ diff --git a/web/htdocs/images/icon_service_to_enabled.png b/web/htdocs/images/icon_service_to_enabled.png deleted file mode 100644 index 3cd3299..0000000 Binary files a/web/htdocs/images/icon_service_to_enabled.png and /dev/null differ diff --git a/web/htdocs/images/icon_service_to_monitored.png b/web/htdocs/images/icon_service_to_monitored.png index 72254d2..179c4b8 100644 Binary files a/web/htdocs/images/icon_service_to_monitored.png and b/web/htdocs/images/icon_service_to_monitored.png differ diff --git a/web/htdocs/images/icon_service_to_new.png b/web/htdocs/images/icon_service_to_new.png deleted file mode 100644 index fe6ed61..0000000 Binary files a/web/htdocs/images/icon_service_to_new.png and /dev/null differ diff --git a/web/htdocs/images/icon_service_to_removed.png b/web/htdocs/images/icon_service_to_removed.png index 031baf9..b897305 100644 Binary files a/web/htdocs/images/icon_service_to_removed.png and b/web/htdocs/images/icon_service_to_removed.png differ diff --git a/web/htdocs/images/icon_service_to_undecided.png b/web/htdocs/images/icon_service_to_undecided.png index 7e44c98..d233da0 100644 Binary files a/web/htdocs/images/icon_service_to_undecided.png and b/web/htdocs/images/icon_service_to_undecided.png differ

7 years, 7 months

tests: cleaned up special test case filter for crawl job

by Lars Michelsen

Module: check_mk Branch: master Commit: 971e1b723499fc1e753e422518a7008b8b3a90d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=971e1b723499fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 12:32:21 2017 +0100 tests: cleaned up special test case filter for crawl job Change-Id: I3d54f086c5cdba37573fae8dc6b501531c4f1339 --- pytest.ini | 1 + tests/conftest.py | 26 -------------------------- tests/web/test_crawl.py | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/pytest.ini b/pytest.ini index e1e59d1..1c3715b 100644 --- a/pytest.ini +++ b/pytest.ini @@ -8,4 +8,5 @@ markers = pylint: Mark a test as pylint test. git: Mark a test to be executed in the Git repository context packaging: This is a test to execute to verify the packaging of the testbuilds. + gui_crawl: All linked pages of the Web interface are visited and searched for errors html_gentest: Generate test cases for htmllib refactoring. diff --git a/tests/conftest.py b/tests/conftest.py index 0ae62d3..a005291 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -22,32 +22,6 @@ def add_python_paths(): sys.path.insert(0, cmk_path()) -# -# Make tests classification possible to only execute in specific environments. -# For example only on the CI server. -# - -def pytest_addoption(parser): - parser.addoption("-E", action="store", metavar="NAME", - help="only run tests matching the environment NAME.") - - -def pytest_configure(config): - config.addinivalue_line("markers", - "env(name): mark test to run only on named environment. Some long running tests " - "are only meant to be executed on the CI server. Those tests use the " - "\'@pytest.mark.env(\"ci-server\")' marker. If you want to execute them, add " - "\"-E ci-server\" to the py.test command.") - - -def pytest_runtest_setup(item): - envmarker = item.get_marker("env") - if envmarker is not None: - envname = envmarker.args[0] - if envname != item.config.getoption("-E"): - pytest.skip("test requires env %r" % envname) - - def pytest_cmdline_main(config): # Some special tests are not executed in a site environment if config.getoption('markexpr') in [ "packaging", "git", "html_gentest" ]: diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 9fc2aa3..228d20c 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -279,7 +279,7 @@ class SetQueue(Queue.Queue): class TestCrawler(object): - @pytest.mark.env("ci-server") + @pytest.mark.gui_crawl def test_crawl(self, site): self.stats = {} self.todo = SetQueue()

7 years, 7 months

Fixed another issue in the ListOf() valuespec after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 11d32d5bba662418c95196990ce116abf2e12c14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11d32d5bba6624… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 12:00:30 2017 +0100 Fixed another issue in the ListOf() valuespec after recent refactoring Change-Id: Icc4a3231c2bfc5eddeb71739fcceed4f1f90bcb8 --- web/htdocs/valuespec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b22f70f..ba5cf36 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1244,7 +1244,8 @@ class ListOf(ValueSpec): html.open_tr() html.open_td(class_="vlof_buttons") - html.hidden_field(varprefix + "_indexof_" + self._magic, "", add_var=True) # reconstruct order after moving stuff + html.hidden_field(varprefix + "_indexof_" + self._magic, "", + add_var=True, class_="index") # reconstruct order after moving stuff self.del_button(varprefix, self._magic) if self._movable: self.move_button(varprefix, self._magic, "up")

7 years, 7 months

refactoring mssql_blocked_sessions

by Marcel Arentz

Module: check_mk Branch: master Commit: 58a3ead4852ef7fd7b967a6bfb517b9e30283f7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58a3ead4852ef7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Feb 3 17:07:04 2017 +0100 refactoring mssql_blocked_sessions made the code more readable Change-Id: I1ca297433ec17db9094ad37c621a98a9b1b999d5 --- checks/mssql_blocked_sessions | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index 8923224..be4588c 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -34,39 +34,43 @@ # sessions independent of instances anymore. Use same service description # schema as "mssql_instance". +factory_settings['mssql_blocked_sessions_default_levels'] = { + 'state' : 2, +} + def inventory_mssql_blocked_sessions(info): - return [(None, None)] + return [(None, {})] def check_mssql_blocked_sessions(_no_item, params, info): if not info: yield 0, "No blocked sessions" return - state = 2 + state = params['state'] + for line in info: if "blocked" in line[0].lower(): continue # Skip debug output which was send by old agent by accident session_id, wait_duration_ms, wait_type, blocking_session_id = line - if params: - state = params.get("state", 2) - warn, crit = params.get("waittime", (0, 0)) - wait_duration_sec = float(wait_duration_ms) / 1000 - if wait_duration_sec >= crit and not crit == 0: + if params.has_key('waittime'): + warn, crit = params['waittime'] + wait_duration_sec = float(wait_duration_ms) / 1000 + if wait_duration_sec >= crit: state = 2 - elif wait_duration_sec >= warn and not warn == 0: + elif wait_duration_sec >= warn: state = 1 - elif warn > 0 or crit > 0: + else: state = 0 yield state, \ "Session %s blocked by %s (Wait %s ms, Type: %s)" % \ ( session_id, blocking_session_id, wait_duration_ms, wait_type ) - check_info['mssql_blocked_sessions'] = { 'inventory_function' : inventory_mssql_blocked_sessions, 'check_function' : check_mssql_blocked_sessions, - 'service_description' : "MSSQL Blocked Sessions", - 'group' : "mssql_blocked_sessions", + 'service_description' : 'MSSQL Blocked Sessions', + 'group' : 'mssql_blocked_sessions', + 'default_levels_variable' : 'mssql_blocked_sessions_default_levels', }

7 years, 7 months

Diskspace plugin is shipped in enterprise directory

by Lars Michelsen

Module: check_mk Branch: master Commit: f00e1ee97eaac5e1ba17ca7b13038d41c815b854 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f00e1ee97eaac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 11:18:17 2017 +0100 Diskspace plugin is shipped in enterprise directory Change-Id: I85d90345213183589d434ab2a2c8fadef9f4a127 --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 8e37922..c977b2c 100644 --- a/Makefile +++ b/Makefile @@ -239,7 +239,6 @@ cmc-$(VERSION).tar.gz: config.h m4 | tar xf - -C cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) - mv cmc-$(VERSION)/enterprise/diskspace cmc-$(VERSION) sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION)

7 years, 7 months

8703 Livestatus proxy: Can now connect via unix socket to the local site

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fd195170c966a7e152948508601625b5ceef05d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd195170c966a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 11:43:03 2017 +0100 8703 Livestatus proxy: Can now connect via unix socket to the local site The livestatus proxy daemon can now be configured also for the local site. Even when this is the local site, this makes sense, because the proxy daemon can now also multiplex connections and cache queries for the local site. Change-Id: I05b5a24042f16a9b8bb4dc2557cf728efaefb217 --- web/htdocs/config.py | 11 +++++++++-- web/htdocs/wato.py | 23 ++++++++++++++++++----- web/htdocs/watolib.py | 8 +++++++- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index cdd4f2f..3c3d631 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -666,11 +666,18 @@ def site(site_id): return s -# TODO: Does this work when using liveproxyd locally? def site_is_local(site_name): s = sites.get(site_name, {}) sock = s.get("socket") - return not sock or sock == "unix:" + cmk.paths.livestatus_unix_socket + + if not sock or sock == "unix:" + cmk.paths.livestatus_unix_socket: + return True + + if type(s["socket"]) == tuple and s["socket"][0] == "proxy" \ + and s["socket"][1]["socket"] is None: + return True + + return False def default_site(): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 10aeedd..17f76a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9388,14 +9388,17 @@ def mode_edit_site(phase): TextAscii(label = _("Host:"), allow_empty = False, size=15), Integer(label = _("Port:"), minvalue=1, maxvalue=65535, default_value=6557), ]) + conn_choices = [ - ( None, _("Connect to the local site") ), - ( "tcp", _("Connect via TCP"), vs_tcp_port), - ( "unix", _("Connect via UNIX socket"), TextAscii( + (None, _("Connect to the local site")), + ("tcp", _("Connect via TCP"), vs_tcp_port), + ("unix", _("Connect via UNIX socket"), TextAscii( label = _("Path:"), size = 40, - allow_empty = False)), + allow_empty = False) + ), ] + if config.liveproxyd_enabled: conn_choices[2:2] = [ ( "proxy", _("Use Livestatus Proxy-Daemon"), @@ -9403,7 +9406,17 @@ def mode_edit_site(phase): optional_keys = False, columns = 1, elements = [ - ( "socket", vs_tcp_port ), + ("socket", Alternative( + title = _("Connect to"), + style = "dropdown", + elements = [ + FixedValue(None, + title = _("Connect to the local site"), + totext = "", + ), + vs_tcp_port, + ], + )), ( "channels", Integer( title = _("Number of channels to keep open"), diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9ee642b..083aa4a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3333,7 +3333,13 @@ def create_nagvis_backends(sites): # Handle special data format of livestatus proxy config if type(site['socket']) == tuple: - socket = 'tcp:%s:%d' % site['socket'][1]['socket'] + if type(site['socket'][1]['socket']) == tuple: + socket = 'tcp:%s:%d' % site['socket'][1]['socket'] + elif site['socket'][1]['socket'] is None: + socket = 'unix:%s' % cmk.paths.livestatus_unix_socket + else: + raise NotImplementedError() + else: socket = site['socket']

7 years, 7 months

Fixed shipping liveproxyd hook

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c83fb83cb0bd8f7c7715514bfeab1a6516cef99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c83fb83cb0bd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 10:44:27 2017 +0100 Fixed shipping liveproxyd hook Change-Id: I93a6e683348ce2456a0b6438b5d88825ecc4250f --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 529a33c..8e37922 100644 --- a/Makefile +++ b/Makefile @@ -238,6 +238,8 @@ cmc-$(VERSION).tar.gz: config.h livestatus \ m4 | tar xf - -C cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) + mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) + mv cmc-$(VERSION)/enterprise/diskspace cmc-$(VERSION) sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION)

7 years, 7 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 89e4fabfba6977a4574d5f01e9439b90abaa792e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89e4fabfba6977… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 9 09:48:44 2017 +0100 Minor code cleanup Change-Id: I8aa36ac0d2b2d69c5f391eb4c06e765a1783f7e6 --- checks/cisco_cpu_multiitem | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/cisco_cpu_multiitem b/checks/cisco_cpu_multiitem index bb01674..e5aa1ae 100644 --- a/checks/cisco_cpu_multiitem +++ b/checks/cisco_cpu_multiitem @@ -30,7 +30,7 @@ factory_settings['cisco_cpu_multiitem_default_levels'] = { def parse_cisco_cpu_multiitem(info): ph_idx_to_desc = {} - cpus = {} + parsed = {} for idx, desc in info[1]: if desc.lower().startswith("cpu "): desc = desc[4:] @@ -41,10 +41,10 @@ def parse_cisco_cpu_multiitem(info): name = ph_idx_to_desc[idx] else: name = idx - cpus[name] = { + parsed[name] = { 'util': float(util), } - return cpus + return parsed def inventory_cisco_cpu_multiitem(parsed): for name in parsed:

7 years, 7 months

4190 FIX mssql_blocked_sessions: Fixed unknown states if only one session is blocked

by Marcel Arentz

Module: check_mk Branch: master Commit: bb3f40218550e186c32dc48c1ac8716b3c001dc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb3f40218550e1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Feb 3 17:02:04 2017 +0100 4190 FIX mssql_blocked_sessions: Fixed unknown states if only one session is blocked The check state has been unknown if only one session was blocked, because the checkplugin was expecting one additional first line from the agent output which does not exist anymore. The new version can handle both cases and will not accidentally drop any information anymore. Change-Id: Ibb51b14b5fed7c1d52c6bebe85264fb68cc2a860 --- .werks/4190 | 12 ++++++++++++ checks/mssql_blocked_sessions | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4190 b/.werks/4190 new file mode 100644 index 0000000..d6c8c4b --- /dev/null +++ b/.werks/4190 @@ -0,0 +1,12 @@ +Title: mssql_blocked_sessions: Fixed unknown states if only one session is blocked +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486137493 +Class: fix + +The check state has been unknown if only one session was blocked, because +the checkplugin was expecting one additional first line from the agent output +which does not exist anymore. The new version can handle both cases and will +not accidentally drop any information anymore. diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index ad43fcb..8923224 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -43,7 +43,11 @@ def check_mssql_blocked_sessions(_no_item, params, info): return state = 2 - for session_id, wait_duration_ms, wait_type, blocking_session_id in info[1:]: + for line in info: + if "blocked" in line[0].lower(): + continue # Skip debug output which was send by old agent by accident + session_id, wait_duration_ms, wait_type, blocking_session_id = line + if params: state = params.get("state", 2) warn, crit = params.get("waittime", (0, 0))

7 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
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