Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5799 FIX Availability: Fixed error in duration computation when merging identical states

by Andreas Boesl

Module: check_mk Branch: master Commit: cbfae370aef524607244d49b8a16dbdd1e408f69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbfae370aef524… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 18 13:33:57 2018 +0200 5799 FIX Availability: Fixed error in duration computation when merging identical states This error appears when the availability timeline is not fully connect, e.g. if it is split by a service period. The computation error itself seems no big issue, since this incorrect computed value wasn't evaluated, anyway. Change-Id: I5a1976edb1569d36012013ca60093b54bb49b5f1 --- .werks/5799 | 13 +++++++++++++ web/htdocs/availability.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5799 b/.werks/5799 new file mode 100644 index 0000000..57a22fe --- /dev/null +++ b/.werks/5799 @@ -0,0 +1,13 @@ +Title: Availability: Fixed error in duration computation when merging identical states +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524050943 +Class: fix + +This error appears when the availability timeline is not fully connect, e.g. if it is split +by a service period. The computation error itself seems no big issue, since this incorrect +computed value wasn't evaluated, anyway. + diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 3c9510c..b9ffaaf 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1077,7 +1077,7 @@ def object_title(what, av_entry): def merge_timeline(entries): n = 1 while n < len(entries): - if entries[n][1] == entries[n-1][1]: + if entries[n][1] == entries[n-1][1] and entries[n][0]["from"] == entries[n-1][0]["until"]: entries[n-1][0]["duration"] += entries[n][0]["duration"] entries[n-1][0]["until"] = entries[n][0]["until"] del entries[n]

6 years, 2 months

6010 Service levels in event console rules can now have a precedence

by Sven Panne

Module: check_mk Branch: master Commit: 604eeb6407fe7991dd94cd28aae6463b68bae59c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=604eeb6407fe79… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 18 12:21:05 2018 +0200 6010 Service levels in event console rules can now have a precedence Event console rules specify a service level, but it was a bit unclear what that actually means. Previously it was just a default value to use when the incoming message did not carry a service level itself. If it carried one (including '0'), this part of the rule did not have any effect. This behavior was a bit confusing and did not cover all use cases, so you can now specify what should happen when the incoming message already has a service level: Keep it (old behavior, the default) or overwrite it unconditionally with the configured service level. Change-Id: Idaae7a26f8b41514b8ebe71e5b6416c93b11e973 --- .werks/6010 | 18 ++++++++++++++++++ cmk/ec/main.py | 4 ++-- web/plugins/wato/mkeventd.py | 34 ++++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/.werks/6010 b/.werks/6010 new file mode 100644 index 0000000..9f17674 --- /dev/null +++ b/.werks/6010 @@ -0,0 +1,18 @@ +Title: Service levels in event console rules can now have a precedence +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524046455 +Class: feature + +Event console rules specify a service level, but it was a bit unclear what +that actually means. Previously it was just a default value to use when the +incoming message did not carry a service level itself. If it carried one +(including '0'), this part of the rule did not have any effect. + +This behavior was a bit confusing and did not cover all use cases, so you +can now specify what should happen when the incoming message already has a +service level: Keep it (old behavior, the default) or overwrite it +unconditionally with the configured service level. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 86e34b5..8336ff6 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2599,8 +2599,8 @@ class EventServer(ECServerThread): else: event["state"] = rule["state"] - if "sl" not in event: - event["sl"] = rule["sl"] + if ("sl" not in event) or (rule["sl"]["precedence"] == "rule"): + event["sl"] = rule["sl"]["value"] event["first"] = event["time"] event["last"] = event["time"] if "set_comment" in rule: diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 929d43a..9fa5091 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -351,13 +351,31 @@ def vs_mkeventd_rule(customer=None): help = _("The monitoring state that this event will trigger."), default_value = -1, )), - ( "sl", - DropdownChoice( - title = _("Service Level"), - choices = mkeventd.service_levels, - prefix_values = True, - ), - ), + ( "sl", Transform( + Dictionary( + title = _("Service Level"), + optional_keys = False, + elements = [ + ( "value", DropdownChoice( + title = _("Value"), + choices = mkeventd.service_levels, + prefix_values = True, + help = _("The default/fixed service level to use for this rule."), + )), + ( "precedence", DropdownChoice( + title = _("Precedence"), + choices = [ + ( "message", _("Keep service level from message (if available)") ), + ( "rule", _("Always use service level from rule") ), + ], + help = _("Here you can specify which service level will be used when " + "the incoming message already carries a service level."), + default_value = "message", + )), + ] + ), + forth = lambda x: {"value": x, "precedence": "message"} if isinstance(x, int) else x + )), ( "contact_groups", Dictionary( title = _("Contact Groups"), elements = [ @@ -1574,7 +1592,7 @@ def mode_mkeventd_rules(phase): html.write("%s" % dict(mkeventd.syslog_facilities)[facnr]) table.cell(_("Service Level"), - dict(mkeventd.service_levels()).get(rule["sl"], rule["sl"])) + dict(mkeventd.service_levels()).get(rule["sl"]["value"], rule["sl"]["value"])) hits = rule.get('hits') table.cell(_("Hits"), hits != None and hits or '', css="number")

6 years, 2 months

5442 mk_sap: Hostname prefix for piggyback hosts is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: 34edd0d5252a65f5787e0337d48890de18adae3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34edd0d5252a65… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 6 08:56:39 2017 +0100 5442 mk_sap: Hostname prefix for piggyback hosts is now configurable Change-Id: I95eae53d8c54230f54553e7528482010f492cc89 --- .werks/5442 | 10 ++++++++++ agents/plugins/mk_sap | 21 +++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.werks/5442 b/.werks/5442 new file mode 100644 index 0000000..72e3134 --- /dev/null +++ b/.werks/5442 @@ -0,0 +1,10 @@ +Title: mk_sap: Hostname prefix for piggyback hosts is now configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509954930 +Class: feature + + diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index b64a445..95773b7 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -126,6 +126,7 @@ local_cfg = { 'trace': '3', 'loglevel': 'warn', #'lang': 'EN', + #'host_prefix': 'FOOBAR_', } # A list of strings, while the string must match the full path to one or @@ -366,21 +367,21 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): -def check(cfg): +def check(cfg_entry): global conn - conn = sapnwrfc.base.rfc_connect(cfg) + conn = sapnwrfc.base.rfc_connect(cfg_entry) login() logs = {} sap_data = {} # This loop is used to collect all information from SAP - for ms_name, mon_name in mon_list(cfg): + for ms_name, mon_name in mon_list(cfg_entry): path = ms_name + SEPARATOR + mon_name if not to_be_monitored(path, True): continue - tree = mon_tree(cfg, ms_name, mon_name) + tree = mon_tree(cfg_entry, ms_name, mon_name) for node in tree: if not to_be_monitored(node['PATH']): continue @@ -409,20 +410,20 @@ def check(cfg): continue # Skip unwanted classes if class filtering is enabled if node['MTCLASS'] == MTE_PERFORMANCE: - perfvalue, this_uom = mon_perfdata(cfg, node) + perfvalue, this_uom = mon_perfdata(cfg_entry, node) uom = this_uom and this_uom or uom elif node['MTCLASS'] == MTE_SINGLE_MSG: - status_details = "%s: %s" % mon_msg(cfg, node) + status_details = "%s: %s" % mon_msg(cfg_entry, node) elif node['MTCLASS'] == MTE_MSG_CONTAINER: - alerts = mon_alerts(cfg, node) - logs = process_alerts(cfg, logs, ms_name, mon_name, node, alerts) + alerts = mon_alerts(cfg_entry, node) + logs = process_alerts(cfg_entry, logs, ms_name, mon_name, node, alerts) if len(alerts) > 0: last_alert = alerts[-1] dt = parse_dt(last_alert["ALERTDATE"], last_alert["ALERTTIME"]) - alert_state, alert_msg = alert_details(cfg, last_alert) + alert_state, alert_msg = alert_details(cfg_entry, last_alert) last_msg = '%s: %s - %s' % (dt, STATE_VALUE_MAP[alert_state['VALUE']][1], alert_msg) status_details = '%d Messages, Last: %s' % (len(alerts), last_msg) @@ -444,7 +445,7 @@ def check(cfg): for host, host_sap in sap_data.items(): - sys.stdout.write('<<<<%s>>>>\n' % host) + sys.stdout.write('<<<<%s%s>>>>\n' % (cfg_entry.get("host_prefix", ""), host)) sys.stdout.write('<<<sap:sep(9)>>>\n') sys.stdout.write('%s\n' % '\n'.join(host_sap)) sys.stdout.write('<<<<>>>>\n')

6 years, 2 months

Fixed local and plugins section

by Simon Betz

Module: check_mk Branch: master Commit: ad74fdd3e3f93b766f4e423134ff4b199bc67c49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad74fdd3e3f93b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 17 14:49:50 2018 +0200 Fixed local and plugins section Change-Id: I2346093736716205276db93520e79a43ae72502c --- agents/check_mk_agent.linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 1f58f8e..98d4063 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1161,7 +1161,7 @@ function is_valid_plugin () { # Local checks echo '<<<local>>>' if cd "$LOCALDIR" ; then - for skript in *.dpkg-{old,new,temp}; do + for skript in ./*; do if is_valid_plugin "$skript"; then ./"$skript" fi @@ -1176,9 +1176,9 @@ fi # Plugins if cd "$PLUGINSDIR"; then - for skript in *.dpkg-{old,new,temp}; do + for skript in ./*; do if is_valid_plugin "$skript"; then - ./"skript" + ./"$skript" fi done # Call some plugins only every Xth second

6 years, 2 months

Use additional hash for pluggy in Pipfile.lock

by Jukka Aro

Module: check_mk Branch: master Commit: 73c83aeefc23d7b634d23bd62bb65d527e7e65ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c83aeefc23d7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Apr 17 12:50:40 2018 +0200 Use additional hash for pluggy in Pipfile.lock --- Pipfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Pipfile.lock b/Pipfile.lock index 610624e..62f600d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -924,7 +924,8 @@ }, "pluggy": { "hashes": [ - "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff" + "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff", + "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c" ], "version": "==0.6.0" },

6 years, 2 months

Add coverage target for pytest unit tests

by Jukka Aro

Module: check_mk Branch: master Commit: 1da55649d847fd6acf3d863fc5c8f2e0d0a5188f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1da55649d847fd… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Apr 16 16:42:53 2018 +0200 Add coverage target for pytest unit tests Generate HTML report for (pytest) unit test coverage. --- tests/.coveragerc_unit | 14 ++++++++++++++ tests/Makefile | 22 +++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/tests/.coveragerc_unit b/tests/.coveragerc_unit new file mode 100644 index 0000000..b417f89 --- /dev/null +++ b/tests/.coveragerc_unit @@ -0,0 +1,14 @@ +[run] +source = + ../active_checks + ../agents + ../bin + ../checkman + ../checks + ../cmk + ../cmk_base + ../enterprise/cmk/cee + ../tests/unit + ../web +branch = True + diff --git a/tests/Makefile b/tests/Makefile index ceff31e..2aca780 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,18 +1,20 @@ SHELL=/bin/bash -e -PYTEST=source $$(pipenv --venv)/bin/activate ; py.test -s -vv +PYTEST=source ../.envrc ; py.test -s -vv +COVERAGE=source ../.envrc ; coverage .PHONY: help test-pylint test-integration test-gui-crawl \ test-bandit test-shellcheck setup format test-mypy \ - test-pylint-simple test-unit test-packaging + test-pylint-simple test-unit test-unit-coverage test-packaging help: - @echo "setup - Install dependencies" - @echo "test-unit - Run unit tests" - @echo "test-pylint - Run pylint based tests" - @echo "test-integration - Run integration tests" - @echo "test-gui-crawl - Run GUI crawl test" - @echo "test-bandit - Run bandit (security) tests" - @echo "test-shellcheck - Run shellcheck tests" + @echo "setup - Install dependencies" + @echo "test-unit - Run unit tests" + @echo "test-unit-coverage-html - Create HTML coverage report for unit tests" + @echo "test-pylint - Run pylint based tests" + @echo "test-integration - Run integration tests" + @echo "test-gui-crawl - Run GUI crawl test" + @echo "test-bandit - Run bandit (security) tests" + @echo "test-shellcheck - Run shellcheck tests" # This target needs to be phony so it is run every time because only the other # makefile can determine that there's nothing to be done. @@ -25,6 +27,8 @@ help: test-unit: ../.venv $(PYTEST) -T unit +test-unit-coverage-html: ../.venv + $(COVERAGE) run --rcfile=.coveragerc_unit -m pytest -T unit ; $(COVERAGE) html test-integration: ../.venv $(PYTEST) -T integration

6 years, 2 months

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 23d4a25f8f468fa89e4e271f1139fb3a986122c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d4a25f8f468f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 17 13:45:13 2018 +0200 Reserved 10 Werk IDS Change-Id: I1f26a28317509d08f3b3f31b78818d1ace45f6ca --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 41f2d30..a92ae41 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6009 +6019

6 years, 2 months

6009 FIX Rewrite event text in cancel events, too

by Sven Panne

Module: check_mk Branch: master Commit: d6c98a0b6de01b541eccbab56bce47a22f65db36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6c98a0b6de01b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 17 13:46:42 2018 +0200 6009 FIX Rewrite event text in cancel events, too Previously, only non-cancelling events had their text rewritten. This has been fixed. Change-Id: I513239d77e4ed8b51d8963f334dfa5feeaa0c0fc --- .werks/6009 | 11 +++++++++++ cmk/ec/main.py | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/6009 b/.werks/6009 new file mode 100644 index 0000000..16e217a --- /dev/null +++ b/.werks/6009 @@ -0,0 +1,11 @@ +Title: Rewrite event text in cancel events, too +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523965551 +Class: fix + +Previously, only non-cancelling events had their text rewritten. This has +been fixed. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0b4e0a1..86e34b5 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -4186,8 +4186,12 @@ class EventStatus(object): # values and the logfile entry if more relevant. previous_phase = event["phase"] event["phase"] = "closed" + # TODO: Why do we use OK below and not new_event["state"]??? event["state"] = 0 # OK event["text"] = new_event["text"] + # TODO: This is a hack and partial copy-n-paste from rewrite_events... + if "set_text" in rule: + event["text"] = replace_groups(rule["set_text"], event["text"], match_groups) event["time"] = new_event["time"] event["last"] = new_event["time"] event["priority"] = new_event["priority"]

6 years, 2 months

5985 FIX htpasswd command is now available in all sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f14b05f63d666c8d984e7434d72c346647038c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f14b05f63d666… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 12:48:07 2018 +0200 5985 FIX htpasswd command is now available in all sites The "omd create" success message tells users about using the htpasswd command to change the password of the default GUI user. On SLES platforms the command is available under the name "htpasswd2". We provide a symlink to the platform specific name to make the command available for all site users now. Change-Id: I4f75d6a81c4417d92b3c11c91edf64c6cd1ba42a --- .werks/5985 | 15 +++++++++++++++ omd/distros/CENTOS_5.mk | 1 + omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + omd/distros/DEBIAN_5.mk | 1 + omd/distros/DEBIAN_6.mk | 1 + omd/distros/DEBIAN_7.mk | 1 + omd/distros/DEBIAN_8.mk | 1 + omd/distros/DEBIAN_9.mk | 1 + omd/distros/SLES_11SP1.mk | 1 + omd/distros/SLES_11SP2.mk | 1 + omd/distros/SLES_11SP3.mk | 1 + omd/distros/SLES_11SP4.mk | 1 + omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + omd/distros/SLES_12SP2.mk | 1 + omd/distros/SLES_12SP3.mk | 1 + omd/distros/UBUNTU_12.04.mk | 1 + omd/distros/UBUNTU_13.04.mk | 1 + omd/distros/UBUNTU_14.04.mk | 1 + omd/distros/UBUNTU_15.04.mk | 1 + omd/distros/UBUNTU_16.04.mk | 1 + omd/distros/UBUNTU_16.10.mk | 1 + omd/distros/UBUNTU_17.04.mk | 1 + omd/distros/UBUNTU_17.10.mk | 1 + omd/packages/apache-omd/Makefile | 2 ++ 26 files changed, 41 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0f14b05f63…

6 years, 2 months

5984 FIX Agent RPMs: Add missing "Vendor" RPM header

by Lars Michelsen

Module: check_mk Branch: master Commit: 6108fc7c20e5793df18a0d1b47f799c43a78da4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6108fc7c20e579… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 09:46:31 2018 +0200 5984 FIX Agent RPMs: Add missing "Vendor" RPM header Change-Id: I54312a9dc773e0bbf0de8b3fd03e936c0317906b --- .werks/5984 | 11 +++++++++++ agents/check-mk-agent.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/5984 b/.werks/5984 new file mode 100644 index 0000000..8b2bbaa --- /dev/null +++ b/.werks/5984 @@ -0,0 +1,11 @@ +Title: Agent RPMs: Add missing "Vendor" RPM header +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1523951179 + + diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index a73f911..ca0378f 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -29,6 +29,7 @@ Release: 1 License: GPL Group: System/Monitoring URL: http://mathias-kettner.de/check_mk.html +Vendor: Mathias Kettner GmbH Source: check-mk-agent-%{_version}.tar.gz BuildRoot: %{_topdir}/buildroot AutoReq: off

6 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018