Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Updated bug entries #0671

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c56da99bc48b9a9201b8894197b5d599ab3c5e9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c56da99bc48b9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 30 16:13:07 2012 +0200 Updated bug entries #0671 --- .bugs/671 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/671 b/.bugs/671 new file mode 100644 index 0000000..d27a46e --- /dev/null +++ b/.bugs/671 @@ -0,0 +1,9 @@ +Title: Quicksearch: search for IP addresses +Component: multisite +State: open +Date: 2012-03-30 16:12:34 +Targetversion: future +Class: feature + +In Quicksearch it should be possible to search for +IP addresses (and find hosts).

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0670

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3456a367e0b179d6bc094a8b2c662d5e0ccbbcf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3456a367e0b179… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 30 08:43:53 2012 +0200 Updated bug entries #0670 --- .bugs/670 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/670 b/.bugs/670 index 6424e7b..f5b79f4 100644 --- a/.bugs/670 +++ b/.bugs/670 @@ -18,3 +18,16 @@ Output: OK - no unchecked services found Perfdata: OK -> OK is not good.... + +Another case: + +Host: Eiger +Alias: Eiger +Address: 127.0.0.1 +Service: Build_State_centos60-32 +State: CRITICAL -> CRITICAL +Command: check_mk-local +Output: CRITICAL: Build problem. State: error, last update: 2012-03-30 02:27:11.000000000 +0200 +Perfdata: + +

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0670

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27f16dba86de6039f0d35fe6b28db7809fe01130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27f16dba86de60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 30 08:41:35 2012 +0200 Updated bug entries #0670 --- .bugs/670 | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/670 b/.bugs/670 new file mode 100644 index 0000000..6424e7b --- /dev/null +++ b/.bugs/670 @@ -0,0 +1,20 @@ +Title: Notification emails do not handle flapping nicely +Component: core +State: open +Date: 2012-03-30 08:39:31 +Targetversion: 1.2.0 +Class: nastiness + +The notifications that are sent because of flapping +should better display this. Currently it is like this: + +Host: nagios +Alias: nagios +Address: 127.0.0.1 +Service: Check_MK inventory +State: OK -> OK +Command: check-mk-inventory +Output: OK - no unchecked services found +Perfdata: + +OK -> OK is not good....

12 years, 2 months

Check_MK Git: check_mk: Add filter to BI Boxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17eff7eed40169bf0b970a8e4e93bfb2cd12514b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17eff7eed40169… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 11:19:32 2012 +0200 Add filter to BI Boxes --- web/plugins/views/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index db8f6e9..18ef366 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2529,7 +2529,7 @@ multisite_builtin_views.update({ ], 'play_sounds': False, 'public': True, - 'show_filters': [], + 'show_filters': ['aggr_group', 'hostregex' ], 'sorters': [('site', False), ('site_host', False)], 'title': _('Hostgroup with BI state'), 'topic': _('hidden')},

12 years, 2 months

Check_MK Git: check_mk: New configuration parameter page_heading for the HTML page heads

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73cebda12fcfc71253f4192adbc73255071a6cb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73cebda12fcfc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:34:13 2012 +0200 New configuration parameter page_heading for the HTML page heads --- ChangeLog | 2 ++ web/htdocs/config.py | 3 +++ web/htdocs/main.py | 11 ++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d5262a..829312d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * Quicksearch: display site name if more than one different site is present in the current search result list * FIX: Fixed encoding problem in "custom notification" message + * New configuration parameter page_heading for the HTML page heads + of the main frameset (%s will be replaced with OMD site name) BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 9e88fdf..abcb965 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -577,6 +577,9 @@ custom_style_sheet = None # URL for start page in main frame (welcome page) start_url = "dashboard.py" +# Page heading for main frame set +page_heading = "Check_MK %s" + # Timeout for rescheduling of host- and servicechecks reschedule_timeout = 10.0 diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 69dcc53..4e0be86 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -24,16 +24,21 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config +import defaults, config def page_index(): start_url = html.var("start_url", config.start_url) html.req.headers_out.add("Cache-Control", "max-age=7200, public"); + if "%s" in config.page_heading: + heading = config.page_heading % (defaults.omd_site or "Multisite") + else: + heading = config.page_heading + html.write(""" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> <html> <head> - <title>Check_MK Multisite</title> + <title>%s</title> <link rel="shortcut icon" href="images/favicon.ico" type="image/ico"> </head> <frameset cols="280,*" frameborder="0" framespacing="0" border="0"> @@ -41,7 +46,7 @@ def page_index(): <frame src="%s" name="main" noresize> </frameset> </html> -""" % start_url) +""" % (heading, start_url)) def page_main(): html.header("Check_MK Multisite")

12 years, 2 months

Check_MK Git: check_mk: BI: Avoid duplicate rule incarnations when using FOREACH_*

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6c81447bf842d0341d4e898247cc657d0e6ec5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6c81447bf842d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:32:34 2012 +0200 BI: Avoid duplicate rule incarnations when using FOREACH_* --- ChangeLog | 1 + web/htdocs/bi.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8dcab1..3d5262a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * FIX: Fixed filtering of Single-Host Aggregations * New sorter for aggregation group * FIX: fix sorting of Single-Host Aggregations after group + * Avoid duplicate rule incarnations when using FOREACH_* Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 2241acf..943d3be 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -245,9 +245,12 @@ def compile_rule_node(calllist, lvl): if calllist[0] in [ config.FOREACH_HOST, config.FOREACH_SERVICE ]: matches = find_matching_services(calllist[0], calllist[1:]) new_elements = [] + handled_args = set([]) # avoid duplicate rule incarnations for match in matches: args = [ substitute_matches(a, match) for a in arglist ] - new_elements += compile_aggregation_rule(rule, args, lvl) + if tuple(args) not in handled_args: + new_elements += compile_aggregation_rule(rule, args, lvl) + handled_args.add(tuple(args)) return new_elements else: @@ -474,9 +477,12 @@ def compile_aggregation_rule(rule, args, lvl = 0): # 2: (['waage'], '(.*)') matches = find_matching_services(config.FOREACH_HOST, node[1:-2]) new_elements = [] + handled_args = set([]) # avoid duplicate rule incarnations for match in matches: arginfo = {'HOST': match[0]} - new_elements += compile_leaf_node(subst_vars(node[-2], arginfo), subst_vars(node[-1], arginfo)) + if tuple(args) not in handled_args: + new_elements += compile_leaf_node(subst_vars(node[-2], arginfo), subst_vars(node[-1], arginfo)) + handled_args.add(tuple(args)) host_name, service_description = node[-2:] else:

12 years, 2 months

Check_MK Git: check_mk: FIX: fix filtering/ sorting in Single-Host Aggregations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6b23772ffea99a5ed6b39dfd293ce1410c6e3bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b23772ffea99a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 11:14:01 2012 +0200 FIX: fix filtering/sorting in Single-Host Aggregations --- ChangeLog | 5 +++++ web/plugins/views/builtin.py | 4 ++-- web/plugins/views/sorters.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9112083..e8dcab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,11 @@ is present in the current search result list * FIX: Fixed encoding problem in "custom notification" message + BI + * FIX: Fixed filtering of Single-Host Aggregations + * New sorter for aggregation group + * FIX: fix sorting of Single-Host Aggregations after group + Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception * FIX: Oracle checks try to handle ORA-* errors reported by the agent diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e0ef94d..db8f6e9 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2108,7 +2108,7 @@ multisite_builtin_views.update({ 'hard_filters': ['summary_host'], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '-1'), ('aggr_name', ''), - ('aggr_group', 'Hosts'), + ('aggr_group', ''), ('birs0', 'on'), ('birs1', 'on'), ('birs2', 'on'), @@ -2161,7 +2161,7 @@ multisite_builtin_views.update({ 'hostregex', 'opthostgroup', 'aggr_effective_state'], - 'sorters': [('site_host', False)], + 'sorters': [('aggr_group', False), ('site_host', False)], 'title': _('Single-Host Aggregations'), 'topic': _('Business Intelligence')}, diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 67ae2ca..02a579e 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -338,3 +338,4 @@ declare_simple_sorter("alerts_problem", _("Number of problem alerts"), "alerts # Aggregations declare_simple_sorter("aggr_name", _("Aggregation name"), "aggr_name", cmp_simple_string) +declare_simple_sorter("aggr_group", _("Aggregation group"), "aggr_group", cmp_simple_string)

12 years, 2 months

Check_MK Git: check_mk: FIX: Fix problem where snapins where invisible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e116efdaf0324d1386870b11eb638824b23a5d05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e116efdaf0324d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:40:08 2012 +0200 FIX: Fix problem where snapins where invisible --- ChangeLog | 1 + web/htdocs/sidebar.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63a8e38..00a348e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * FIX: Fixed encoding problem in "custom notification" message * New configuration parameter page_heading for the HTML page heads of the main frameset (%s will be replaced with OMD site name) + * FIX: Fix problem where snapins where invisible BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ee45bff..e9521ac 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -42,6 +42,8 @@ def load_plugins(): loaded_with_language = current_language # Load all snapins + global sidebar_snapins + sidebar_snapins = {} load_web_plugins("sidebar", globals()) # Declare permissions: each snapin creates one permission @@ -153,15 +155,14 @@ def page_side(): for name, state in user_config: if not name in sidebar_snapins or not config.may("sidesnap." + name): continue - if state in [ "open", "closed" ]: - refresh_url = render_snapin(name, state) - refresh_time = sidebar_snapins.get(name).get("refresh", 0) - if refresh_time > 0: - refresh_snapins.append([name, refresh_time, refresh_url]) - - restart = sidebar_snapins.get(name, {}).get('restart', False) - if restart: - restart_snapins.append(name) + refresh_url = render_snapin(name, state) + refresh_time = sidebar_snapins.get(name).get("refresh", 0) + if refresh_time > 0: + refresh_snapins.append([name, refresh_time, refresh_url]) + + restart = sidebar_snapins.get(name, {}).get('restart', False) + if restart: + restart_snapins.append(name) html.write('</div>') sidebar_foot() html.write('</div>')

12 years, 2 months

Check_MK Git: check_mk: Remove exceeding import statements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e31130d8a956436605eb8d02cdeb54e9191e504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e31130d8a9564… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:41:27 2012 +0200 Remove exceeding import statements --- web/plugins/sidebar/bi.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index 0371ae8..2fa4a4e 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import views, time, defaults -from lib import * import bi # Python 2.3 does not have 'set' in normal namespace.

12 years, 2 months

Check_MK Git: check_mk: Better source code indentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e25aae8d60801365c6af537db7d3fe20c035911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e25aae8d60801… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 16:45:45 2012 +0200 Better source code indentation --- web/plugins/views/sorters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 02a579e..57f00aa 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -338,4 +338,4 @@ declare_simple_sorter("alerts_problem", _("Number of problem alerts"), "alerts # Aggregations declare_simple_sorter("aggr_name", _("Aggregation name"), "aggr_name", cmp_simple_string) -declare_simple_sorter("aggr_group", _("Aggregation group"), "aggr_group", cmp_simple_string) +declare_simple_sorter("aggr_group", _("Aggregation group"), "aggr_group", cmp_simple_string)

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012