Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: 23c08e74ce9640f003d33d66eb086222e625b1ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23c08e74ce9640… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 16:23:34 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Added view to show a single aggregation defined by agg_name parameter

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d85c1ff605e0ee24b939bacae36183dc1baa05b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d85c1ff605e0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 15:43:00 2011 +0100 Added view to show a single aggregation defined by agg_name parameter --- web/plugins/views/builtin.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e55a371..0edf462 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2406,6 +2406,36 @@ multisite_builtin_views.update({ 'title': 'Single-Host Problems', 'topic': _('Business Intelligence')}, +# Shows a single aggregation which has to be set via aggr_name=<Name> +'aggr_single': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'bi_aggregations', + 'description': u'', + 'group_painters': [], + 'hard_filters': [], + 'hard_filtervars': [], + 'hidden': True, + 'hide_filters': ['aggr_name'], + 'hidebutton': False, + 'icon': 'aggr', + 'layout': 'table', + 'linktitle': 'All Aggregations', + 'mobile': False, + 'mustsearch': False, + 'name': 'aggr_single', + 'num_columns': 1, + 'owner': 'omdadmin', + 'painters': [('aggr_state', None, ''), + ('aggr_treestate', None, '')], + 'play_sounds': False, + 'public': True, + 'show_checkboxes': None, + 'show_filters': [], + 'sorters': [], + 'title': u'Single Aggregation', + 'topic': u'Business Intelligence', + 'user_sortable': None} + # +----------------------------------------------------------------------+ # | _ _ _ _ __ _ _ _ | # | | \ | | ___ | |_(_)/ _(_) ___ __ _| |_(_) ___ _ __ ___ |

12 years, 9 months

Check_MK Git: check_mk: WATO Fixed invalid MKUserError call when too short secret given

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0624e52dd74c66fbec9da57604a9b454726c30d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0624e52dd74c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 15:39:26 2011 +0100 WATO Fixed invalid MKUserError call when too short secret given --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fc55d82..2ec191e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7201,7 +7201,7 @@ def mode_edit_user(phase): if auth_method == "secret": secret = html.var("secret", "").strip() if not secret or len(secret) < 10: - raise MKUserError(_("Please specify a secret of at least 10 characters length.")) + raise MKUserError('secret', _("Please specify a secret of at least 10 characters length.")) new_user["automation_secret"] = secret new_user["password"] = encrypt_password(secret)

12 years, 9 months

Check_MK Git: check_mk: WATO: Fixed creation of automation.secret

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2fba82271166d54551801e2255ce9cf9712b2686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fba82271166d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 14:45:25 2011 +0100 WATO: Fixed creation of automation.secret --- web/htdocs/wato.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 532e50f..fc55d82 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7609,14 +7609,14 @@ def save_users(profiles): locksym = "" out.write("%s:%s%s\n" % (id, locksym, user["password"])) - # Authentication secret for local processes - auth_dir = defaults.var_dir + "/web/" + id - auth_file = auth_dir + "/automation.secret" - make_nagios_directory(auth_dir) - if "automation_secret" in user: - create_user_file(auth_file, "w").write("%s\n" % user["automation_secret"]) - elif os.path.exists(auth_file): - os.remove(auth_file) + # Authentication secret for local processes + auth_dir = defaults.var_dir + "/web/" + id + auth_file = auth_dir + "/automation.secret" + make_nagios_directory(auth_dir) + if "automation_secret" in user: + create_user_file(auth_file, "w").write("%s\n" % user["automation_secret"]) + elif os.path.exists(auth_file): + os.remove(auth_file) # Call the users_saved hook call_hook(call_hook_users_saved, users)

12 years, 9 months

Check_MK Git: check_mk: Distributed WATO: Fixed only_hosts file in distributed wato ( basically reverts a problematic fix which I can not remember the exact reason anymore )

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4c1536a7a1fa1b0ea0b22e02d0373da4e4d1dbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4c1536a7a1fa1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 14:30:44 2011 +0100 Distributed WATO: Fixed only_hosts file in distributed wato (basically reverts a problematic fix which I can not remember the exact reason anymore) --- web/htdocs/wato.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index df9c82d..532e50f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6414,7 +6414,7 @@ def update_only_hosts_file(sites): distributed = True if "socket" not in site \ or site["socket"] == "unix:" + defaults.livestatus_unix_socket: - create_only_hosts_file(siteid) + create_only_hosts_file(siteid, site.get("replication")) if not distributed: delete_only_hosts_file() @@ -6965,7 +6965,7 @@ def automation_push_snapshot(): log_commit_pending() # pending changes are lost # Create rule making this site only monitor our hosts - create_only_hosts_file(site_id) + create_only_hosts_file(site_id, mode) log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) if html.var("restart", "no") == "yes": check_mk_local_automation("restart") @@ -6977,14 +6977,17 @@ def automation_push_snapshot(): else: return _("Internal automation error: %s") % e -def create_only_hosts_file(siteid): +def create_only_hosts_file(siteid, mode): out = file(defaults.check_mk_configdir + "/only_hosts.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("# This file has been created by the master site\n" "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") out.write("if only_hosts == None:\n only_hosts = []\n\n") - out.write("only_hosts += [(NEGATE, ['!site:%s'], ALL_HOSTS )]\n" % siteid) + #if mode == 'master': + # out.write("only_hosts += [(NEGATE, ['!site:%s'], ALL_HOSTS )]\n" % siteid) + #else: + out.write("only_hosts += [(['site:%s'], ALL_HOSTS )]\n" % siteid) def delete_only_hosts_file(): p = defaults.check_mk_configdir + "/only_hosts.mk"

12 years, 9 months

Check_MK Git: check_mk: Fixed several exceptions when host ist marked as " do not monitor"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93d1da56703317dce502cb2dd957403a710c9581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93d1da56703317… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 14:05:48 2011 +0100 Fixed several exceptions when host ist marked as "do not monitor" --- web/htdocs/wato.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 554b4f4..df9c82d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6546,7 +6546,7 @@ class SiteAttribute(Attribute): default_value = default_site()) def paint(self, value, hostname): - return "", self._choices_dict.get(value, value) + return "", self._choices_dict.get(value, _("(do not monitor)")) def render_input(self, value): html.select("site", self._choices, value) @@ -6630,15 +6630,15 @@ def global_replication_state(): def find_host_sites(site_ids, folder, hostname): host = folder[".hosts"][hostname] - if "site" in host: + if "site" in host and host["site"]: site_ids.add(host["site"]) - else: + elif folder[".siteid"]: site_ids.add(folder[".siteid"]) # Scan recursively for references to sites # in folders and hosts def find_folder_sites(site_ids, folder, include_folder = False): - if include_folder: + if include_folder and folder[".siteid"]: site_ids.add(folder[".siteid"]) load_hosts(folder) for hostname in folder[".hosts"]:

12 years, 9 months

Check_MK Git: check_mk: WATO: JS bugfix when tr not found

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3cdd7b2166076e32f553af51c2613ab57772cca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3cdd7b2166076… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 12:24:56 2011 +0100 WATO: JS bugfix when tr not found --- web/htdocs/js/wato.js | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index c27da5c..640bd40 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -138,11 +138,12 @@ function wato_fix_visibility() { for (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); - if( hide_topics.indexOf(item) > -1 ){ - oTr.style.display = "none"; + if(oTr) { + if(hide_topics.indexOf(item) > -1 ) + oTr.style.display = "none"; + else + oTr.style.display = ""; } - else - oTr.style.display = ""; } }

12 years, 9 months

Check_MK Git: check_mk: Fixed unknown parameter while initializing site connections

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 421d3a5eaabcad522d46cf1f09235c7cb08f166c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=421d3a5eaabcad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 12:06:41 2011 +0100 Fixed unknown parameter while initializing site connections --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e479174..554b4f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5924,7 +5924,7 @@ def mode_sites(phase): error = str(e) - wato_html_head(_("Login into site '%s'") % site["alias"], stylesheets = wato_styles) + wato_html_head(_("Login into site '%s'") % site["alias"]) if error: html.show_error(error) html.write("<div class=message>")

12 years, 9 months

Check_MK Git: check_mk: Fixed logwatch stylesheets

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b6497c9a7eb3cacd2f627cc2a86cdc2284a38f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6497c9a7eb3c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 11:33:51 2011 +0100 Fixed logwatch stylesheets --- web/htdocs/{page_logwatch.py => logwatch.py} | 9 +++++---- web/plugins/pages/shipped.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/page_logwatch.py b/web/htdocs/logwatch.py similarity index 97% rename from web/htdocs/page_logwatch.py rename to web/htdocs/logwatch.py index d19db15..45e8d5a 100644 --- a/web/htdocs/page_logwatch.py +++ b/web/htdocs/logwatch.py @@ -28,6 +28,7 @@ import htmllib, livestatus, time, re, os, datetime, config, defaults from lib import * import views +stylesheets = [ 'pages', 'status', 'logwatch' ] def page(): host = html.var('host') @@ -51,7 +52,7 @@ def page(): # Shows a list of all problematic logfiles grouped by host def show_log_list(): - html.header(_("All problematic Logfiles")) + html.header(_("All problematic Logfiles"), stylesheets = stylesheets) html.write("<table class=data>\n") for host, logs in all_logs(): @@ -63,7 +64,7 @@ def show_log_list(): # Shows all problematic logfiles of a host def show_host_log_list(host): - html.header(_("Logfiles of host %s") % host) + html.header(_("Logfiles of host %s") % host, stylesheets = stylesheets) html.begin_context_buttons() html.context_button(_("Services"), "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) html.context_button(_("All logfiles"), "logwatch.py") @@ -111,7 +112,7 @@ def list_logs(host, logfiles): def show_file(host, filename): file = form_file_to_int(filename) - html.header(_("Logfiles of host %s: %s") % (host, filename)) + html.header(_("Logfiles of host %s: %s") % (host, filename), stylesheets = stylesheets) html.begin_context_buttons() html.context_button(_("Services"), "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) html.context_button(_("All logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) @@ -170,7 +171,7 @@ def show_file(host, filename): def do_log_ack(host, filename): file = form_file_to_int(filename) file_display = form_file_to_ext(file) - html.header(_("Acknowledge logfile %s - %s") % (htmllib.attrencode(host), file_display)) + html.header(_("Acknowledge logfile %s - %s") % (htmllib.attrencode(host), file_display), stylesheets = stylesheets) html.begin_context_buttons() html.context_button(_("All logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 6e8ca6c..41f996f 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -27,7 +27,7 @@ # Import modules that contain the page functions import main -import page_logwatch +import logwatch import views import sidebar import actions @@ -50,7 +50,7 @@ pagehandlers.update({ "count_context_button" : views.ajax_count_button, "export_views" : views.ajax_export, "view" : views.page_view, - "logwatch" : page_logwatch.page, + "logwatch" : logwatch.page, "side" : sidebar.page_side, "sidebar_add_snapin" : sidebar.page_add_snapin, "sidebar_snapin" : sidebar.ajax_snapin,

12 years, 9 months

Check_MK Git: check_mk: Host/ Service elements are now iterable via FOREACH_HOST

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f2385b146da0f0d7fd38429ee6af142ee6e8bea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f2385b146da0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 10:57:07 2011 +0100 Host/Service elements are now iterable via FOREACH_HOST --- ChangeLog | 2 ++ web/htdocs/bi.py | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b88627..30d1e31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ * New (hidden) button for reloading a snapin (left to the close button) BI: + * Host/Service elements are now iterable via FOREACH_HOST, e.g. + (FOREACH_HOST, ['server'], ALL_HOSTS, "$HOST$", "Kernel" ), * FIX: Assuming host states is possible again (exception: list index "3") WATO: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 2679473..c5fa3c8 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -231,7 +231,7 @@ def compile_forest(user): # Execute an aggregation rule, but prepare arguments # and iterate FOREACH first def compile_rule_node(calllist, lvl): - # Lookup rule source code + # Lookup rule source code rulename, arglist = calllist[-2:] if rulename not in config.aggregation_rules: raise MKConfigError("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" @@ -468,9 +468,26 @@ def compile_aggregation_rule(rule, args, lvl = 0): new_elements = new_new_elements elif type(node[-1]) != list: - new_elements = compile_leaf_node(subst_vars(node[0], arginfo), subst_vars(node[1], arginfo)) + if node[0] == config.FOREACH_HOST: + # Handle case that leaf elements also need to be iterable via FOREACH_HOST + # 1: config.FOREACH_HOST + # 2: (['waage'], '(.*)') + matches = find_matching_services(config.FOREACH_HOST, node[1:-2]) + new_elements = [] + for match in matches: + arginfo = {'HOST': match[0]} + new_elements += compile_leaf_node(subst_vars(node[-2], arginfo), subst_vars(node[-1], arginfo)) + + host_name, service_description = node[-2:] + else: + # This is a final leaf node + new_elements = compile_leaf_node(subst_vars(node[0], arginfo), subst_vars(node[1], arginfo)) else: # substitute our arguments in rule arguments + # rule_args: + # ['$1$'] + # rule_parts: + # (<class _mp_84b7bd024cff73bf04ba9045f980becb.FOREACH_HOST at 0x7f03600dc8d8>, ['waage'], '(.*)', 'host') rule_args = [ subst_vars(a, arginfo) for a in node[-1] ] rule_parts = tuple([ subst_vars(part, arginfo) for part in node[:-1] ]) new_elements = compile_rule_node(rule_parts + (rule_args,), lvl + 1) @@ -1092,5 +1109,4 @@ def get_state_name(node): else: return host_state_names[node[0]['state']] else: - # FIXME: Und wenn ein Hoststatus zum Summary-Status wird? return service_state_names[node[0]['state']]

12 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011