Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: WATO: introduce main rule overview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f9be6c4286c3edd10212fa3a5c04df4aa902235 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f9be6c4286c3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 9 14:09:22 2012 +0200 WATO: introduce main rule overview --- web/htdocs/wato.css | 2 +- web/htdocs/wato.py | 82 +++++++++++++++++++++++----- web/plugins/wato/builtin_modules.py | 3 +- web/plugins/wato/check_mk_configuration.py | 20 ++++++-- web/plugins/wato/check_parameters.py | 75 ++++++++++++++++++++++--- 5 files changed, 153 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f9be6c428…

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0673

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b3fe6b5f9bce4fc97aaf0e0132ec3f95b04d6aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b3fe6b5f9bce4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 8 11:02:33 2012 +0200 Updated bug entries #0673 --- .bugs/673 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/673 b/.bugs/673 new file mode 100644 index 0000000..5c63269 --- /dev/null +++ b/.bugs/673 @@ -0,0 +1,12 @@ +Title: Service details view should not show Filter tab +Component: multisite +State: open +Date: 2012-04-08 11:01:32 +Targetversion: 1.2.0 +Class: nastiness + +No filter is being shown, but the filter tab is there +and a search button. + +The reason is probably that one filter is there (the +WATO path filter?) but is not being displayed?

12 years, 5 months

Check_MK Git: check_mk: Further smaller layout improvements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f2b6a6e91a63a7e6aec4e135b78733d11588ae62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2b6a6e91a63a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 16:03:55 2012 +0200 Further smaller layout improvements --- web/htdocs/check_mk.css | 4 +- web/htdocs/pages.css | 50 +++++++++++++++----------- web/htdocs/views.css | 49 ++++++-------------------- web/htdocs/views.py | 53 ++++++++++++++++------------ web/htdocs/wato.css | 33 +++++++---------- web/htdocs/wato.py | 1 + web/plugins/wato/check_mk_configuration.py | 2 +- 7 files changed, 88 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f2b6a6e91a…

12 years, 5 months

Check_MK Git: check_mk: WATO: make reschedule_timeout configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1c3a5519791c6273534d7ade16afcadde1d0e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c3a5519791c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:36:24 2012 +0200 WATO: make reschedule_timeout configurable --- web/plugins/wato/check_mk_configuration.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 1f296d2..f246f0f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -183,6 +183,19 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "reschedule_timeout", + Float(title = _("Timeout for rescheduling checks in Multisite"), + help = _("When you reschedule a check by clicking on the "arrow"-icon " + "then Multisite will use this number of seconds as a timeout. If the " + "monitoring core has not executed the check within this time, an error " + "will be displayed and the page not reloaded."), + minvalue = 1.0, + default_value = 10.0, + unit = "sec", + display_format = "%.1f sec"), + domain = "multisite") + +register_configvar(group, "wato_activation_method", DropdownChoice( title = _("Wato restart mode for Nagios"),

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0689

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e52cf3c226d60e9df0299d22c2083389483a5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e52cf3c226d60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:26:09 2012 +0200 Updated bug entries #0689 --- .bugs/689 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/689 b/.bugs/689 index abe4ba1..15ad3e4 100644 --- a/.bugs/689 +++ b/.bugs/689 @@ -1,10 +1,14 @@ Title: BI nodes must not use the label of the aggregation for the node id Component: bi -State: open +Class: bug +State: works4me Date: 2012-03-21 11:24:20 Targetversion: 1.2.0 -Class: bug At the moment the aggregation label is used for the html node id without any escaping or similar. Labels like this "Host <a href=\"view.py?view_name=hoststatus&site=&host=$HOST$\">$HOST$</a>" will destroy the bi page but should really be possible. + +2012-04-06 11:26:05: changed state open -> works4me +The label should not be used for HTML hacks. We'd rather invent +some general method of adding custom data into the BI tree view.

12 years, 5 months

Check_MK Git: check_mk: Fixed styling of buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d9830c5679e0a19a7393841d3321ebb421c2a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d9830c5679e0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:22:27 2012 +0200 Fixed styling of buttons --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 79b5d33..094e1b8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -144,7 +144,7 @@ label.image_button input { border: none; padding-left: 0px; padding-right: 10px; - padding-top: 0px; + padding-top: 2px; padding-bottom: 0px; background: transparent url('images/image_button_r.png') no-repeat; background-position: right -35px;

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0672

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cbf044e2fcd55fe88ad529cef07581a5987ce14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cbf044e2fcd55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:24:08 2012 +0200 Updated bug entries #0672 --- .bugs/672 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/672 b/.bugs/672 new file mode 100644 index 0000000..d175e8c --- /dev/null +++ b/.bugs/672 @@ -0,0 +1,10 @@ +Title: Commands with checkboxes -> Request-URI Too Large +Component: multisite +State: open +Date: 2012-04-06 11:23:12 +Targetversion: 1.2.0 +Class: bug + +When you use checkboxes for selecting many items in a host +or service view and then issue a command, then the request +URI will be too long. Can we convert this to a POST request?

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55d4ce1cfddbdad86ebf8b9d94c9c47e5f171881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55d4ce1cfddbda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:24:10 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Make commands more flexible internally

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71429aa45e18ba5c3e0808061636f913c7be1fc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71429aa45e18ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:22:50 2012 +0200 Make commands more flexible internally --- web/htdocs/views.py | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1f7d9af..5af94f1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2020,20 +2020,23 @@ def core_command(what, row): spec = "%s;%s" % (host, descr) cmdtag = "SVC" prefix = "service_" - elif what in [ "comment", "downtime" ]: + else: spec = row.get(what + "_id") if descr: cmdtag = "SVC" else: cmdtag = "HOST" - else: - raise MKInternalError(_("Sorry, no actions possible on table %s") % tablename) commands = None + # Call all command actions. The first one that detects + # itself to be executed (by examining the HTML variables) + # will return a command to execute and a title for the + # confirmation dialog. for cmd in multisite_commands: if config.may(cmd["permission"]): result = cmd["action"](cmdtag, spec, row) if result: + executor = cmd.get("executor", command_executor_livestatus) commands, title = result break @@ -2043,10 +2046,13 @@ def core_command(what, row): # Some commands return lists of complete command lines, others # just return one basic command without timestamp. Convert those if type(commands) != list: - commands = ["[%d] %s\n" % (int(time.time()), commands)] + commands = [commands] + + return commands, title, executor - return commands, title +def command_executor_livestatus(command, site): + html.live.command("[%d] %s" % (int(time.time()), command), site) # Returns: # True -> Actions have been done @@ -2064,18 +2070,18 @@ def do_actions(view, what, action_rows, backurl): return False # no actions done command = None - title = core_command(what, action_rows[0])[1] # just get the title + title, executor = core_command(what, action_rows[0])[1:3] # just get the title and executor if not html.confirm(_("Do you really want to %s the following %d %ss?") % (title, len(action_rows), what)): return False count = 0 for row in action_rows: - nagios_commands, title = core_command(what, row) + nagios_commands, title, executor = core_command(what, row) for command in nagios_commands: if type(command) == unicode: command = command.encode("utf-8") - html.live.command(command, row["site"]) + executor(command, row["site"]) count += 1 if command:

12 years, 5 months

Check_MK Git: check_mk: fsc_subsystem cosmetic change. Thanks to Christoph Roeder

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a9ba976f8a0506bef6f0a4e78671eff1e850887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a9ba976f8a050… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 5 15:41:21 2012 +0200 fsc_subsystem cosmetic change. Thanks to Christoph Roeder --- checks/fsc_subsystems | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/fsc_subsystems b/checks/fsc_subsystems index 81d7c6d..c6ae5b3 100644 --- a/checks/fsc_subsystems +++ b/checks/fsc_subsystems @@ -42,7 +42,7 @@ def check_fsc_subsystems(item, params, info): else: return (3, "UNKNOWN - unknown status %d" % status) - return (3, "UNKNOWN - FAN %s not found in SNMP data" % item) + return (3, "UNKNOWN - Subsystem %s not found in SNMP data" % item) check_info['fsc_subsystems'] = (check_fsc_subsystems, "FSC %s", 0, inventory_fsc_subsystems) snmp_info['fsc_subsystems'] = ( ".1.3.6.1.4.1.231.2.10.2.11.3.1.1", [ 2, 3 ])

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012