Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64675 discussions

Check_MK Git: check_mk: #1490 FIX Timperiod excludes can now even be configured when creating a timeperiod

by Lars Michelsen

Module: check_mk Branch: master Commit: b9a0fe57be145d16184deda33784111116b3d76f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9a0fe57be145d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 6 12:34:08 2014 +0100 #1490 FIX Timperiod excludes can now even be configured when creating a timeperiod Configuring excludes was only possible when editing a timeperiod. --- .werks/1490 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1490 b/.werks/1490 new file mode 100644 index 0000000..2b6e801 --- /dev/null +++ b/.werks/1490 @@ -0,0 +1,10 @@ +Title: Timperiod excludes can now even be configured when creating a timeperiod +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415273607 + +Configuring excludes was only possible when editing a timeperiod. diff --git a/ChangeLog b/ChangeLog index fcbaae9..55d95d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog * 1489 Added iCalendar import for generating timeperiods e.g. for holidays... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... + * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... Notifications: * 1168 FIX: HTML mails can now be configured to display graphs among each other... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a1de88a..d7b6a65 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9532,7 +9532,7 @@ def mode_edit_timeperiod(phase): # exclude the current timeperiod (in order to avoid cycles) other_tps = [] for tpname, tp in timeperiods.items(): - if not new and not timeperiod_excludes(timeperiods, tpname, name): + if not timeperiod_excludes(timeperiods, tpname, name): other_tps.append((tpname, tp.get("alias") or name)) vs_excl = ListChoice(choices = other_tps)

9 years, 11 months

Check_MK Git: check_mk: #1508 Allow input of plugin output and perfdata when faking check results

by Mathias Kettner

Module: check_mk Branch: master Commit: b4b0596e9b25e8051c4504785d623efa55c1bc25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4b0596e9b25e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 6 13:19:37 2014 +0100 #1508 Allow input of plugin output and perfdata when faking check results The command <i>Fake check results</i> on hosts and services now allows to optionally specify the plugin output and the performance data of the check. It is allowed to leave both new input field empty - then everying behaves like before. The extension now allows to send check results to the monitoring via HTTP. Please refer to the documentation about using Multisite as a webservice (Automation). --- .werks/1508 | 16 ++++++++++++++ ChangeLog | 1 + web/plugins/views/commands.py | 47 ++++++++++++++++++++++++++++++----------- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.werks/1508 b/.werks/1508 new file mode 100644 index 0000000..af9ca18 --- /dev/null +++ b/.werks/1508 @@ -0,0 +1,16 @@ +Title: Allow input of plugin output and perfdata when faking check results +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1415276255 +Class: feature + +The command <i>Fake check results</i> on hosts and services now allows +to optionally specify the plugin output and the performance data of +the check. It is allowed to leave both new input field empty - then +everying behaves like before. + +The extension now allows to send check results to the monitoring +via HTTP. Please refer to the documentation about using Multisite +as a webservice (Automation). diff --git a/ChangeLog b/ChangeLog index 38274fb..0086776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ NOTE: Please refer to the migration notes! Multisite: + * 1508 Allow input of plugin output and perfdata when faking check results... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index dd8a41f..7c8ff69 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -172,10 +172,15 @@ config.declare_permission("action.fakechecks", [ "admin" ]) def command_fake_checks(cmdtag, spec, row): - for s in [0,1,2,3]: + for s in [0, 1, 2, 3]: statename = html.var("_fake_%d" % s) if statename: - pluginoutput = _("Manually set to %s by %s") % (html.attrencode(statename), config.user_id) + pluginoutput = html.var_utf8("_fake_output").strip() + if not pluginoutput: + pluginoutput = _("Manually set to %s by %s") % (html.attrencode(statename), config.user_id) + perfdata = html.var("_fake_perfdata") + if perfdata: + pluginoutput += "|" + perfdata if cmdtag == "SVC": cmdtag = "SERVICE" command = "PROCESS_%s_CHECK_RESULT;%s;%s;%s" % (cmdtag, spec, s, pluginoutput) @@ -183,14 +188,35 @@ def command_fake_checks(cmdtag, spec, row): return command, title +def render_fake_form(what): + html.write("<table><tr><td>") + html.write("%s: " % _("Plugin output")) + html.write("</td><td>") + html.text_input("_fake_output", "", size=50) + html.write("</td></tr><tr><td>") + html.write("%s: " % _("Performance data")) + html.write("</td><td>") + html.text_input("_fake_perfdata", "", size=50) + html.write("</td></tr><tr><td>") + html.write(_("Set to:")) + html.write("</td><td>") + if what == "host": + html.button("_fake_0", _("Up")) + html.button("_fake_1", _("Down")) + html.button("_fake_2", _("Unreachable")) + else: + html.button("_fake_0", _("OK")) + html.button("_fake_1", _("Warning")) + html.button("_fake_2", _("Critical")) + html.button("_fake_3", _("Unknown")) + html.write("</td></tr></table>") + multisite_commands.append({ "tables" : [ "host" ], "permission" : "action.fakechecks", "title" : _("Fake check results"), - "render" : lambda: \ - html.button("_fake_0", _("Up")) == \ - html.button("_fake_1", _("Down")) == \ - html.button("_fake_2", _("Unreachable")), + "group" : _("Fake check results"), + "render" : lambda: render_fake_form("host"), "action" : command_fake_checks, }) @@ -198,11 +224,8 @@ multisite_commands.append({ "tables" : [ "service" ], "permission" : "action.fakechecks", "title" : _("Fake check results"), - "render" : lambda: \ - html.button("_fake_0", _("OK")) == \ - html.button("_fake_1", _("Warning")) == \ - html.button("_fake_2", _("Critical")) == \ - html.button("_fake_3", _("Unknown")), + "group" : _("Fake check results"), + "render" : lambda: render_fake_form("service"), "action" : command_fake_checks, }) @@ -267,7 +290,7 @@ def command_acknowledgement(cmdtag, spec, row): multisite_commands.append({ "tables" : [ "host", "service" ], "permission" : "action.acknowledge", - "title" : _("Acknowledging Problems"), + "title" : _("Acknowledge Problems"), "render" : lambda: \ html.button("_acknowledge", _("Acknowledge")) == \ html.button("_remove_ack", _("Remove Acknowledgement")) == \

9 years, 11 months

Check_MK Git: check_mk: cisco_sensor_item.include: fixed bug

by Bastian Kuhn

Module: check_mk Branch: master Commit: dedb1a37c924556ad7ec96686fc9425ad1d003bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dedb1a37c92455… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 6 11:03:56 2014 +0100 cisco_sensor_item.include: fixed bug --- checks/cisco_sensor_item.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_sensor_item.include b/checks/cisco_sensor_item.include index b188f94..9bdaa18 100644 --- a/checks/cisco_sensor_item.include +++ b/checks/cisco_sensor_item.include @@ -32,7 +32,7 @@ def cisco_sensor_item(trial_string, fall_back): # -> Depends on the device model try: # Try to handle all cases found in mkzeug/walks - splited = [ x.strip for x in trial_string.split(',')] + splited = [ x.strip() for x in trial_string.split(',')] if len(splited) == 1: item = trial_string # If the last part contains # or Power, take the complete string

9 years, 11 months

Check_MK Git: check_mk: hwg_temp: Fixed inventory function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 07a0ff781a3aaa4cfb96c0dab0e8333b725ec541 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07a0ff781a3aaa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 6 09:27:01 2014 +0100 hwg_temp: Fixed inventory function --- checks/hwg_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index e397a76..7abeed6 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -30,7 +30,7 @@ hwg_temp_defaultlevels = (23, 25) def inventory_hwg_temp(info): return [ (line[0], "hwg_temp_defaultlevels") for line in info - if int(line[2]) != 0 and line[5] in ["1", "2", "3"] ] + if int(line[2]) != 0 and line[4] in ["1", "2", "3"] ] def check_hwg_temp(item, params, info):

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1010, #1011

by Goetz Golla

Module: check_mk Branch: master Commit: 709c57c14c970a86892b30ea8039176661bfcfb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=709c57c14c970a… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Nov 5 22:52:34 2014 +0100 Updated bug entries #1010, #1011 --- .bugs/1010 | 8 ++++++++ .bugs/1011 | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/.bugs/1010 b/.bugs/1010 new file mode 100644 index 0000000..2495a4b --- /dev/null +++ b/.bugs/1010 @@ -0,0 +1,8 @@ +Title: wato global settings, empty line +Component: wato +State: open +Date: 2014-11-05 22:34:21 +Targetversion: future +Class: bug + +in global settings - configuration gui (wato) there is an empty line which can be switched ON or OFF diff --git a/.bugs/1011 b/.bugs/1011 new file mode 100644 index 0000000..acb15f4 --- /dev/null +++ b/.bugs/1011 @@ -0,0 +1,10 @@ +Title: mention name and path of logfiles whereever logging can be configured in wato +Component: wato +State: open +Date: 2014-11-05 22:49:22 +Targetversion: future +Class: nastiness + +logging behaviour can be configured in several places in wato (e.g. global settings), however it is neven mentioned where the actual logfiles can be found, and +paths are not at all intuitive. It would be of great benefit to the users to +mention the location of the log whenever logging behaviour can be configured.

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1009

by Goetz Golla

Module: check_mk Branch: master Commit: c867f1539a2629093e505170c7bd5e05e522a61c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c867f1539a2629… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Nov 5 22:15:55 2014 +0100 Updated bug entries #1009 --- .bugs/1009 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1009 b/.bugs/1009 new file mode 100644 index 0000000..3d80416 --- /dev/null +++ b/.bugs/1009 @@ -0,0 +1,9 @@ +Title: quicksearch: combining host and service search no longer works +Component: multisite +State: open +Date: 2014-11-05 22:13:21 +Targetversion: future +Class: bug + +a search for services with 's: ' combined with a search for hosts with 'h: ...' always returns +ALL hosts with the selected services, not only the selected services on the selected hosts.

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1008

by Goetz Golla

Module: check_mk Branch: master Commit: 02f5dd0eb3ca7b64beb12761880bea3aeafdb1bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02f5dd0eb3ca7b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Nov 5 21:40:59 2014 +0100 Updated bug entries #1008 --- .bugs/1008 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.bugs/1008 b/.bugs/1008 new file mode 100644 index 0000000..0496e6e --- /dev/null +++ b/.bugs/1008 @@ -0,0 +1,36 @@ +Title: dashboards: dashboard of a single hostgroup cannot be edited +Component: multisite +State: open +Date: 2014-11-05 21:35:53 +Targetversion: future +Class: bug + +after creating a dashboard for a single hostgroup, saving it and editing it +again, the following traceback occurs at the and and the dashboard cannot +be saved anymore: + +Host.................................................................................................... + + +'<_mp_4b5390f655da935e047f992c2528b461.FilterGroupCombo instance at 0x7f978d509518>, hostgroup' + +Internal error: 'unicode' object has no attribute 'get' + +Traceback (most recent call last): + File "/omd/sites/heute/share/check_mk/web/htdocs/index.py", line 241, in handler + handler() + File "/omd/sites/heute/share/check_mk/web/htdocs/dashboard.py", line 650, in page_edit_dashboard + custom_field_handler = custom_field_handler + File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 723, in page_edit_visual + render_context_specs(visual, context_specs) + File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 496, in render_context_specs + spec.render_input(ident, value) + File "/omd/sites/heute/share/check_mk/web/htdocs/valuespec.py", line 981, in render_input + render_content() + File "/omd/sites/heute/share/check_mk/web/htdocs/valuespec.py", line 968, in render_content + vs.render_input(prefix, value.get(ident)) + File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 1034, in render_input + self._filter.set_value(value) + File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 854, in set_value + html.set_var(varname, value.get(varname)) +AttributeError: 'unicode' object has no attribute 'get'

9 years, 11 months

Check_MK Git: check_mk: cisco_temp_perf: Modified scan function so check works alongside cisco_temp_sensor. Can lead to duplications in some cases.

by Konstantin Büttner

Module: check_mk Branch: master Commit: a54bb25aae6fd6e8eab223ac5c2870fd0d941c3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a54bb25aae6fd6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 5 18:05:58 2014 +0100 cisco_temp_perf: Modified scan function so check works alongside cisco_temp_sensor. Can lead to duplications in some cases. --- checks/cisco_temp_perf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 4aadd5d..8547190 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -92,8 +92,7 @@ check_info['cisco_temp_perf'] = { "has_perfdata" : True, "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ - oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, + oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None, "snmp_info" : ( ".1.3.6.1.4.1.9.9.13.1.3.1", [2, 3, 4, 6, OID_END ] ), # CISCO-SMI "group" : "temperature_auto",

9 years, 11 months

Check_MK Git: check_mk: cisco_temp_perf: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 058a203d9ad4b49ce8764699a43f0a2662aca7be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=058a203d9ad4b4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 5 16:52:14 2014 +0100 cisco_temp_perf: Minor code cleanup --- checks/cisco_temp_perf | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index de9cff2..4aadd5d 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -56,7 +56,6 @@ cisco_temp_perf_envmon_states = { } def inventory_cisco_temp_perf(info): - inventory = [] for line in info: yield cisco_sensor_item(line[0], line[4]), None

9 years, 11 months

Check_MK Git: check_mk: #1488 FIX Fixed wrong information showing up on " Host Group" and "Service Group" views

by Lars Michelsen

Module: check_mk Branch: master Commit: e97688a14cb8fb66287e26da54d72ede20667c1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e97688a14cb8fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 16:15:26 2014 +0100 #1488 FIX Fixed wrong information showing up on "Host Group" and "Service Group" views The views with the names hostgroup and servicegroup which are linked from several pages like the host group summary view when clicking on the name of a group showed hosts or services multiple times instead of once. This has been fixed now. If you used a link to access these views directly, you will need to re-create them, because the names of the URL variables changed. --- .werks/1488 | 15 ++++++ ChangeLog | 1 + web/htdocs/views.py | 8 +++- web/htdocs/visuals.py | 5 ++ web/plugins/views/builtin.py | 12 ++--- web/plugins/views/datasources.py | 4 +- web/plugins/visuals/filters.py | 96 ++++++++++++++++++++++++-------------- web/plugins/visuals/infos.py | 17 ++----- 8 files changed, 100 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e97688a14c…

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits