Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Recoded reporting module import handling

by Lars Michelsen

Module: check_mk Branch: master Commit: d8db900d603c7c57a781ce890f09e0ac65a214ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8db900d603c7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 30 10:51:14 2014 +0100 Recoded reporting module import handling --- web/htdocs/index.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 22e982a..67ee234 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -36,11 +36,10 @@ import sys, os, pprint from lib import * import livestatus import defaults, config, login, userdb, hooks, visuals, default_permissions -try: + +if os.path.exists(os.path.dirname(os.path.abspath(__file__)) + '/reporting.py'): import reporting -except SyntaxError: - raise -except: +else: reporting = None from html_mod_python import *

9 years, 11 months

Check_MK Git: check_mk: #1430 FIX Clone group: Now displays correct alias name of cloned group

by Andreas Boesl

Module: check_mk Branch: master Commit: ee7009a75f2754bdf93badb77841878cbb80e777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee7009a75f2754… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 30 10:43:04 2014 +0100 #1430 FIX Clone group: Now displays correct alias name of cloned group This applies to contact-, host- and servicegroups. --- .werks/1430 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1430 b/.werks/1430 new file mode 100644 index 0000000..cbe5c0d --- /dev/null +++ b/.werks/1430 @@ -0,0 +1,10 @@ +Title: Clone group: Now displays correct alias name of cloned group +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1414662122 +Class: fix + +This applies to contact-, host- and servicegroups. + diff --git a/ChangeLog b/ChangeLog index b3f253c..fc306d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 1119 FIX: WATO create rule: No longer raises an incorrect permission warning when creating a new rule... * 1121 FIX: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors... * 1160 FIX: Fixed wrong named column in mkeventd rules + * 1430 FIX: Clone group: Now displays correct alias name of cloned group... Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a53ca3d..38f809e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7974,7 +7974,7 @@ def mode_edit_group(phase, what): alias = groups.get(name, {}).get('alias', '') if not alias: if clone_group: - alias = groups.get(clone_group, "") + alias = groups.get(clone_group, {}).get('alias', '') else: alias = name html.text_input("alias", alias)

9 years, 11 months

Check_MK Git: check_mk: Trying to prevent caching problems with js/ css files during updates

by Lars Michelsen

Module: check_mk Branch: master Commit: a14a911ce1211984c2be2b4c30906b3cffe81bf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a14a911ce12119… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 30 10:40:04 2014 +0100 Trying to prevent caching problems with js/css files during updates --- web/htdocs/htmllib.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 25c4a6d..fe528c9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -715,7 +715,11 @@ class html: # Load specified Javascript files for js in [ "checkmk", "hover" ] + javascripts: - self.write('<script type="text/javascript" src="js/%s.js"></script>\n' % js) + if defaults.omd_root: + fname = 'js/%s-%s.js' % (js, defaults.check_mk_version) + else: + fname = 'js/%s.js' % js + self.write('<script type="text/javascript" src="%s"></script>\n' % fname) if self.browser_reload != 0: if self.browser_redirect != '':

9 years, 11 months

Check_MK Git: check_mk: Small cleanup in sidebar helper functions

by Mathias Kettner

Module: check_mk Branch: master Commit: 562e13a9e2cb89023ec9584ac7b04421a861c223 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=562e13a9e2cb89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 30 10:16:33 2014 +0100 Small cleanup in sidebar helper functions --- web/htdocs/sidebar.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ef8d8e1..ea9682c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -74,7 +74,7 @@ def link(text, url, target="main", onclick = None): onclick = onclick and (' onclick="%s"' % html.attrencode(onclick)) or '' return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \ 'class=link href="%s"%s>%s</a>' % \ - (html.attrencode(target), html.attrencode(url), onclick, html.attrencode(text)) + (html.attrencode(target or ""), html.attrencode(url), onclick, html.attrencode(text)) def simplelink(text, url, target="main"): html.write(link(text, url, target) + "<br>\n") @@ -88,11 +88,17 @@ def iconlink(text, url, icon): html.write('<a target=main class="iconlink link" href="%s">%s</a><br>' % \ (html.attrencode(url), linktext)) -def footnotelinks(links): +def begin_footnote_links(): html.write("<div class=footnotelink>") + +def end_footnote_links(): + html.write("</div>\n") + +def footnotelinks(links): + begin_footnote_links() for text, target in links: html.write(link(text, target)) - html.write("</div>\n") + end_footnote_links() def iconbutton(what, url, target="side", handler="", name="", css_class = ""): if target == "side":

9 years, 11 months

Check_MK Git: check_mk: fixed exception when table.end was called without table.begin

by Andreas Boesl

Module: check_mk Branch: master Commit: ee90eaa66c0a6eed68e457c5e927d8090cb4140e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee90eaa66c0a6e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 30 09:48:45 2014 +0100 fixed exception when table.end was called without table.begin --- web/htdocs/table.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index f5af97a..53e7fe1 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -122,14 +122,14 @@ def end(): finish_previous() html.unplug() + if not table: + return + # Output-Format "fetch" simply means that all data is being # returned as Python-values to be rendered somewhere else. if table["output_format"] == "fetch": return table["headers"], table["rows"] - if not table: - return - if table["output_format"] == "csv": do_csv = True csv_separator = html.var("csv_separator", ";")

9 years, 11 months

Check_MK Git: check_mk: ups_socomec_outphase: Removed debugging output

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4be9ad95f4ec6783d4e73fdf5e037ffd27734702 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4be9ad95f4ec67… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 29 16:49:10 2014 +0100 ups_socomec_outphase: Removed debugging output --- checks/ups_socomec_outphase | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/ups_socomec_outphase b/checks/ups_socomec_outphase index e08156b..d9fb507 100644 --- a/checks/ups_socomec_outphase +++ b/checks/ups_socomec_outphase @@ -47,7 +47,6 @@ def inventory_ups_socomec_outphase(info): def check_ups_socomec_outphase(item, params, info): - print params phaseinfo = parse_ups_socomec_outphase(info) return check_ups_outphase(item, params, phaseinfo)

9 years, 11 months

Check_MK Git: check_mk: #1443 ups_socomec_outphase: New check for monitoring the out phases of Socomec UPSs

by Konstantin Büttner

Module: check_mk Branch: master Commit: b7ca273140c107ca34b657335c30dd4e0fd4796f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7ca273140c107… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 29 16:46:52 2014 +0100 #1443 ups_socomec_outphase: New check for monitoring the out phases of Socomec UPSs --- .werks/1443 | 9 +++ ChangeLog | 1 + checkman/ups_socomec_outphase | 25 +++++++ checks/ups_outphase.include | 85 ++++++++++++++++++++++ checks/ups_socomec_outphase | 66 +++++++++++++++++ pnp-templates/check_mk-ups_outphase.php | 88 +++++++++++++++++++++++ pnp-templates/check_mk-ups_socomec_outphase.php | 1 + web/plugins/perfometer/check_mk.py | 6 ++ web/plugins/wato/check_parameters.py | 31 +++++++- 9 files changed, 310 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b7ca273140…

9 years, 11 months

Check_MK Git: check_mk: JavaScript Page refresh: Not longer skip _username and _secret

by Bastian Kuhn

Module: check_mk Branch: master Commit: 679df44b3812275965466882dd609934785969a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679df44b381227… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 29 14:23:30 2014 +0100 JavaScript Page refresh: Not longer skip _username and _secret --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a5e2359..5e9d4b9 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -414,7 +414,7 @@ function makeuri(addvars) { // Skip unwanted parmas for(var i = 0; i < tmp.length; i++) { pair = tmp[i].split('='); - if(pair[0][0] == '_') // Skip _<vars> + if(pair[0][0] == '_' && pair[0] != "_username" && pair[0] != "_secret") // Skip _<vars> continue; if(addvars.hasOwnProperty(pair[0])) // Skip vars present in addvars continue;

9 years, 11 months

Check_MK Git: check_mk: Fixed exception when trying to configure legacy ascii emails with bulk notifications

by Lars Michelsen

Module: check_mk Branch: master Commit: 82d584643aa52491040c63c8093d42fa9db95766 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82d584643aa524… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 29 13:42:12 2014 +0100 Fixed exception when trying to configure legacy ascii emails with bulk notifications --- web/htdocs/wato.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 18dfd15..4cc42de 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8579,14 +8579,15 @@ def validate_notification_rule(rule, varprefix): _("It does not make sense to add a bulk configuration for cancelling rules.")) if "bulk" in rule: - if rule["notify_plugin"]: + if rule["notify_plugin"][0]: info = load_notification_scripts()[rule["notify_plugin"][0]] if not info["bulk"]: raise MKUserError(varprefix + "_p_notify_plugin", _("The notification script %s does not allow bulking.") % info["title"]) else: raise MKUserError(varprefix + "_p_notify_plugin", - _("The plain emails currently do not support bulking.")) + _("Legacy ASCII Emails do not support bulking. You can either disable notification " + "bulking or choose another notification plugin which allows bulking.")) def render_notification_rules(rules, userid="", show_title=False, show_buttons=True,

9 years, 11 months

Check_MK Git: check_mk: ups_socomec_out_source: Changed interpretation of states to v6 MIB (for real this time)

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6a04896adc66a67e744a805fc3d246d688989d61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a04896adc66a6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 29 13:35:43 2014 +0100 ups_socomec_out_source: Changed interpretation of states to v6 MIB (for real this time) --- checks/ups_socomec_out_source | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/checks/ups_socomec_out_source b/checks/ups_socomec_out_source index c64e1ca..2fe892a 100644 --- a/checks/ups_socomec_out_source +++ b/checks/ups_socomec_out_source @@ -30,16 +30,31 @@ def inventory_ups_socomec_out_source(info): def check_ups_socomec_out_source(_no_item, _no_params, info): + +# This is from the old (v5.01) MIB and is incompatible with the new one below +# ups_socomec_source_states = { +# 1: (3, "Other"), +# 2: (2, "Offline"), +# 3: (0, "Normal"), +# 4: (1, "Internal Maintenance Bypass"), +# 5: (2, "On battery"), +# 6: (0, "Booster"), +# 7: (0, "Reducer"), +# 8: (0, "Standby"), +# 9: (0, "Eco mode"), +# } + +# This is from the new (v6) MIB ups_socomec_source_states = { - 1: (3, "Other"), - 2: (2, "Offline"), - 3: (0, "Normal"), - 4: (1, "Internal Maintenance Bypass"), - 5: (2, "On battery"), - 6: (0, "Booster"), - 7: (0, "Reducer"), - 8: (0, "Standby"), - 9: (0, "Eco mode"), + 1: (3, "Unknown"), + 2: (2, "On inverter"), + 3: (0, "On mains"), + 4: (0, "Eco mode"), + 5: (1, "On bypass"), + 6: (0, "Standby"), + 7: (1, "On maintenance bypass"), + 8: (2, "UPS off"), + 9: (0, "Normal mode"), } return ups_socomec_source_states[int(info[0][0])]

9 years, 11 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014