Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #1037

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a0af9af62508faf33bbfa45676a750f30b92738f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0af9af62508fa… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Sep 4 10:21:06 2013 +0200 Updated bug entries #1037 --- .bugs/1037 | 1 + 1 file changed, 1 insertion(+) diff --git a/.bugs/1037 b/.bugs/1037 index 4c9999f..461ab1d 100644 --- a/.bugs/1037 +++ b/.bugs/1037 @@ -41,3 +41,4 @@ I have had a number of crashes on this server as the Windows machine is running on a VM server which has had problems, but the currupt logstate.txt file is always 123k in size and looks the same when edited. +2013-08-28: user did supply original logstate.txt file, see feedback/gitbug folder

11 years

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 42a949e60e37a94f625e09b14bf354c0b56c82ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42a949e60e37a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 4 10:08:16 2013 +0200 Updated changelog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 917ecfd..2851764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,9 @@ * "Unchecked Services" view now uses the staleness of services for filtering * Globe dashlets make use of the parameter "id" to make it possible to provide unique ids in the render HTML code to the dashlets + * Multisite can now track wether or not a user is online, this need to be + enabled e.g. via Global Settings in WATO (Save last access times of + users) * Added popup message notification system to make it possible to notify multisite users about various things. It is linked on WATO Users page at the moment. An image will appear for a user in the sidebar footer with

11 years

Check_MK Git: check_mk: Multisite: Added popup window based notifications

by Lars Michelsen

Module: check_mk Branch: master Commit: c05fded22722dc505ba30386dbb17e1b3cc420ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c05fded22722dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 4 10:04:26 2013 +0200 Multisite: Added popup window based notifications --- ChangeLog | 7 + web/htdocs/dashboard.py | 2 - web/htdocs/htmllib.py | 4 +- web/htdocs/images/button_sidebar_messages_hi.png | Bin 0 -> 1533 bytes web/htdocs/images/button_sidebar_messages_lo.png | Bin 0 -> 1544 bytes web/htdocs/index.py | 2 +- web/htdocs/js/checkmk.js | 35 ++++ web/htdocs/js/sidebar.js | 89 +++++++++ web/htdocs/lib.py | 4 +- web/htdocs/notify.py | 224 ++++++++++++++++++++++ web/htdocs/sidebar.css | 34 ++++ web/htdocs/sidebar.py | 30 ++- web/htdocs/userdb.py | 9 +- web/htdocs/valuespec.py | 55 +++++- web/htdocs/wato.py | 2 + web/htdocs/weblib.py | 2 +- web/plugins/config/builtin.py | 15 +- web/plugins/pages/shipped.py | 4 + web/plugins/wato/check_mk_configuration.py | 16 ++ 19 files changed, 508 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c05fded227…

11 years

Check_MK Git: check_mk: host/service globe dashlets take "id"

by Lars Michelsen

as optional parameter now Message-ID: <5225fed5.L0wA/+bBynzWqsrX%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: fb84f83c36634342f452ce60f2adde81391320c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb84f83c366343… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 15:31:48 2013 +0200 host/service globe dashlets take "id" as optional parameter now --- ChangeLog | 2 ++ web/htdocs/dashboard.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f769d86..5279411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,8 @@ only permitted on one child folder, the upper folder is removed from the hierarchy) * "Unchecked Services" view now uses the staleness of services for filtering + * Globe dashlets make use of the parameter "id" to make it possible to + provide unique ids in the render HTML code to the dashlets * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 6469801..b1ea65c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -475,7 +475,7 @@ def dashlet_hoststats(): ] filter = "Filter: custom_variable_names < _REALNAME\n" - render_statistics("hoststats", "hosts", table, filter) + render_statistics(html.var('id', "hoststats"), "hosts", table, filter) def dashlet_servicestats(): table = [ @@ -530,7 +530,7 @@ def dashlet_servicestats(): ] filter = "Filter: host_custom_variable_names < _REALNAME\n" - render_statistics("servicestats", "services", table, filter) + render_statistics(html.var('id', "servicestats"), "services", table, filter) def render_statistics(pie_id, what, table, filter):

11 years

Check_MK Git: check_mk: improved help text for snmp timeout in wato

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ae9c556f9397ebdef37c11989629aa78e8eec873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae9c556f9397eb… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Sep 3 14:44:47 2013 +0200 improved help text for snmp timeout in wato --- web/plugins/wato/check_mk_configuration.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d5e3532..e5f1e03 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1894,7 +1894,8 @@ register_rule(group, ( "timeout", Integer( title = _("Timeout between retries"), - help = _("The default is 1 sec."), + help = _("A request is sent to the SNMP daemon, than wait up to this " + " number of seconds until retrying."), default_value = 1, minvalue = 1, maxvalue = 60,

11 years

Check_MK Git: check_mk: The Check_MK_inventory check can now be ignored based on hosts or

by Götz Golla

Module: check_mk Branch: master Commit: bf6a259fd2664e913a24528c0a11bd8d00d27289 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6a259fd2664e… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Sep 3 14:35:37 2013 +0200 The Check_MK_inventory check can now be ignored based on hosts or host tags with the ignored_services variable, like all other checks --- modules/check_mk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 705c2fc..6d73f42 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1959,7 +1959,8 @@ define service { } """ % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK"))) # Inventory checks - if user has configured them. Not for clusters. - if inventory_check_interval and not is_cluster(hostname): + if inventory_check_interval and not is_cluster(hostname) \ + and not service_ignored(hostname,None,'Check_MK inventory'): outfile.write(""" define service { use\t\t\t\t%s

11 years

Check_MK Git: check_mk: Removed wrong comment

by Lars Michelsen

Module: check_mk Branch: master Commit: dd173c0e8cfdf1704d4eca240a8b00ce842a0b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd173c0e8cfdf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 14:31:16 2013 +0200 Removed wrong comment --- checks/cisco_qos | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index 97bb1f2..b12009c 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -298,7 +298,6 @@ def check_cisco_qos(item, params, info): infotext += ', Policy-Name: %s, Int-Bandwidth: %s' % (policy_name, format_value(bw)) return (state, infotext.lstrip(', '), perfdata) -# General JVM checks check_info["cisco_qos"] = { "service_description" : "QoS %s", "check_function" : check_cisco_qos,

11 years

Check_MK Git: check_mk: Sorting group filters by alias now

by Lars Michelsen

Module: check_mk Branch: master Commit: 4620d5a735fe640927ae07fea3df956fd484351b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4620d5a735fe64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 13:57:23 2013 +0200 Sorting group filters by alias now --- web/plugins/views/filters.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 9e914f1..739dcce 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -112,12 +112,10 @@ declare_filter(102, FilterIPAddress()) # Helper that retrieves the list of host/service/contactgroups via Livestatus +# use alias by default but fallback to name if no alias defined def all_groups(what): groups = dict(html.live.query("GET %sgroups\nColumns: name alias\n" % what)) - names = groups.keys() - names.sort() - # use alias by default but fallback to name if no alias defined - return [ (name, groups[name] or name) for name in names ] + return [ (name, groups[name] or name) for name in groups.keys() ] class FilterGroupCombo(Filter): def __init__(self, what, title, enforce): @@ -137,7 +135,7 @@ class FilterGroupCombo(Filter): choices = all_groups(self.what.split("_")[-1]) if not self.enforce: choices = [("", "")] + choices - html.select(self.htmlvars[0], choices) + html.sorted_select(self.htmlvars[0], choices) if not self.enforce: html.write(" ") html.checkbox(self.htmlvars[1], label=_("negate"))

11 years

Check_MK Git: check_mk: Fixed syntax error in stale handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 56bc1424823c4f7abe6308bf32dd68b5232859e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56bc1424823c4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 13:58:50 2013 +0200 Fixed syntax error in stale handling --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index da9e242..95bb8d0 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -282,7 +282,7 @@ def paint_service_state_short(row): state = "p" name = "PEND" if is_stale(row): - state += " stale" + state = str(state) + " stale" return "state svcstate state%s" % state, name def paint_host_state_short(row): @@ -294,7 +294,7 @@ def paint_host_state_short(row): state = "p" name = "PEND" if is_stale(row): - state += " stale" + state = str(state) + " stale" return "state hstate hstate%s" % state, name multisite_painters["service_nagios_link"] = {

11 years

Check_MK Git: check_mk: HTML notifications: Added time of state change

by Lars Michelsen

Module: check_mk Branch: master Commit: 311d36da1e0d684036a311a81449e5d63fb86f8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=311d36da1e0d68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 2 13:34:25 2013 +0200 HTML notifications: Added time of state change --- ChangeLog | 1 + notifications/mail | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40bb853..969d2c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * HTML notifications: Now adding optional links to host- and service names when second argument notification script is configured to the base url of the monitoring installation (e.g. http://<host>/<site>/ in case of OMD setups) + * HTML notifications: Added time of state change Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/notifications/mail b/notifications/mail index 01bbf08..08b6858 100755 --- a/notifications/mail +++ b/notifications/mail @@ -175,7 +175,7 @@ tmpl_host_txt = ''' Host: $HOSTNAME$ ($HOSTALIAS$) Address: $HOSTADDRESS$ $HOSTLINK$ -State: $LASTHOSTSTATE$ -> $HOSTSTATE$ ($NOTIFICATIONTYPE$) +State: $LASTHOSTSTATE$ -> $HOSTSTATE$ ($NOTIFICATIONTYPE$) since $LASTHOSTSTATECHANGE_REL$ Output: $HOSTOUTPUT$ Perfdata: $HOSTPERFDATA$ $LONGHOSTOUTPUT$ @@ -199,7 +199,11 @@ tmpl_host_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>State</td> - <td class="state hstate">$LASTHOSTSTATE$>/span> → $HOSTSTATE$ ($NOTIFICATIONTYPE$)</td> + <td class="state hstate"> + $LASTHOSTSTATE$>/span> → + $HOSTSTATE$ ($NOTIFICATIONTYPE$) + since $LASTHOSTSTATECHANGE_REL$ + </td> </tr> <tr class="data even0"> <td class="left">Output</td> @@ -219,7 +223,7 @@ Host: $HOSTNAME$ ($HOSTALIAS$) Address: $HOSTADDRESS$$HOSTLINK$ Service: $SERVICEDESC$$SERVICELINK$ -State: $LASTSERVICESTATE$ -> $SERVICESTATE$ ($NOTIFICATIONTYPE$) +State: $LASTSERVICESTATE$ -> $SERVICESTATE$ ($NOTIFICATIONTYPE$) since $LASTSERVICESTATECHANGE_REL$ Output: $SERVICEOUTPUT$ Perfdata: $SERVICEPERFDATA$ $LONGSERVICEOUTPUT$ @@ -247,7 +251,11 @@ tmpl_service_html = tmpl_head_html + ''' </tr> <tr class="data odd0"> <td class=left>State</td> - <td class="state svcstate">$LASTSERVICESTATE$ → $SERVICESTATE$ ($NOTIFICATIONTYPE$)</td> + <td class="state svcstate"> + $LASTSERVICESTATE$ → + $SERVICESTATE$ ($NOTIFICATIONTYPE$) + since $LASTSERVICESTATECHANGE_REL$ + </td> </tr> <tr class="data even0"> <td class="left">Output</td>

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013