Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 86e7681dbfeeddd1e0fca8c6c0e22e10360be0c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86e7681dbfeedd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 4 14:59:25 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 40cfd03..60e4d62 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3593 +3603

8 years, 2 months

3565 FIX wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: 24a050afba5eb8f1ddc0ebf143c3522ecbbc502d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24a050afba5eb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 14:45:29 2016 +0200 3565 FIX wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output --- .werks/3565 | 10 ++++++++++ ChangeLog | 1 + checks/wmi.include | 3 +-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3565 b/.werks/3565 new file mode 100644 index 0000000..76592fc --- /dev/null +++ b/.werks/3565 @@ -0,0 +1,10 @@ +Title: wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462365900 + + diff --git a/ChangeLog b/ChangeLog index 3d02302..ceaa7c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -207,6 +207,7 @@ * 3467 FIX: logwatch: fix exception in case the logfile name contains non-ascii characters * 3563 FIX: fortigate_sslvpn: Fixed broken manpage * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" + * 3565 FIX: wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/wmi.include b/checks/wmi.include index 425f75e..af1e5a3 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -94,8 +94,7 @@ def parse_wmi_table(info, key="Name"): try: col_index = self.__headers[column] except KeyError, e: - raise KeyError(e.message + " missing, valid keys: " - + ", ".join(self.__headers.keys())) + raise KeyError("%s missing, valid keys: %s" % (e, ", ".join(self.__headers.keys()))) return self.__rows[row_index][col_index]

8 years, 2 months

3468 FIX Fix changing a user' s language back to English if the default is German

by Mathias Kettner

Module: check_mk Branch: master Commit: 684f0d02c65bd279554ad3ff7436ef62200d1a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=684f0d02c65bd2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 4 14:40:58 2016 +0200 3468 FIX Fix changing a user's language back to English if the default is German If the global language setting was German then a user could not set this back to English. This has been fixed. --- .werks/3468 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/config.py | 9 ++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/3468 b/.werks/3468 new file mode 100644 index 0000000..4621a69 --- /dev/null +++ b/.werks/3468 @@ -0,0 +1,11 @@ +Title: Fix changing a user's language back to English if the default is German +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462365605 + +If the global language setting was German then a user could not set this +back to English. This has been fixed. diff --git a/ChangeLog b/ChangeLog index ceaa7c4..9b49ac1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 3453 FIX: apache_status: Fixed wrong graph labels and improved wordings * 3454 FIX: Fixed scaling of numbers in graphs (e.g. inodes of filesystems) * 3462 FIX: Fixed ineffective localizations on werk page after language change + * 3468 FIX: Fix changing a user's language back to English if the default is German... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index d3df6d3..f9484d1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -318,9 +318,12 @@ def set_user_confdir(user_id): make_nagios_directory(user_confdir) def get_language(default = None): - if default == None: - default = default_language - return user and user.get('language', default) or default + if "language" in user: + return user["language"] + elif default == None: + return default_language + else: + return default def hide_language(lang): return lang in hide_languages

8 years, 2 months

Fixed inventory of logwatch.ec when no forwarding is configured

by Lars Michelsen

Module: check_mk Branch: master Commit: a836adeb171619a7226472f4cb9cb847bd6642eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a836adeb171619… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 13:54:16 2016 +0200 Fixed inventory of logwatch.ec when no forwarding is configured --- checks/logwatch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/logwatch b/checks/logwatch index 89da133..943bbfc 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -637,6 +637,8 @@ def inventory_logwatch_ec(info, one_svc_per_log): if type(rule) == dict: for key, value in rule.items(): merged_rules[key] = value + elif type(rule) == str: + return # Configured "no forwarding" separate_checks = merged_rules.get("separate_checks", False) if separate_checks != one_svc_per_log:

8 years, 2 months

3564 FIX logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to " No forwarding"

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c1951e986f45eb59c986dcdaa414a799c5ddbc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c1951e986f45e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 13:49:56 2016 +0200 3564 FIX logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" --- .werks/3564 | 10 ++++++++++ ChangeLog | 1 + checks/logwatch | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3564 b/.werks/3564 new file mode 100644 index 0000000..31a0ca8 --- /dev/null +++ b/.werks/3564 @@ -0,0 +1,10 @@ +Title: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462362572 + + diff --git a/ChangeLog b/ChangeLog index 21ca68c..3d02302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -206,6 +206,7 @@ * 3456 FIX: bluecoat_diskcpu: Fixed visualization of graph * 3467 FIX: logwatch: fix exception in case the logfile name contains non-ascii characters * 3563 FIX: fortigate_sslvpn: Fixed broken manpage + * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/logwatch b/checks/logwatch index ea52ed3..89da133 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -634,8 +634,9 @@ def inventory_logwatch_ec(info, one_svc_per_log): merged_rules = {} for rule in forward_settings[-1::-1]: - for key, value in rule.items(): - merged_rules[key] = value + if type(rule) == dict: + for key, value in rule.items(): + merged_rules[key] = value separate_checks = merged_rules.get("separate_checks", False) if separate_checks != one_svc_per_log:

8 years, 2 months

Fixed werk back link setting the werk ID as url variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 0965f8433cacee08e317234d6674a237dd3502db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0965f8433cacee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 11:54:31 2016 +0200 Fixed werk back link setting the werk ID as url variable --- web/htdocs/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 621d76e..b70e53d 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -126,7 +126,7 @@ def page_werk(): html.header(("%s %s - %s") % (_("Werk"), render_werk_id(werk, with_link=False), werk["title"]), stylesheets = werks_stylesheets) html.begin_context_buttons() - back_url = html.makeuri([], filename="version.py") # keeps filter settings + back_url = html.makeuri([], filename="version.py", delvars=["werk"]) # keeps filter settings html.context_button(_("Back"), back_url, "back") if werk["compatible"] == "incomp_unack" and may_acknowledge(): ack_url = html.makeactionuri([("_werk_ack", werk["id"])], filename="version.py")

8 years, 2 months

3563 FIX fortigate_sslvpn: Fixed broken manpage

by Lars Michelsen

Module: check_mk Branch: master Commit: 4718f095c23b570bc5bc1aef64208dc6e3dd1601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4718f095c23b57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 11:29:30 2016 +0200 3563 FIX fortigate_sslvpn: Fixed broken manpage --- .werks/3563 | 10 ++++++++++ ChangeLog | 1 + checkman/fortigate_sslvpn | 4 +--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/3563 b/.werks/3563 new file mode 100644 index 0000000..e4b5ee7 --- /dev/null +++ b/.werks/3563 @@ -0,0 +1,10 @@ +Title: fortigate_sslvpn: Fixed broken manpage +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462354163 + + diff --git a/ChangeLog b/ChangeLog index cd39cc3..21ca68c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -205,6 +205,7 @@ * 3430 FIX: apc_inrow_temp: fixed wrong data handling if data is not available or incomplete * 3456 FIX: bluecoat_diskcpu: Fixed visualization of graph * 3467 FIX: logwatch: fix exception in case the logfile name contains non-ascii characters + * 3563 FIX: fortigate_sslvpn: Fixed broken manpage Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checkman/fortigate_sslvpn b/checkman/fortigate_sslvpn index da9d08d..2c1a1f5 100644 --- a/checkman/fortigate_sslvpn +++ b/checkman/fortigate_sslvpn @@ -8,11 +8,9 @@ description: SSL VPN can be enabled/disabled and provides per virtual domain individually, hence there is one service per domain. This check is currently purely informational and is thus always "OK". + inventory: One service per virtual domain will be created -[parameters] -None - perfdata: current number of active tunnels, users and web sessions

8 years, 2 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: fae5f17373f48528e40882655058a011e49291aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fae5f17373f485… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 11:29:05 2016 +0200 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 66cfd5d..40cfd03 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3563 +3593

8 years, 2 months

Updated bug entries #2490

by Mathias Kettner

Module: check_mk Branch: master Commit: 413c1f2b418ff8a64fb418e738b8c184a446e9ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413c1f2b418ff8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 4 11:10:11 2016 +0200 Updated bug entries #2490 --- .bugs/2490 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2490 b/.bugs/2490 new file mode 100644 index 0000000..4769b8f --- /dev/null +++ b/.bugs/2490 @@ -0,0 +1,9 @@ +Title: Buttons for downtimes (e.g. "This week") noch localized +Component: multisite +State: open +Date: 2016-05-04 11:07:20 +Targetversion: future +Class: bug + +Since this is now configured via a global option the translation does not +work anymore. Maybe we need to use the user_localizations for this.

8 years, 2 months

Fixed typo

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d6292518228eb608f004506878b7f9cbfb87d9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d6292518228eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 4 10:54:49 2016 +0200 Fixed typo --- 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 c0ce104..f00c0e5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11773,7 +11773,7 @@ def mode_ruleeditor(phase): else: html.write("<h3>%s: %s</h3>" % (_("Host"), only_host)) - search_form(_("Search for rules sets: "), "rulesets") + search_form(_("Search for rule sets: "), "rulesets") # Group names are separated with "/" into main group and optional subgroup. # Do not lose carefully manually crafted order of groups!

8 years, 2 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016