Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4133 FIX Do not suppress site specific global issues during WATO activation

by Lars Michelsen

Module: check_mk Branch: master Commit: 474ecbc0df7594b843ffadde11e591d6857a924f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=474ecbc0df7594… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 15:04:22 2016 +0100 4133 FIX Do not suppress site specific global issues during WATO activation --- .werks/4133 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 20 +++++++++----------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.werks/4133 b/.werks/4133 new file mode 100644 index 0000000..e08b8c2 --- /dev/null +++ b/.werks/4133 @@ -0,0 +1,9 @@ +Title: Do not suppress site specific global issues during WATO activation +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1481033046 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ecab0b5..8f74116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 4084 FIX: Improved error handling in case of broken hosts.mk files * 4130 FIX: Improved error handling when trying to edit not existant rules * 4131 FIX: Fixed broken WATO site login when using password containing special characters... + * 4133 FIX: Do not suppress site specific global issues during WATO activation Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index bb514b4..cf73164 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3658,11 +3658,6 @@ def automation_push_snapshot(): multitar.extract_from_buffer(tarcontent, replication_paths) - # We expect one file containing sitespecific global settings. - # That is contained in the sub-tarball "sitespecific.tar" and - # just contains one file: "sitespecific.mk". The contains a repr() - # of all global settings, that should override the ones in global.mk - # in various directories. try: tmp_dir = cmk.paths.tmp_dir + "/sitespecific-%s" % id(html) if not os.path.exists(tmp_dir): @@ -3676,15 +3671,18 @@ def automation_push_snapshot(): save_configuration_settings(current_settings) shutil.rmtree(tmp_dir) - except Exception, e: - logger(LOG_WARNING, "Warning: cannot extract site-specific global settings: %s" % e) - confirm_all_local_changes() # pending changes are lost + confirm_all_local_changes() # pending changes are lost + + call_hook_snapshot_pushed() - call_hook_snapshot_pushed() + # Create rule making this site only monitor our hosts + create_distributed_wato_file(site_id) + except Exception, e: + raise MKGeneralException(_("Failed to deploy configuration: \"%s\". " + "Please note that the site configuration has been synchronized " + "partially.") % traceback.format_exc()) - # Create rule making this site only monitor our hosts - create_distributed_wato_file(site_id) log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) return True

7 years, 6 months

4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context

by Lars Michelsen

Module: check_mk Branch: master Commit: b02285f3f3ec001be5998d2218cab993fbe04065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b02285f3f3ec00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 14:29:24 2016 +0100 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context All notifications produced by the Event Console now add the variable EC_ORIG_HOST to the notification context. The variable contains the original host information of the event. Even when host rewriting is done, this contains the original name. --- .werks/4132 | 11 +++++++++++ ChangeLog | 1 + bin/mkeventd | 3 +++ 3 files changed, 15 insertions(+) diff --git a/.werks/4132 b/.werks/4132 new file mode 100644 index 0000000..1b3ee10 --- /dev/null +++ b/.werks/4132 @@ -0,0 +1,11 @@ +Title: Monitoring notifications: Add EC_ORIG_HOST to notifiation context +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i3 +Date: 1481030875 +Class: feature + +All notifications produced by the Event Console now add the variable EC_ORIG_HOST +to the notification context. The variable contains the original host information +of the event. Even when host rewriting is done, this contains the original name. diff --git a/ChangeLog b/ChangeLog index e5c27fb..ecab0b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 3991 FIX: BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups Event Console: + * 4132 Monitoring notifications: Add EC_ORIG_HOST to notifiation context... * 4097 FIX: Event console: Make writing of status file more robust... Livestatus: diff --git a/bin/mkeventd b/bin/mkeventd index 7203a1e..1cf41cf 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2371,6 +2371,7 @@ class EventServer: if "set_text" in rule: event["text"] = replace_groups(rule["set_text"], event["text"], groups) if "set_host" in rule: + event["orig_host"] = event["host"] event["host"] = replace_groups(rule["set_host"], event["host"], groups) if "set_application" in rule: event["application"] = replace_groups(rule["set_application"], event["application"], groups) @@ -3938,6 +3939,8 @@ def do_notify(event, username=None, is_cancelling=False): "EC_PID": str(event.get("pid", 0)), "EC_MATCH_GROUPS": "\t".join(event["match_groups"]), "EC_CONTACT_GROUPS": contact_groups and " ".join(contact_groups) or "", + "EC_ORIG_HOST": event.get("orig_host", event["host"]), + } # Add rule based notification specific macros and add the

7 years, 6 months

mkevent: Fixed build with g++-6 installed

by Lars Michelsen

Module: check_mk Branch: master Commit: 73e96fd803b42ee43719c9b5a1ab45bad4ffce3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73e96fd803b42e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 14:19:08 2016 +0100 mkevent: Fixed build with g++-6 installed --- bin/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/Makefile b/bin/Makefile index 9debf8f..318d0f5 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -23,7 +23,12 @@ # Boston, MA 02110-1301 USA. # TODO(sp) We should really use autotools here... -CXX := g++-5 +ifneq ($(shell which g++-6 2>/dev/null),) + CXX := g++-6 +else + CXX := g++-5 +endif + CXXFLAGS := -std=c++14 -g -O3 -Wall -Wextra LDFLAGS := -static-libstdc++ EXECUTABLES := mkevent mkeventd_open514

7 years, 6 months

Made service description being not escaped on manpages

by Lars Michelsen

Module: check_mk Branch: master Commit: fab0b7befcc1c9ce6be7a151cf25cfed36992eb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab0b7befcc1c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 12:00:42 2016 +0100 Made service description being not escaped on manpages --- 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 c8d3d47..1285f1c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15311,7 +15311,7 @@ def mode_check_manpage(phase): if manpage["type"] == "check_mk": html.open_tr() html.th(_("Service name")) - html.td(manpage["service_description"].replace("%s", "☐")) + html.td(HTML(manpage["service_description"].replace("%s", "☐"))) html.close_tr() if manpage.get("group"):

7 years, 6 months

Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ebf495afa5087a7f7c8d84132dd2e505ce2fe9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ebf495afa5087… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 11:45:58 2016 +0100 Removed debug output --- web/htdocs/htmllib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 56ee1a9..3ff31ab 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -419,7 +419,6 @@ class HTMLGenerator(Escaper, OutputFunnel): if isinstance(tag_content, HTML): tag += tag_content.lstrip(' ').rstrip('\n') else: - self.debug((tag_content, self._escape_text(tag_content))) tag += self._escape_text(tag_content) tag += "</%s>" % (tag_name)

7 years, 6 months

All manpage files are now processed as unicode strings

by Lars Michelsen

Module: check_mk Branch: master Commit: 00313d2674b9cd8f8cbb9ffc2ebb866f1954caf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00313d2674b9cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 11:55:03 2016 +0100 All manpage files are now processed as unicode strings --- lib/man_pages.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/man_pages.py b/lib/man_pages.py index c0c8377..7663c2f 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -247,7 +247,7 @@ def print_man_page_table(): def _get_title_from_man_page(path): for line in file(path): if line.startswith("title:"): - return line.split(":", 1)[1].strip() + return line.split(":", 1)[1].strip().decode("utf-8") raise MKGeneralException(_("Invalid man page: Failed to get the title")) @@ -391,7 +391,7 @@ def _create_fallback_man_page(name, path, error_message): return { "name" : name, "path" : path, - "description" : file(path).read().strip(), + "description" : file(path).read().strip().decode("utf-8"), "title" : _("%s: Cannot parse man page: %s") % (name, error_message), "agents" : "", "license" : "unknown", @@ -408,7 +408,7 @@ def _parse_man_page_header(name, path): key = None lineno = 0 for line in file(path): - line = line.rstrip() + line = line.rstrip().decode("utf-8") lineno += 1 try: if not line: @@ -454,6 +454,7 @@ def load_man_page(name): for lineno, line in enumerate(file(path)): try: + line = line.decode("utf-8") if line.startswith(' ') and line.strip() != "": # continuation line empty_line_count = 0 if current_variable:

7 years, 6 months

Fixed notification rule editor that broke some days ago

by Lars Michelsen

Module: check_mk Branch: master Commit: fa8b95f0bd2e048a158c2d0da93f50a4d54e6013 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa8b95f0bd2e04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 11:45:05 2016 +0100 Fixed notification rule editor that broke some days ago --- modules/automation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 1c8fb3e..1306d31 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -569,11 +569,12 @@ def automation_get_check_information(): for check_type, check in check_info.items(): try: manfile = manuals.get(check_type) + # TODO: Use cmk.man_pages module standard functions to read the title if manfile: title = file(manfile).readline().strip().split(":", 1)[1].strip() else: title = check_type - checks[check_type] = { "title" : title } + checks[check_type] = { "title" : title.decode("utf-8") } if check["group"]: checks[check_type]["group"] = check["group"] checks[check_type]["service_description"] = check.get("service_description","%s")

7 years, 6 months

htmllib: Cleaned up duplicate code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: d977515e14cf9fe0f8279945e1ba49891a370768 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d977515e14cf9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 11:41:34 2016 +0100 htmllib: Cleaned up duplicate code a bit --- web/htdocs/htmllib.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e38d826..56ee1a9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -408,16 +408,22 @@ class HTMLGenerator(Escaper, OutputFunnel): def _render_content_tag(self, tag_name, tag_content, **attrs): - tag = '' + tag = self._render_opening_tag(tag_name, **attrs) + if tag_content in ['', None]: - tag = "%s</%s>" % (self._render_opening_tag(tag_name, **attrs), tag_name) - elif isinstance(tag_content, HTML): - tag = "%s%s</%s>" % (self._render_opening_tag(tag_name, **attrs).rstrip('\n'), - tag_content.lstrip(' ').rstrip('\n'), tag_name) + pass + else: - tag = "%s%s</%s>" % (self._render_opening_tag(tag_name, **attrs).rstrip('\n'),\ - self._escape_text(tag_content),\ - tag_name) + tag = tag.rstrip("\n") + + if isinstance(tag_content, HTML): + tag += tag_content.lstrip(' ').rstrip('\n') + else: + self.debug((tag_content, self._escape_text(tag_content))) + tag += self._escape_text(tag_content) + + tag += "</%s>" % (tag_name) + #self.indent_level -= 1 return HTML(tag)

7 years, 6 months

4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase,

by Konstantin Büttner

ups_cps_outphase: Several checks to monitor CPS UPS devices Message-ID: <58468c1c.S7fhUJcRih5eiBd/%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 648dafacf38b862b3212344289b5307cad40b376 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=648dafacf38b86… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 6 10:59:48 2016 +0100 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices --- .werks/4098 | 9 +++ ChangeLog | 1 + checkman/ups_cps_battery | 11 ++++ checkman/ups_cps_battery.temp | 13 ++++ checkman/ups_cps_inphase | 14 +++++ checkman/ups_cps_outphase | 14 +++++ checks/ups_cps_battery | 138 ++++++++++++++++++++++++++++++++++++++++++ checks/ups_cps_inphase | 52 ++++++++++++++++ checks/ups_cps_outphase | 58 ++++++++++++++++++ 9 files changed, 310 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=648dafacf3…

7 years, 6 months

improved filter choices

by Simon Betz

Module: check_mk Branch: master Commit: afc385a68b59a0a0fd10d8435a09459d4e4ff113 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afc385a68b59a0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 6 10:47:37 2016 +0100 improved filter choices --- web/plugins/visuals/filters.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 71ca836..db85b94 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1227,16 +1227,17 @@ class FilterECServiceLevelRange(Filter): def _prepare_choices(self): - return map( lambda x: ( str(x[0]), "%s - %s" % (x[0], x[1]) ), - config.mkeventd_service_levels ) + choices = config.mkeventd_service_levels[:] + choices.sort() + return map( lambda x: ( str(x[0]), "%s - %s" % (x[0], x[1]) ), choices ) def display(self): selection = [ ("", "") ] + self._prepare_choices() html.write("From") - html.sorted_select(self.lower_bound_varname, selection) + html.select(self.lower_bound_varname, selection) html.write("To") - html.sorted_select(self.upper_bound_varname, selection) + html.select(self.upper_bound_varname, selection) def filter(self, infoname):

7 years, 6 months

← Newer
1
...
31
32
33
34
35
36
37
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016