Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6076 FIX lnx_bonding: Fixed item name which had a leading './'

by Simon Betz

Module: check_mk Branch: master Commit: 76a02e7529b91edae763d5097cdb4e1a3c143e18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76a02e7529b91e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 11 10:10:00 2018 +0200 6076 FIX lnx_bonding: Fixed item name which had a leading './' Change-Id: Iae0d732a18b1070e5b471a74ade5b95da0e11ef1 --- .werks/6076 | 10 ++++++++++ checks/lnx_bonding | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/6076 b/.werks/6076 new file mode 100644 index 0000000..a21fcf6 --- /dev/null +++ b/.werks/6076 @@ -0,0 +1,10 @@ +Title: lnx_bonding: Fixed item name which had a leading './' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526026133 +Class: fix + + diff --git a/checks/lnx_bonding b/checks/lnx_bonding index 810aadf..54acf82 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -107,6 +107,7 @@ def parse_lnx_bonding(info): # Now convert to generic dict, also used by other bonding checks converted = {} for bond, status in bonds.items(): + bond = bond.lstrip("./") interfaces = {} for eth, ethstatus in status["interfaces"].items(): interfaces[eth] = {

6 years, 4 months

Fixed URL encoding of aggregation group tree variable; updated werk 6073

by Simon Betz

Module: check_mk Branch: master Commit: 5f7e5609e54468a896c69ee02d3b368f98542381 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f7e5609e54468… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 16:58:09 2018 +0200 Fixed URL encoding of aggregation group tree variable; updated werk 6073 Change-Id: I23c83f2c47dbbdea9dbe70c2861ad5937dc05c5d --- web/plugins/sidebar/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index 8356239..804d3c9 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -94,7 +94,7 @@ def _render_tree(tree): html.open_ul() fetch_url = html.makeuri_contextless([ ("view_name", "aggr_all"), - ("aggr_group_tree", html.urlencode("/".join(attrs["__path__"])))], + ("aggr_group_tree", "/".join(attrs["__path__"]))], "view.py") bulletlink(group, fetch_url) html.close_ul()

6 years, 4 months

6075 FIX fortigate_ipsecvpn: Fixed crash if no parameters are stated

by Simon Betz

Module: check_mk Branch: master Commit: f8f31804a037068b66b908d73d5e28482df08833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f31804a03706… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 16:26:42 2018 +0200 6075 FIX fortigate_ipsecvpn: Fixed crash if no parameters are stated Change-Id: I7cb9aa6954a7b7ba8984ac179584e932229f2e0d --- .werks/6075 | 10 ++++++++++ checks/fortigate_ipsecvpn | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.werks/6075 b/.werks/6075 new file mode 100644 index 0000000..fa5e1b4 --- /dev/null +++ b/.werks/6075 @@ -0,0 +1,10 @@ +Title: fortigate_ipsecvpn: Fixed crash if no parameters are stated +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525875977 +Class: fix + + diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index 664204c..63eb3ce 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -37,9 +37,8 @@ def inventory_fortigate_ipsecvpn(info): def check_fortigate_ipsecvpn(item, params, info): if type(params) == tuple: - params = { "levels" : params } + params = {"levels" : params} - warn, crit = params["levels"] tunnels_ignore_levels = params.get("tunnels_ignore_levels", []) tunnels_down = [] @@ -56,22 +55,21 @@ def check_fortigate_ipsecvpn(item, params, info): num_down_ignored = num_down - num_ignored num_up = num_total - num_down - if num_down_ignored >= crit: - status = 2 - elif num_down_ignored >= warn: - status = 1 - else: - status = 0 - infotext = "Total: %d, Up: %d, Down: %d" % \ (num_total, num_up, num_down) + warn, crit = params.get("levels", (None, None)) + status = 0 + if crit is not None and num_down_ignored >= crit: + status = 2 + elif warn is not None and num_down_ignored >= warn: + status = 1 + if status: + infotext += " (warn/crit at %s/%s)" % (warn, crit) + if num_ignored: infotext += " (ignored: %d)" % num_ignored - if status > 0: - infotext += " (warn/crit at %d/%d)" % (warn, crit) - if tunnels_down: infotext += ", Tunnels: %s" % (", ".join(tunnels_down))

6 years, 4 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: d9084a3e6ec849e7882d0e87db8a1647a7d06ed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9084a3e6ec849… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 16:12:36 2018 +0200 Minor cleanup Change-Id: Ied15966d61e2608ffa4b77c8b333ff74f73d73b9 --- checks/cisco_temperature | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 7a9b3ee..a8a0b90 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -246,34 +246,29 @@ check_info['cisco_temperature'] = { def inventory_cisco_temperature_dom(parsed): - parsed_dom = parsed.get('14', {}) - for item, attrs in parsed_dom.iteritems(): + for item, attrs in parsed.get('14', {}).iteritems(): if attrs.get('raw_dev_state') == '1': yield item, {} def check_cisco_temperature_dom(item, params, parsed): # TODO perf, precision, severity, etc. - parsed_dom = parsed.get('14', {}) - if item in parsed_dom: - data = parsed_dom[item] + if item in parsed.get('14', {}): + data = parsed['14'][item] reading = data['reading'] state, state_readable = data['dev_state'] yield state, 'Status: %s' % state_readable infotext = "%s dBm" % reading - perfdata = ['power_level', reading] state = 0 - if data.get('dev_levels'): - warn, crit = data['dev_levels'] - perfdata += [warn, crit] - if reading >= crit: - state = 2 - elif reading >= warn: - state = 1 - if state: - infotext += " (warn/crit at %s/%s dBm)" % (warn, crit) - yield state, infotext, [perfdata] + warn, crit = data.get('dev_levels', (None, None)) + if crit is not None and reading >= crit: + state = 2 + elif warn is not None and reading >= warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s dBm)" % (warn, crit) + yield state, infotext, [('power_level', reading, warn, crit)] check_info['cisco_temperature.dom'] = {

6 years, 4 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: 96ae7af10ee3ca93b2691fc339291b7dd5e855ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96ae7af10ee3ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 15:45:03 2018 +0200 Fixed typo. Change-Id: Icd68053cb4a2ff89873ab6eb3ee46fc789000353 --- tests/integration/cmk/ec/test_mkeventd_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 3055c76..06bfdf8 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -64,7 +64,7 @@ def config(settings, slave_status, mongodb): @pytest.fixture(scope="function") def perfcounters(): - return cmk.ec.main.Perfcounters(loggiing.getLogger("cmk.mkeventd.lock.perfcounters")) + return cmk.ec.main.Perfcounters(logging.getLogger("cmk.mkeventd.lock.perfcounters")) @pytest.fixture(scope="function")

6 years, 4 months

Reduce g_logger usage.

by Sven Panne

Module: check_mk Branch: master Commit: 19129e79bcda7a57bb5e9dad67fc1f020ba6d969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19129e79bcda7a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 15:01:07 2018 +0200 Reduce g_logger usage. Change-Id: I24a7213539fce247d5ebcb9c8dd385cc23e3f991 --- cmk/ec/main.py | 48 +++++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 13 ++++--- 2 files changed, 33 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=19129e79bc…

6 years, 4 months

5810 FIX CMC Graphs: fixed incorrect fallback to pnp4nagios graphs in case some sites are disabled

by Andreas Boesl

Module: check_mk Branch: master Commit: b3f98feabf7b195e53dafec35340b3266ae29361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3f98feabf7b19… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 9 15:01:29 2018 +0200 5810 FIX CMC Graphs: fixed incorrect fallback to pnp4nagios graphs in case some sites are disabled The detection routine, which determines if CMC-graphs are possible could fail when a remote site was down or unreachable. Furthermore, it didn't matter if the site in question had the actual rrd data for the graph, so it could have been any site. As fallback, pnp4nagios graphs were used - which may lead to other display errors. Change-Id: Icc194b2edb92983991d560813d8725ef4de25346 --- .werks/5810 | 15 +++++++++++++++ web/htdocs/metrics.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/5810 b/.werks/5810 new file mode 100644 index 0000000..79ee7ae --- /dev/null +++ b/.werks/5810 @@ -0,0 +1,15 @@ +Title: CMC Graphs: fixed incorrect fallback to pnp4nagios graphs in case some sites are disabled +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1525870437 + +The detection routine, which determines if CMC-graphs are possible could fail when a remote site +was down or unreachable. Furthermore, it didn't matter if the site in question had the actual +rrd data for the graph, so it could have been any site. + +As fallback, pnp4nagios graphs were used - which may lead to other display errors. diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index c89af06..a79bf68 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1619,7 +1619,7 @@ def site_is_running_cmc(site_id): return sites.state(site_id, {}).get("program_version", "").startswith("Check_MK") else: for status in sites.states().values(): - if status.get("program_version").startswith("Check_MK"): + if status.get("program_version", "").startswith("Check_MK"): return True return False

6 years, 4 months

Synched test with latest EC changes.

by Sven Panne

Module: check_mk Branch: master Commit: 9ed1f3ee2c85e31a2fb9b75131e12e5f8902dd62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed1f3ee2c85e3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 14:56:12 2018 +0200 Synched test with latest EC changes. Change-Id: I7ca51910e457ba83f2667324b7b465b6df429ed0 --- tests/integration/cmk/ec/test_mkeventd_status.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 2cc91a8..99dbde9 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -6,6 +6,7 @@ import time import ast import pathlib2 as pathlib import threading +import logging from testlib import CMKEventConsole, ec, web import cmk.ec.settings @@ -57,7 +58,7 @@ def mongodb(): @pytest.fixture(scope="function") def config(settings, slave_status, mongodb): - return cmk.ec.main.load_configuration(settings, slave_status, mongodb) + return cmk.ec.main.load_configuration(settings, slave_status, mongodb, logging.getLogger("cmk.mkeventd")) @pytest.fixture(scope="function")

6 years, 4 months

Reduced usage of global logger variable, naming things apart on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 18353e3062a9052baeccd30529cc3434185391c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18353e3062a905… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 14:17:54 2018 +0200 Reduced usage of global logger variable, naming things apart on the way. Change-Id: I0f780018eab6143b070ee0945a57ce5f9e751870 --- cmk/ec/main.py | 156 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 79 insertions(+), 77 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18353e3062…

6 years, 4 months

Made logger instance variables non-public.

by Sven Panne

Module: check_mk Branch: master Commit: cd9e3e0a5085a22b8985aa0bf5c243d4917c0e90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd9e3e0a5085a2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 14:13:26 2018 +0200 Made logger instance variables non-public. Change-Id: Ida424a1de9575bacc6903b3c488be6e0436809e1 --- cmk/ec/main.py | 299 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 149 insertions(+), 150 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd9e3e0a50…

6 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018