Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: FIX: Fixed handling of dashboards without title in sidebar view snapi

by Lars Michelsen

Module: check_mk Branch: master Commit: f690a3e391540b3826bc27c78eb838036e90f50d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f690a3e391540b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 13:25:33 2013 +0200 FIX: Fixed handling of dashboards without title in sidebar view snapi Conflicts: ChangeLog --- ChangeLog | 3 ++- web/plugins/sidebar/shipped.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6de736..deeb54a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< HEAD 1.2.3i1: Core: * Agents can send data for other hosts "piggyback". This is being @@ -115,6 +114,8 @@ * FIX: do not remove directories of non-exisant users anymore. This lead to a deletion of users' settings in case of an external authentication (like mod_ldap). + * FIX: Fixed handling of dashboards without title in sidebar view snapin + WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a warning message when going to throw away the current settings. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f9755d4..1efc109 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -76,7 +76,7 @@ def views_by_topic(): if not view["hidden"] and not view.get("mobile")] # Add all the dashboards to the views list - s += [ (_('Dashboards'), d['title'], d_name) + s += [ (_('Dashboards'), d['title'] and d['title'] or d_name, d_name) for d_name, d in dashboard.dashboards.items() ]

11 years, 2 months

Check_MK Git: check_mk: Added active check to detect flapping services of a host

by Lars Michelsen

Module: check_mk Branch: master Commit: a91ed46f83d8efe2c5f6844cac03cf45f5319b1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a91ed46f83d8ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 12:41:29 2013 +0200 Added active check to detect flapping services of a host --- doc/treasures/check_flapping/check_flapping | 115 +++++++++++++++++++++++++++ doc/treasures/check_flapping/cmk_check | 52 ++++++++++++ doc/treasures/check_flapping/wato_plugin.py | 77 ++++++++++++++++++ 3 files changed, 244 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a91ed46f83…

11 years, 2 months

Check_MK Git: check_mk: g_hostname is now also available in argument_functions of checks

by Lars Michelsen

Module: check_mk Branch: master Commit: bacbd3bb5853029de68e97d0888900b24535472e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bacbd3bb585302… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 12:01:38 2013 +0200 g_hostname is now also available in argument_functions of checks --- modules/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index dceed76..cde68c5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1924,6 +1924,10 @@ define service { if actchecks: outfile.write("\n\n# Active checks\n") for acttype, act_info, params in actchecks: + # Make hostname available as global variable in argument functions + global g_hostname + g_hostname = hostname + has_perfdata = act_info.get('has_perfdata', False) description = act_info["service_description"](params) # compute argument, and quote ! and \ for Nagios

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 5639386cb31700b25d82c58dc0eed4d902ed2a63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5639386cb31700… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 12:41:33 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: f719675a1437e2ee2a5d613393da187dc4272992 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f719675a1437e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 09:47:42 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Added code to disable keybindings

by Lars Michelsen

Module: check_mk Branch: master Commit: a9dca99dc919de73dafc4ab0c39834f1a6bde7e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9dca99dc919de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 09:47:36 2013 +0200 Added code to disable keybindings --- web/htdocs/htmllib.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 943af14..2628705 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -190,6 +190,7 @@ class html: self.have_help = False self.plugged = False self.keybindings = [] + self.keybindings_enabled = True self.io_error = False RETURN = 13 @@ -515,7 +516,7 @@ class html: idtext = " id='%s'" % id else: idtext = "" - self.write('<div%s style="display:%s" class="contextlink%s%s" ' % (idtext, display, hot and " hot" or "", fkey and " button" or "")) + self.write('<div%s style="display:%s" class="contextlink%s%s" ' % (idtext, display, hot and " hot" or "", (fkey and self.keybindings_enabled) and " button" or "")) self.context_button_hover_code(hot and "_hot" or "") self.write('>') self.write('<a href="%s"' % url) @@ -523,7 +524,7 @@ class html: self.write(' title="%s"' % hover_title) if bestof: self.write(' onmousedown="count_context_button(this); document.location=this.href; " ') - if fkey: + if fkey and self.keybindings_enabled: title += '<div class=keysym>F%d</div>' % fkey self.add_keybinding([html.F1 + (fkey - 1)], "document.location='%s';" % url) self.write('>%s</a></div>\n' % title) @@ -935,7 +936,7 @@ class html: def body_end(self): if self.have_help: self.javascript("help_enable();") - if self.keybindings: + if self.keybindings_enabled and self.keybindings: self.javascript("""var keybindings = %r;\n document.body.onkeydown = keybindings_keydown; document.body.onkeyup = keybindings_keyup; @@ -1306,5 +1307,5 @@ document.body.onfocus = keybindings_focus; def add_keybindings(self, bindings): self.keybindings += bindings - - + def disable_keybindings(self): + self.keybindings_enabled = False

11 years, 2 months

Check_MK Git: check_mk: agent_vsphere: ignore unknown (missing) sensors

by Mathias Kettner

Module: check_mk Branch: master Commit: fc24255ae328bbe8433572217d43a558daa8ee8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc24255ae328bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 16:39:00 2013 +0200 agent_vsphere: ignore unknown (missing) sensors --- agents/special/agent_vsphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 49998dc..962fc19 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -343,7 +343,7 @@ def conv_numeric_sensor_info(value): for sensor in value.HostNumericSensorInfo: if not hasattr(sensor, "HealthState"): continue # should never happen. If happens, sensor not interesting for monitoring - if sensor.HealthState.Key == "green": + if (sensor.HealthState.Key == "green") or (sensor.HealthState.Key == "unknown"): continue # just output sensors with issuse - saves lots of data line = '%s;%s;%s;%s;%s;' % ( sensor.Name, sensor.BaseUnits, sensor.CurrentReading, sensor.SensorType, sensor.UnitModifier)

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: bf79f8003300ac83e66207d3e0ccb0379bb6e361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf79f8003300ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 16 16:39:02 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: FIX: Performing regular inventory checks at configured interval even when the service is in problem state

by Lars Michelsen

Module: check_mk Branch: master Commit: 70d435b445efcdf98ab5800286eee0ed20c85bb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70d435b445efcd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 16:23:01 2013 +0200 FIX: Performing regular inventory checks at configured interval even when the service is in problem state --- ChangeLog | 2 ++ modules/check_mk.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a920e57..723d571 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,8 @@ 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios + * FIX: Performing regular inventory checks at configured interval even + when the service is in problem state * Check_MK core now supports umlauts in host-/service- and contactgroup names Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index 351184d..dceed76 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1864,6 +1864,7 @@ define service { use\t\t\t\t%s host_name\t\t\t%s normal_check_interval\t\t%d + retry_check_interval\t\t%d %s service_description\t\tCheck_MK inventory } @@ -1874,7 +1875,7 @@ define servicedependency { dependent_host_name\t\t%s dependent_service_description\tCheck_MK inventory } -""" % (inventory_check_template, hostname, inventory_check_interval, +""" % (inventory_check_template, hostname, inventory_check_interval, inventory_check_interval, extra_service_conf_of(hostname, "Check_MK inventory"), service_dependency_template, hostname, hostname))

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 30663331098fac36334cbd40298cbd46da834786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30663331098fac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 16:24:35 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013