Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: WATO: fix inventory with 1000 hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2449b159b928571ef25d0a6e8eba5294f29afdb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2449b159b92857… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 14:01:41 2011 +0100 WATO: fix inventory with 1000 hosts --- web/htdocs/htmllib.py | 3 ++- web/htdocs/wato.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 59b0495..68f10a8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -314,7 +314,8 @@ class html: def jsbutton(self, varname, text, onclick, style=''): if style: style = ' style="%s"' % style - self.write("<input type=button name=%s id=%s onclick=\"%s\" class=button%s value=\"%s\" />" % (varname, varname, onclick, style, text)) + self.write("<input type=button name=%s id=%s onclick=\"%s\" " + "class=button%s value=\"%s\" />" % (varname, varname, onclick, style, text)) def begin_context_buttons(self): self.write("<table class=contextlinks><tr><td>\n") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb17ac5..7308274 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3174,8 +3174,12 @@ def interactive_progress(items, title, stats, finishvars, timewait, success_stat # They are just needed for the Abort/Finish links. Those must be converted # to POST. base_url = html.makeuri([], remove_prefix = "sel") + finish_url = make_link([("mode", "folder")] + finishvars) + term_url = make_link([("mode", "folder")] + termvars) + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json_items, html.makeuri(finishvars), success_stats, html.makeuri(termvars),)) + (html.var('mode'), base_url, json_items, finish_url, + success_stats, term_url)) #.

12 years, 10 months

Check_MK Git: check_mk: Dashboard: fix link to downtime services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b90b48e38fb22dc5ed540f702120299ede14a033 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b90b48e38fb22d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:43:33 2011 +0100 Dashboard: fix link to downtime services --- web/htdocs/dashboard.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a1e0c20..a4ad616 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -447,7 +447,8 @@ def dashlet_servicestats(): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state = 0\n" \ - "StatsAnd: 4\n"), + "Stats: host_has_been_checked = 1\n" \ + "StatsAnd: 5\n"), ( _("warning"), "#ff0", "searchsvc&hst0=on&st1=on&is_in_downtime=0", @@ -455,7 +456,8 @@ def dashlet_servicestats(): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state = 0\n" \ - "StatsAnd: 4\n"), + "Stats: host_has_been_checked = 1\n" \ + "StatsAnd: 5\n"), ( _("unknown"), "#f80", "searchsvc&hst0=on&st3=on&is_in_downtime=0", @@ -463,7 +465,8 @@ def dashlet_servicestats(): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state = 0\n" \ - "StatsAnd: 4\n"), + "Stats: host_has_been_checked = 1\n" \ + "StatsAnd: 5\n"), ( _("critical"), "#f00", "searchsvc&hst0=on&st2=on&is_in_downtime=0", @@ -471,10 +474,11 @@ def dashlet_servicestats(): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state = 0\n" \ - "StatsAnd: 4\n"), + "Stats: host_has_been_checked = 1\n" \ + "StatsAnd: 5\n"), ( _("in downtime"), "#0af", - "searchsvc&hst0=on&is_in_downtime=0", + "searchsvc&hst0=on&is_in_downtime=1", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ "StatsOr: 2\n"),

12 years, 10 months

Check_MK Git: check_mk: Revert "Multisite: renamed filled_in with _filled_in"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 427e75d9be1312b7b12ec575667b1379c2071bdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=427e75d9be1312… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:43:35 2011 +0100 Revert "Multisite: renamed filled_in with _filled_in" This breaks view reloading algorithm. This reverts commit 454886fc4c5b1afa4e4ca4bff243c26c0e6bb9d3. --- web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 16 ++++++++-------- web/htdocs/js/search.js | 2 +- web/htdocs/views.py | 4 ++-- web/plugins/views/bi.py | 4 ++-- web/plugins/views/filters.py | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a4ad616..f9f9682 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -518,7 +518,7 @@ def render_statistics(pie_id, what, table, filter): html.write('<table class="hoststats%s" style="float:left">' % ( len(pies) > 5 and " narrow" or "")) for (name, color, viewurl, query), count in pies + [ ((_("Total"), "", "all%s" % what, ""), total) ]: - url = "view.py?view_name=" + viewurl + "&_filled_in=filter&search=1&wato_folder=" \ + url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \ + htmllib.urlencode(html.var("wato_folder", "")) html.write('<tr><th><a href="%s">%s</a></th>' % (url, name)) html.write('<td class=color style="background-color: %s">' diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5a7c0f3..59b0495 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -233,7 +233,7 @@ class html: onsubmit = '' self.write("<form name=%s class=%s action=\"%s\" method=%s%s%s>\n" % (name, name, action, method, enctype, onsubmit)) - self.hidden_field("_filled_in", name) + self.hidden_field("filled_in", name) self.hidden_field("_transid", str(self.current_transid())) self.hidden_fields(self.global_vars) self.form_name = name @@ -242,7 +242,7 @@ class html: self.write("</form>\n") def form_submitted(self): - return self.has_var("_filled_in") + return self.has_var("filled_in") def add_user_error(self, varname, message): if type(varname) == list: @@ -415,10 +415,10 @@ class html: html = "<x class=inputerror>" # Problem with checkboxes: The browser will add the variable # only to the URL if the box is checked. So in order to detect - # whether we should add the default value, we need to detect + # wether we should add the default value, we need to detect # if the form is printed for the first time. This is the - # case if "_filled_in" is not set. - if not self.var("_filled_in") == self.form_name: # this form filled in + # case if "filled_in" is not set. + if not self.var("filled_in") == self.form_name: # this form filled in value = self.req.vars.get(varname, deflt) else: value = self.req.vars.get(varname, "") @@ -443,13 +443,13 @@ class html: def get_checkbox(self, varname, form_name = None): if form_name: try: - if not self.var("_filled_in") == self.form_name: # this form filled in + if not self.var("filled_in") == self.form_name: # this form filled in return None except: # self.form_name not set, we have no form - if not self.var("_filled_in"): + if not self.var("filled_in"): return None - elif not self.var("_filled_in"): + elif not self.var("filled_in"): return None value = self.req.vars.get(varname, "") diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 7b641d0..0809ffa 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -306,7 +306,7 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) { else if(numMatches > 1) return 'view.py?view_name=hosts&host=' + objName; else - return 'view.py?view_name=searchsvc&search=Search&_filled_in=on&service=' + objName; + return 'view.py?view_name=searchsvc&search=Search&filled_in=on&service=' + objName; else if(objType == 'hg') if(numMatches == 1) return 'view.py?view_name=hostgroup&hostgroup=' + objName + '&site=' + objSite; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bb96b82..74e9fa0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -874,7 +874,7 @@ def load_view_into_html_vars(view): # Make sure, checkboxes with default "on" do no set "on". Otherwise they # would always be on - html.set_var("_filled_in", "create_view") + html.set_var("filled_in", "create_view") # Extract properties of view from HTML variables and construct # view object, to be used for saving or displaying @@ -1159,7 +1159,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru hard_filters = [ multisite_filters[fn] for fn in view["hard_filters"] ] for varname, value in view["hard_filtervars"]: # shown filters are set, if form is fresh and variable not supplied in URL - if not html.var("_filled_in") and not html.has_var(varname): + if not html.var("filled_in") and not html.has_var(varname): html.set_var(varname, value) # Prepare Filter headers for Livestatus diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 8f39675..2db8c39 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -516,7 +516,7 @@ class BIStatusFilter(Filter): return "" def display(self): - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -529,7 +529,7 @@ class BIStatusFilter(Filter): def filter_table(self, rows): jeaders = [] - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 09284c7..60da59c 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -188,7 +188,7 @@ class FilterServiceState(Filter): self.prefix = prefix def display(self): - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -199,7 +199,7 @@ class FilterServiceState(Filter): def filter(self, infoname): headers = [] - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -229,7 +229,7 @@ class FilterHostState(Filter): "host", [ "hst0", "hst1", "hst2", "hstp" ], []) def display(self): - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -239,7 +239,7 @@ class FilterHostState(Filter): def filter(self, infoname): headers = [] - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -465,7 +465,7 @@ class FilterLogClass(Filter): "log", [ "logclass%d" % l for l, c in self.log_classes ], []) def display(self): - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on" @@ -493,7 +493,7 @@ class FilterLogClass(Filter): def filter(self, infoname): headers = [] - if html.var("_filled_in"): + if html.var("filled_in"): defval = "" else: defval = "on"

12 years, 10 months

Check_MK Git: check_mk: WATO: move backup/restore to main menu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 870743d4833146d989bd3305448f77b7861ea9ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870743d4833146… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:50:25 2011 +0100 WATO: move backup/restore to main menu --- web/htdocs/wato.py | 5 ----- web/plugins/wato/builtin_modules.py | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7485776..eb17ac5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4831,7 +4831,6 @@ def mode_main(phase): elif phase == "buttons": changelog_button() - snapshots_button() return elif phase == "action": @@ -9581,10 +9580,6 @@ def global_buttons(): def home_button(): html.context_button(_("Home"), make_link([("mode", "main")]), "home") -def snapshots_button(): - if config.may("wato.snapshots"): - html.context_button(_("Backup / Restore"), make_link([("mode", "snapshot")]), "backup") - def search_button(): html.context_button(_("Search"), make_link([("mode", "search")]), "search") diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index c965275..d30f423 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -69,5 +69,8 @@ modules = [ ( "auditlog", _("Audit Logfile"), "auditlog", "auditlog", _("The audit log keeps track of all modifications and actions of the users in WATO.")), + + ( "snapshot", _("Backup & Restore"), "backup", "snapshots", + _("Make snapshots of your current configuration, download, upload and restore snapshots.")), ]

12 years, 10 months

Check_MK Git: check_mk: WATO: fix typo in ram usage rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32faeb5729ca224540ded8c36c09413c2346055c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32faeb5729ca22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:22:32 2011 +0100 WATO: fix typo in ram usage rule --- web/plugins/wato/check_parameters.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b818d16..5117bf5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -241,12 +241,12 @@ checkgroups.append(( "the main memory, so <b>at least</b> the half of it is currently swapped out."), elements = [ Tuple( - title = _("Specify levels in percentage of RAM"), + title = _("Specify levels in percentage of total RAM"), elements = [ Percentage(title = _("Warning at a usage of"), label = _("% of RAM")), Percentage(title = _("Critical at a usage of"), label = _("% of RAM"))]), Tuple( - title = _("Specify levels in percentage of RAM"), + title = _("Specify levels in absolute usage values"), elements = [ Integer(title = _("Warning at"), unit = _("MB")), Integer(title = _("Critical at"), unit = _("MB"))]),

12 years, 10 months

Check_MK Git: check_mk: WATO: fixed typos in permissions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9664cb93f8496b1646de1d276b78d070379ee9dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9664cb93f8496b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:20:52 2011 +0100 WATO: fixed typos in permissions --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e3e80cb..7485776 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9772,8 +9772,8 @@ def load_plugins(): _("Use WATO"), _("This permissions allows users to use WATO - Check_MK's " "Web Administration Tool. Without this " - "permission all references to WATO (buttons, links," - "snapins) will be unvisible."), + "permission all references to WATO (buttons, links, " + "snapins) will be invisible."), [ "admin", "user" ]) config.declare_permission("wato.edit",

12 years, 10 months

Check_MK Git: check_mk: WATO: fix condition editing in rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 249ce9c95f7d2be8b77cb8a917529bdb3b814856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=249ce9c95f7d2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 13:19:47 2011 +0100 WATO: fix condition editing in rules --- web/htdocs/wato.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8dc34ea..e3e80cb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8974,6 +8974,7 @@ def mode_edit_rule(phase): # CONDITION tag_specs, host_list, item_list = get_rule_conditions(rulespec) new_rule_folder = g_folders[html.var("new_rule_folder")] + # VALUE if valuespec: value = get_edited_value(valuespec) @@ -9055,7 +9056,8 @@ def mode_edit_rule(phase): t = t[1:] else: n = False - if t in [ x[0] for x in tags]: + if t in [ x[0] for x in tags ]: + default_tag = t ignore = False negate = n if ignore: @@ -9068,8 +9070,8 @@ def mode_edit_rule(phase): html.write("<td>") html.select("tag_" + id, [ ("ignore", _("ignore")), - ("is", _("is")), - ("isnot", _("isnot"))], deflt, + ("is", _("is")), + ("isnot", _("isnot"))], deflt, onchange="wato_toggle_dropdownn(this, 'tag_sel_%s');" % id) html.write("</td><td>") if html.form_submitted():

12 years, 10 months

Check_MK Git: check_mk: WATO: speed up host list

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 866719e3a07f1199875b5bc9e42c3afdd80ed014 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866719e3a07f11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 00:30:54 2011 +0100 WATO: speed up host list --- web/htdocs/wato.py | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5351cec..8dc34ea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1139,20 +1139,29 @@ def show_hosts(folder): 'init_rowselect();' % repr(["_c_%s" % h for h in hostnames])) return True - +host_move_combo_cache_id = None def host_move_combo(host = None, top = False): - other_folders = [] - for path, afolder in g_folders.items(): - # TODO: Check permisssions - if afolder != g_folder: - os_path = afolder[".path"] - msg = afolder["title"] - if os_path: - msg += " (%s)" % os_path - other_folders.append((os_path, msg)) - - if len(other_folders) > 0: - selections = [("@", _("(select folder)"))] + other_folders + global host_move_combo_cache, host_move_combo_cache_id + if host_move_combo_cache_id != id(html): + host_move_combo_cache = {} + host_move_combo_cache_id = id(html) + + if id(g_folder) not in host_move_combo_cache: + selections = [("@", _("(select folder)"))] + for path, afolder in g_folders.items(): + # TODO: Check permisssions + if afolder != g_folder: + os_path = afolder[".path"] + msg = afolder["title"] + if os_path: + msg += " (%s)" % os_path + selections.append((os_path, msg)) + selections.sort(cmp=lambda a,b: cmp(a[1].lower(), b[1].lower())) + host_move_combo_cache[id(g_folder)] = selections + else: + selections = host_move_combo_cache[id(g_folder)] + + if len(selections) > 1: if host == None: html.button("_bulk_move", _("Move To:")) field_name = 'bulk_moveto' @@ -1166,7 +1175,7 @@ def host_move_combo(host = None, top = False): else: html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) - html.sorted_select("_host_move_%s" % host, selections, "@", + html.select("_host_move_%s" % host, selections, "@", "location.href='%s' + '&_move_host_to=' + this.value;" % uri);

12 years, 10 months

Check_MK Git: check_mk: WATO: random generation also creates folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 967482e15b0e7141cf36ec503d21153ab0b613c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=967482e15b0e71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 20:36:50 2011 +0100 WATO: random generation also creates folders --- web/htdocs/wato.py | 77 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 19 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 855ab8f..6c0e7f7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2350,32 +2350,25 @@ def mode_random_hosts(phase): elif phase == "action": if html.check_transaction(): - import random count = int(html.var("count")) - created = 0 - n = 1 - while created < count: - while True: - name = "random_%010d" % int(random.random() * 10000000000) - if name in g_folder[".hosts"]: - n += 1 - else: - break - host = {"ipaddress" : "127.0.0.1"} - g_folder[".hosts"][name] = host - created += 1 - g_folder["num_hosts"] += count - save_folder_and_hosts(g_folder) - reload_hosts() - return "folder", _("Created %d random hosts.") % count - return "folder" + folders = int(html.var("folders")) + levels = int(html.var("levels")) + created = create_random_hosts(g_folder, count, folders, levels) + return "folder", _("Created %d random hosts.") % created + else: + return "folder" html.begin_form("random") html.write("<table class=form>") html.write("<tr><td class=legend>%s</td>" % _("Number to create")) html.write("</td><td class=content>") - html.number_input("count", 100) + html.write("%s: " % _("Hosts to create in each folder")) + html.number_input("count", 10) html.set_focus("count") + html.write("<br>%s: " % _("Number of folders to create in each level")) + html.number_input("folders", 10) + html.write("<br>%s: " % _("Levels of folders to create")) + html.number_input("levels", 1) html.write("</td></tr>") html.write("<tr><td class=buttons colspan=2>") @@ -2384,6 +2377,52 @@ def mode_random_hosts(phase): html.hidden_fields() html.end_form() +def create_random_hosts(folder, count, folders, levels): + import random + if levels == 0: + created = 0 + while created < count: + name = "random_%010d" % int(random.random() * 10000000000) + host = {"ipaddress" : "127.0.0.1"} + folder[".hosts"][name] = host + created += 1 + folder["num_hosts"] += count + save_folder_and_hosts(folder) + reload_hosts() + return count + else: + total_created = 0 + if folder[".path"]: + prefixpath = folder[".path"] + "/" + else: + prefixpath = "" + created = 0 + while created < folders: + created += 1 + i = 1 + while True: + name = "folder_%02d" % i + if name not in folder[".folders"]: + break + i += 1 + title = "Subfolder %02d" % i + path = prefixpath + name + subfolder = { + ".parent" : folder, + ".name" : name, + ".folders" : {}, + ".hosts" : {}, + ".path" : path, + "attributes" : {}, + "num_hosts" : 0, + "title" : title, + } + g_folders[path] = subfolder + folder[".folders"][name] = subfolder + save_folder(subfolder) + total_created += create_random_hosts(subfolder, count, folders, levels - 1) + save_folder(folder) + return total_created #. # .-Auditlog-------------------------------------------------------------.

12 years, 10 months

Check_MK Git: check_mk: Removed debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7077361580f836866774ab26280d75969ee6ff6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7077361580f83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 20:34:06 2011 +0100 Removed debug output --- modules/check_mk.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1c6fe2d..5162bd8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1091,7 +1091,6 @@ def all_active_clusters(): if in_binary_hostlist(hostname, only_hosts) ] def hostgroups_of(hostname): - print(host_groups) return host_extra_conf(hostname, host_groups) def summary_hostgroups_of(hostname): @@ -1460,12 +1459,10 @@ def create_nagios_hostdefs(outfile, hostname): hgs = hostgroups_of(hostname) hostgroups = ",".join(hgs) if len(hgs) == 0: - print "AAAAAAAAAA..." hostgroups = default_host_group hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - print "ALLES GUT: [%s] %r" % (hostgroups, hgs) outfile.write(" hostgroups\t\t\t%s\n" % hostgroups) # Contact groups

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits