Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5837 FIX Fixed overflow event text for local limits.

by Sven Panne

Module: check_mk Branch: master Commit: 2fd617ebc918bcf2531b9bea3ac0256f27bb8348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fd617ebc918bc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 17 11:43:59 2018 +0200 5837 FIX Fixed overflow event text for local limits. The event text of overflow events always contained the global limit, even when the reason for the overflow event was a local limit. This has been fixed. Change-Id: Ic35b739560a970a394702655f14ab8cba99d40bb --- .werks/5837 | 12 ++++++++++++ cmk/ec/main.py | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/5837 b/.werks/5837 new file mode 100644 index 0000000..aa0a9e5 --- /dev/null +++ b/.werks/5837 @@ -0,0 +1,12 @@ +Title: Fixed overflow event text for local limits. +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523958152 +Class: fix + +The event text of overflow events always contained the global limit, even +when the reason for the overflow event was a local limit. This has been +fixed. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 7bc7013..0b4e0a1 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3010,7 +3010,7 @@ class EventServer(ECServerThread): # events will be stopped. # Perform one time actions - overflow_event = self._create_overflow_event(ty, event) + overflow_event = self._create_overflow_event(ty, event, limit) if "overflow" in action: self.logger.info(" Creating overflow event") @@ -3043,7 +3043,7 @@ class EventServer(ECServerThread): return limit, action - def _create_overflow_event(self, ty, event): + def _create_overflow_event(self, ty, event, limit): now = time.time() new_event = { "rule_id": None, @@ -3072,7 +3072,7 @@ class EventServer(ECServerThread): new_event["text"] = ( "The overall event limit of %d open events has been reached. Not " "opening any additional event until open events have been " - "archived." % self._config["event_limit"]["overall"]["limit"] + "archived." % limit ) elif ty == "by_host": @@ -3082,7 +3082,7 @@ class EventServer(ECServerThread): "text": ( "The host event limit of %d open events has been reached for host \"%s\". " "Not opening any additional event for this host until open events have " - "been archived." % (self._config["event_limit"]["by_host"]["limit"], event["host"]) + "been archived." % (limit, event["host"]) ) }) @@ -3100,7 +3100,7 @@ class EventServer(ECServerThread): "The rule event limit of %d open events has been reached for rule \"%s\". " "Not opening any additional event for this rule until open events have " "been archived." % - (self._config["event_limit"]["by_rule"]["limit"], event["rule_id"]) + (limit, event["rule_id"]) ) })

6 years, 2 months

5930 Status of the Check_MK service can be specified per data source

by Simon Betz

Module: check_mk Branch: master Commit: e8218e13074d34390bd5d3bbfa3eaed3e2023aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8218e13074d34… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 16 10:55:06 2018 +0200 5930 Status of the Check_MK service can be specified per data source Change-Id: Iefa416e169609dc6b4c9ae74e2cf83edb30a9a37 --- .werks/5930 | 35 ++++++++ cmk_base/data_sources/abstract.py | 35 ++++++-- cmk_base/data_sources/programs.py | 4 + web/plugins/wato/check_mk_configuration.py | 125 ++++++++++++++++++++--------- 4 files changed, 151 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e8218e1307…

6 years, 2 months

5913 FIX webapi: Fixed handling of the option mode in service discovery

by Marcel Arentz

Module: check_mk Branch: master Commit: 45d6c87c5f07bf34204f1351f65958099b19157c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d6c87c5f07bf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Apr 11 17:42:48 2018 +0200 5913 FIX webapi: Fixed handling of the option mode in service discovery The previous implementation of the option "mode" in service_discovery did not allow a handling in the same way as in other webapi requests like including it into the request part. This is now fixed. The old behaviour is still supported. old only supported this syntax: curl "http://localhost/$OMD_SITE/check_mk/webapi.py?action=discover_services&_use… $OMD_ROOT/var/check_mk/web/automation/automation.secret)&mode=refresh" -d 'request={"hostname":"heute"}' newly supported and now coherent to other calls: curl "http://localhost/$OMD_SITE/check_mk/webapi.py?action=discover_services&_use… $OMD_ROOT/var/check_mk/web/automation/automation.secret)" -d 'request={"hostname":"heute", "mode":"refresh"}' Change-Id: I194855bdd752a0e236d5839a3b786a426b401bd1 --- .werks/5913 | 18 ++++++++++++++++++ web/plugins/webapi/webapi.py | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/5913 b/.werks/5913 new file mode 100644 index 0000000..bc665ef --- /dev/null +++ b/.werks/5913 @@ -0,0 +1,18 @@ +Title: webapi: Fixed handling of the option mode in service discovery +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523461091 +Class: fix + +The previous implementation of the option "mode" in service_discovery did not +allow a handling in the same way as in other webapi requests like including it +into the request part. This is now fixed. The old behaviour is still supported. + +old only supported this syntax: +curl "http://localhost/$OMD_SITE/check_mk/webapi.py?action=discover_services&_use… $OMD_ROOT/var/check_mk/web/automation/automation.secret)&mode=refresh" -d 'request={"hostname":"heute"}' + +newly supported and now coherent to other calls: +curl "http://localhost/$OMD_SITE/check_mk/webapi.py?action=discover_services&_use… $OMD_ROOT/var/check_mk/web/automation/automation.secret)" -d 'request={"hostname":"heute", "mode":"refresh"}' diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 7f52dfe..b2a41f1 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -1017,7 +1017,7 @@ def action_discover_services(request): validate_request_keys(request, required_keys=["hostname"], optional_keys=["mode"]) - mode = html.var("mode", deflt="new") + mode = request.get("mode", "new") hostname = request.get("hostname") check_hostname(hostname, should_exist = True) @@ -1055,7 +1055,7 @@ api_actions["discover_services"] = { def action_activate_changes(request): validate_request_keys(request, optional_keys=["mode", "sites", "allow_foreign_changes", "comment"]) - mode = html.var("mode", deflt="dirty") + mode = request.get("mode", "dirty") if request.get("allow_foreign_changes"): allow_foreign_changes = bool(int(request.get("allow_foreign_changes"))) else:

6 years, 2 months

Win-agent: restrict test coverage to own code

by Jukka Aro

Module: check_mk Branch: master Commit: 72034fc2d2ce87c349ceda569c8388eba8bdc4e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72034fc2d2ce87… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Apr 17 09:37:49 2018 +0200 Win-agent: restrict test coverage to own code Exclude system and external headers and libs from coverage report. --- agents/windows/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index f2ab0de..7af9563 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -65,12 +65,15 @@ integrationtest: install-strip fi ; \ cd - -coverage.info: WindowsAgentCoverage$(EXEEXT) ; \ +coverage.info: WindowsAgentCoverage$(EXEEXT) DISPLAY="$$DISPLAY xterm" wine $< 2>/dev/null ; \ - lcov --capture --rc lcov_branch_coverage=1 --directory . --output-file $@ + lcov -c --rc lcov_branch_coverage=1 --directory . -o $@ -unittest-coverage-html: coverage.info - genhtml $< --rc lcov_branch_coverage=1 --output-directory htmlcov +filtered_coverage.info: coverage.info + lcov --rc lcov_branch_coverage=1 --remove $< "/usr/*" "c++/*" -o $@ + +unittest-coverage-html: filtered_coverage.info + genhtml $< --rc lcov_branch_coverage=1 -o htmlcov libcheck_mk_agent_a_SOURCES = \ Configuration.cc \ @@ -149,6 +152,7 @@ wmitest_SOURCES = Logger.cc WinApi.cc stringutil.cc wmiHelper.cc wmitest.cc CLEANFILES = \ *.ico *.res *.rc config.* stamp-* Makefile \ $$(find . -name "*.gc*") \ + $$(find . -name "*coverage.info") \ $$(find . -name "*.html") \ $$(find . -name .dirstamp) \ $$(find .deps/ sections/.deps test/.deps test/sections/.deps it/.deps -type f) \

6 years, 2 months

Fixed possible missing newline before df section

by Simon Betz

Module: check_mk Branch: master Commit: ea431a9abb5da7f2de00ab0f6404f096960d7f5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea431a9abb5da7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 17 09:30:55 2018 +0200 Fixed possible missing newline before df section Change-Id: I6e332b19a1af5bca47d0cf36c416e070d3f4781c --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 3eb7cb3..9682327 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -321,7 +321,7 @@ echo "LocalDirectory: $LOCALDIR" if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' < /etc/xinetd.d/* | head -n1 + sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1; echo fi # Print out Partitions / Filesystems. (-P gives non-wrapped POSIXed output)

6 years, 2 months

5980 FIX BI: Fixed deletion of single aggregations

by Lars Michelsen

Module: check_mk Branch: master Commit: cbdd005b445c1c16def3d83520c25059d74e159c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbdd005b445c1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 16:52:42 2018 +0200 5980 FIX BI: Fixed deletion of single aggregations Change-Id: Ief8f3f1fe3f4c5791541f91148244b102f80b378 --- .werks/5980 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5980 b/.werks/5980 new file mode 100644 index 0000000..4fc58df --- /dev/null +++ b/.werks/5980 @@ -0,0 +1,11 @@ +Title: BI: Fixed deletion of single aggregations +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523890345 + +

6 years, 2 months

Improved error handling of invalid parameters when deleting /

by Lars Michelsen

editing aggregations Message-ID: <5ad5a4f2.KnUL0CTZh7bTknaQ%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b6b2f163cd87873d20e85ccf18b5a7537f92de4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6b2f163cd8787… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 16:28:03 2018 +0200 Improved error handling of invalid parameters when deleting / editing aggregations Change-Id: I4b3a12c67233c132d33add533709b76f5982205c --- web/plugins/wato/bi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index b68ed01..da9ef51 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1147,7 +1147,7 @@ class ModeBIAggregations(ModeBI): def _delete_after_confirm(self): - aggregation_id = int(html.var("_del_aggr")) + aggregation_id = html.get_integer_input("_del_aggr") c = wato_confirm(_("Confirm aggregation deletion"), _("Do you really want to delete the aggregation number <b>%s</b>?") % (aggregation_id+1)) if c: @@ -1564,7 +1564,7 @@ class ModeBIRuleTree(ModeBI): class ModeBIEditAggregation(ModeBI): def __init__(self): ModeBI.__init__(self) - self._edited_nr = int(html.var("id", "-1")) # In case of Aggregations: index in list + self._edited_nr = html.get_integer_input("id", -1) # In case of Aggregations: index in list if self._edited_nr == -1: self._new = True self._edited_aggregation = {"groups" : [[_("Main")]]}

6 years, 2 months

5981 FIX Fixed displaying of BI aggregation with icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 961d1066637dcedfa281597dfa5b3daa7560dc79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=961d1066637dce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 16:56:39 2018 +0200 5981 FIX Fixed displaying of BI aggregation with icons When displaying BI aggregations that want to display an icon, for example when a service is in downtime, an exception like this could occur: TypeError: render_icon() got an unexpected keyword argument 'class_'. Change-Id: I0ccb600d9c664b696b67308293631a6479bbd097 --- .werks/5981 | 13 +++++++++++++ web/htdocs/htmllib.py | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/5981 b/.werks/5981 new file mode 100644 index 0000000..272ab2b --- /dev/null +++ b/.werks/5981 @@ -0,0 +1,13 @@ +Title: Fixed displaying of BI aggregation with icons +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523890523 + +When displaying BI aggregations that want to display an icon, +for example when a service is in downtime, an exception like +this could occur: TypeError: render_icon() got an unexpected keyword argument 'class_'. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0357c31..c7ed416 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2802,7 +2802,7 @@ class html(HTMLGenerator, RequestHandler): self.write_html(self.render_icon("images/trans.png")) - def render_icon(self, icon_name, help=None, middle=True, id=None, cssclass=None): + def render_icon(self, icon_name, help=None, middle=True, id=None, cssclass=None, class_=None): # TODO: Refactor title = help @@ -2814,6 +2814,9 @@ class html(HTMLGenerator, RequestHandler): 'align' : 'absmiddle' if middle else None, 'src' : icon_name if "/" in icon_name else self.detect_icon_path(icon_name)} + if class_: + attributes['class'].extend(class_) + return self._render_opening_tag('img', close_tag=True, **attributes)

6 years, 2 months

Fixed possible exception when playing sounds is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 9540bf31186d96c55b99df3b94adfd908d9eebdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9540bf31186d96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 16:00:39 2018 +0200 Fixed possible exception when playing sounds is enabled When a host / service reports a state code that is not a normal monitoring state (e.g. 126), then an exception could occur when playing sounds is enabled. Change-Id: If1fce996b389a72a99a7a49ecc697dbbe0083a12 --- web/htdocs/views.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d1016ce..5966ac9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2037,8 +2037,15 @@ def save_state_for_playing_alarm_sounds(row): for state_map, state in [ (host_state_map, row.get("host_hard_state", row.get("host_state"))), (service_state_map, row.get("service_last_hard_state", row.get("service_state"))) ]: - if state != None: - g_alarm_sound_states.add(state_map[int(state)]) + if state is None: + continue + + try: + state_name = state_map[int(state)] + except KeyError: + continue + + g_alarm_sound_states.add(state_name) def play_alarm_sounds():

6 years, 2 months

5983 FIX docker_node_images: Fixed mixups between images of same repository and different tags

by Lars Michelsen

Module: check_mk Branch: master Commit: 35ac8516e74ea5ad877056a25b1539e7e6b79ead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ac8516e74ea5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 21:48:55 2018 +0200 5983 FIX docker_node_images: Fixed mixups between images of same repository and different tags The number of containers was not counted per image because the tag information was not handled correctly in all cases. Some containers don't explicitly state "repository:tag" but only "repository" as their image, depending on the "docker run" call. Check_MK is now falling back to "latest" tag in this case. Change-Id: I2fc33ced414d040eaf9dde683d1478cdc288d653 --- .werks/5983 | 16 ++++++++++++++++ agents/check_mk_agent.linux | 2 +- inventory/docker_node_images | 24 ++++++++++++++++-------- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.werks/5983 b/.werks/5983 new file mode 100644 index 0000000..053d6fc --- /dev/null +++ b/.werks/5983 @@ -0,0 +1,16 @@ +Title: docker_node_images: Fixed mixups between images of same repository and different tags +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523907880 + +The number of containers was not counted per image because the tag information +was not handled correctly in all cases. + +Some containers don't explicitly state "repository:tag" but only "repository" +as their image, depending on the "docker run" call. Check_MK is now falling +back to "latest" tag in this case. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9682327..1f58f8e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -976,7 +976,7 @@ if type docker > /dev/null 2>&1 ; then echo "<<<docker_node_images>>>" echo "[[[images]]]" docker images --all --format "{{json .}}" - for image in $(docker images --all --format "{{.Repository}}"); + for image in $(docker images --all --format "{{.Repository}}:{{.Tag}}"); do echo "[[[images_labels:$image]]]" docker image inspect --format "{{json .Config.Labels}}" "$image" diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 4565a55..c9be7fa 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -35,17 +35,26 @@ def _parse_docker_node_images(info): continue data = json.loads(" ".join(line)) + if section_name == "images": - parsed.setdefault(data["Repository"], data) + parsed.setdefault((data["Repository"], data["Tag"]), data) elif section_name.startswith("images_labels"): - _, image_id = section_name.split(":", 1) - image = parsed.get(image_id) - if image is not None and data: - image.setdefault("__labels__", data) + parts = section_name.split(":", 2) + if len(parts) == 3: + repository, tag = parts[1:] + image = parsed.get((repository, tag)) + if image is not None and data: + image.setdefault("__labels__", data) elif section_name == "containers": - image = parsed.get(data["Image"]) + image_name = data["Image"] + if ":" in image_name: + repository, tag = image_name.split(":", 1) + else: + repository, tag = image_name, "latest" + + image = parsed.get((repository, tag)) if image is not None: image.setdefault("__containers__", []).append(data) return parsed @@ -57,8 +66,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): inv_node = inventory_tree.get_list(path) status_node = status_data_tree.get_list(path) - for repo, image in parsed.iteritems(): - tag = image["Tag"] + for (repo, tag), image in parsed.iteritems(): id_ = image["ID"] inv_node.append({ "repository" : repo,

6 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
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