Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Do sort all BI views after BI name

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50c302cbd7fcdf6ca54ff9450a63afd0c0e9c4fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c302cbd7fcdf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:45:01 2012 +0200 Do sort all BI views after BI name --- ChangeLog | 1 + web/plugins/views/builtin.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b36df8..dcc4e03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * Avoid duplicate rule incarnations when using FOREACH_* * BI Boxes: allow closing boxes (not yet persisted) * New filter for services (not) contained in any aggregate + * Configure sorting for all BI views Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index d567fb8..d634985 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2042,7 +2042,7 @@ multisite_builtin_views.update({ 'aggr_output', 'aggr_assumed_state', 'aggr_effective_state'], - 'sorters': [], + 'sorters': [ ('aggr_group', False), ('aggr_name', False) ], 'title': _('All Aggregations'), 'topic': _('Business Intelligence')}, @@ -2095,7 +2095,7 @@ multisite_builtin_views.update({ 'aggr_output', 'aggr_assumed_state', 'aggr_effective_state'], - 'sorters': [], + 'sorters': [ ('aggr_name', False) ], 'title': _('Aggregation group'), 'topic': _('Business Intelligence')}, @@ -2189,7 +2189,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': [], - 'sorters': [], + 'sorters': [ ('aggr_name', False) ], 'title': _('Single-Host Aggregations of Host'), 'topic': _('Other')}, @@ -2239,7 +2239,7 @@ multisite_builtin_views.update({ 'aggr_output', 'aggr_assumed_state', 'aggr_effective_state'], - 'sorters': [], + 'sorters': [ ('aggr_name', False) ], 'title': _('Aggregations Affected by Host'), 'topic': _('Business Intelligence')}, @@ -2289,7 +2289,7 @@ multisite_builtin_views.update({ 'aggr_output', 'aggr_assumed_state', 'aggr_effective_state'], - 'sorters': [], + 'sorters': [ ('aggr_name', False) ], 'title': _('Aggregations Affected by Service'), 'topic': _('Business Intelligence')}, @@ -2342,7 +2342,7 @@ multisite_builtin_views.update({ 'aggr_output', 'aggr_assumed_state', 'aggr_effective_state'], - 'sorters': [], + 'sorters': [ ('aggr_group', False), ('aggr_name', False)], 'title': _('Problem Aggregations'), 'topic': _('Business Intelligence')}, @@ -2409,7 +2409,7 @@ multisite_builtin_views.update({ 'hostregex', 'opthostgroup', 'aggr_effective_state'], - 'sorters': [('site_host', False)], + 'sorters': [('aggr_group'), ('site_host', False)], 'title': 'Single-Host Problems', 'topic': _('Business Intelligence')}, @@ -2530,7 +2530,7 @@ multisite_builtin_views.update({ ], 'play_sounds': False, 'public': True, - 'show_filters': ['aggr_group', 'hostregex' ], + 'show_filters': [ 'siteopt', 'hostregex', 'aggr_group' ], 'sorters': [('site', False), ('site_host', False)], 'title': _('Hostgroup with BI state'), 'topic': _('hidden')},

12 years, 3 months

Check_MK Git: check_mk: BI Boxes: allow closing boxes (not yet persisted)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f2bc309d1c5f2416834cad324a0ac2980196d9da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2bc309d1c5f24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:36:36 2012 +0200 BI Boxes: allow closing boxes (not yet persisted) --- ChangeLog | 1 + web/htdocs/js/bi.js | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 829312d..63a8e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * New sorter for aggregation group * FIX: fix sorting of Single-Host Aggregations after group * Avoid duplicate rule incarnations when using FOREACH_* + * BI Boxes: allow closing boxes (not yet persisted) Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 7e552ba..419af9b 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -43,7 +43,17 @@ function toggle_subtree(oImg) function toggle_bi_box(oDiv) { - oDiv.style.display = "none"; + // oDiv.style.display = "none"; + if (oDiv.style.borderStyle != "dashed") { + oDiv.style.boxShadow = "none"; + oDiv.style.borderStyle = "dashed"; + oDiv.style.BiBoxHidden = true; + } + else { + oDiv.style.boxShadow = "1px 1px 3px #000"; + oDiv.style.borderStyle = "solid"; + oDiv.style.BiBoxHidden = false; + } // find child nodes that belong to this node var found = 0; @@ -54,7 +64,10 @@ function toggle_bi_box(oDiv) else if (found == 1) found ++; else if (found) { - onode.style.display = ""; + if (onode.style.display) + onode.style.display = ""; + else + onode.style.display = "none"; return; } }

12 years, 3 months

Check_MK Git: check_mk: Remove debug code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cdd13da789f5b6d0dd5b932bce456cc88cbbbb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cdd13da789f5b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:42:13 2012 +0200 Remove debug code --- web/plugins/sidebar/search.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index f81f157..40ba14a 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -67,7 +67,6 @@ def render_searchform(): try: import json data = html.live.query("GET hosts\nColumns: name\n") - html.debug(data) html.write("aSearchHosts = %s;\n" % json.dumps(data)) data = sort_data(html.live.query("GET hostgroups\nColumns: name\n")) html.write("aSearchHostgroups = %s;\n" % json.dumps(data))

12 years, 3 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: a7f26983aa684a43d1a0d975d5df995ebdeb5d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f26983aa684a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 19:47:41 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: New filter for services (not) contained in any aggregate

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84f1f627a86fc94c8be592ff13e477479b84b59e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f1f627a86fc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:44:07 2012 +0200 New filter for services (not) contained in any aggregate --- ChangeLog | 1 + web/plugins/views/builtin.py | 3 ++- web/plugins/views/filters.py | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00a348e..8b36df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * FIX: fix sorting of Single-Host Aggregations after group * Avoid duplicate rule incarnations when using FOREACH_* * BI Boxes: allow closing boxes (not yet persisted) + * New filter for services (not) contained in any aggregate Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 18ef366..d567fb8 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1020,7 +1020,8 @@ multisite_builtin_views.update({ 'service_is_flapping', 'svc_last_state_change', 'svc_last_check', - 'siteopt'], + 'siteopt', + 'aggr_service_used'], 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 723aa03..549be57 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -541,3 +541,25 @@ class FilterLogState(Filter): return "".join(headers) + ("Or: %d\n" % len(headers)) declare_filter(270, FilterLogState()) + +class BIServiceIsUsedFilter(FilterTristate): + def __init__(self): + FilterTristate.__init__(self, "aggr_service_used", _("Used in BI aggregate"), "service", None) + + def filter(self, infoname): + return "" + + def filter_table(self, rows): + current = self.tristate_value() + if current == -1: + return rows + new_rows = [] + for row in rows: + is_part = bi.is_part_of_aggregation( + "service", row["site"], row["host_name"], row["service_description"]) + if (is_part and current == 1) or \ + (not is_part and current == 0): + new_rows.append(row) + return new_rows + +declare_filter(300, BIServiceIsUsedFilter())

12 years, 3 months

Check_MK Git: check_mk: Removed debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91292d767c5b7b698e61b809b96d8f40f1654d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91292d767c5b7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 16:19:49 2012 +0200 Removed debug output --- web/plugins/sidebar/search.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index f81f157..40ba14a 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -67,7 +67,6 @@ def render_searchform(): try: import json data = html.live.query("GET hosts\nColumns: name\n") - html.debug(data) html.write("aSearchHosts = %s;\n" % json.dumps(data)) data = sort_data(html.live.query("GET hostgroups\nColumns: name\n")) html.write("aSearchHostgroups = %s;\n" % json.dumps(data))

12 years, 3 months

Check_MK Git: check_mk: FIX: Cluster host checks were UNKNOWN all the time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b649d8d74b5c1b6b32e40d65d4d76e1e89c1f32e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b649d8d74b5c1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 16:05:40 2012 +0200 FIX: Cluster host checks were UNKNOWN all the time --- ChangeLog | 3 +++ modules/check_mk.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5511bc..52b357d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0b2: + Core: + * FIX: Cluster host checks were UNKNOWN all the time + WATO: * Added new permission "move hosts" to allow/deny moving of hosts in WATO * Also write out contact definitions for users without contactgroups to diff --git a/modules/check_mk.py b/modules/check_mk.py index b022c49..535674d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1457,7 +1457,7 @@ def create_nagios_hostdefs(outfile, hostname): try: ip = lookup_ipaddress(hostname) except: - if not is_cluster(hostname): + if not is_clust: raise MKGeneralException("Cannot determine ip address of %s. Please add to ipaddresses." % hostname) ip = None @@ -1479,7 +1479,7 @@ def create_nagios_hostdefs(outfile, hostname): if is_clust and ip: # Do check cluster IP address if one is there outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args) elif ping_args and is_clust: # use check_icmp in cluster mode - outfile.write(" check_command\t\t\tcheck-mk-ping-cluster!%s\n" % args) + outfile.write(" check_command\t\t\tcheck-mk-ping-cluster!%s\n" % ping_args) elif ping_args: # use special arguments outfile.write(" check_command\t\t\tcheck-mk-ping!%s\n" % ping_args)

12 years, 3 months

Check_MK Git: check_mk: Renamed service check output filter to fit the short title of the service output painter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 12684ab20617743b9759a5aeda784e094135a466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12684ab2061774… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 13:45:51 2012 +0200 Renamed service check output filter to fit the short title of the service output painter --- web/plugins/views/filters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 723aa03..bc5f8ad 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -71,7 +71,7 @@ declare_filter(100, FilterText("servicegroupname", _("Servicegroup"), "service declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup"), "servicegroup", "servicegroup_name", "servicegroup_name", "~~"), _("Search field allowing regular expression and partial matches")) -declare_filter(202, FilterText("output", _("Service check output"), "service", "service_plugin_output", "service_output", "~~")) +declare_filter(202, FilterText("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~"))

12 years, 3 months

Check_MK Git: check_mk: FIX: Group filters can handle groups without aliases now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de1774d9f86ffcbe1674867b4531573bf1b886da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1774d9f86ffc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 14:36:14 2012 +0200 FIX: Group filters can handle groups without aliases now --- ChangeLog | 1 + web/plugins/views/filters.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51d510c..f5511bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * FIX: Oracle checks try to handle ORA-* errors reported by the agent All oracle checks will return UNKNOWN when finding an ORA-* message * FIX: filesystem levels set via WATO didn't work, but do now + * FIX: Group filters can handle groups without aliases now 1.2.0b1: Core, Setup, etc.: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index bc5f8ad..728a8da 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -80,7 +80,8 @@ def all_groups(what): groups = dict(html.live.query("GET %sgroups\nColumns: name alias\n" % what)) names = groups.keys() names.sort() - return [ (name, groups[name]) for name in names ] + # use alias by default but fallback to name if no alias defined + return [ (name, groups[name] or name) for name in names ] class FilterGroupCombo(Filter): def __init__(self, what, title, enforce):

12 years, 3 months

Check_MK Git: check_mk: Fixed javascript error in firefox when switching pages while an ajax call is being processed

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f2d60d4b58b00fe97d25cfbe96de6af9d178951e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2d60d4b58b00f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 10:58:01 2012 +0200 Fixed javascript error in firefox when switching pages while an ajax call is being processed --- web/htdocs/js/checkmk.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index ec8fe90..b7c14fe 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -123,7 +123,7 @@ function get_url(url, handler, data, errorHandler) { AJAX.open("GET", url + dyn, true); if (typeof handler === 'function') AJAX.onreadystatechange = function() { - if (AJAX.readyState == 4) + if (AJAX && AJAX.readyState == 4) { if (AJAX.status == 200) { handler(data, AJAX.responseText); } @@ -141,6 +141,7 @@ function get_url(url, handler, data, errorHandler) { if (typeof errorHandler !== 'undefined') errorHandler(data, AJAX.status); } + } } AJAX.send(null); return true;

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012