Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

Check_MK Git: check_mk: FIX: winperf_processor: fix perfometer if no params defined

by Mathias Kettner

Module: check_mk Branch: master Commit: 55cc7f01051eba9049962e9dd0a2dabafbaae409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55cc7f01051eba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 17:36:03 2012 +0100 FIX: winperf_processor: fix perfometer if no params defined --- web/plugins/perfometer/check_mk.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 1d9f14f..1a2d795 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -339,14 +339,14 @@ perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions def perfometer_cpu_utilization(row, check_command, perf_data): util = float(perf_data[0][1]) # is already percentage - warn = float(perf_data[0][3]) - crit = float(perf_data[0][4]) - if util < warn: - color = "#6f2" - elif util < crit: - color = "#9f2" - else: - color = "#cf2" + color = "#cf2" + if perf_data[0][3]: + warn = float(perf_data[0][3]) + crit = float(perf_data[0][4]) + if util < warn: + color = "#6f2" + elif util < crit: + color = "#9f2" return "%.0f%%" % util, perfometer_linear(util, color)

11 years, 8 months

Check_MK Git: check_mk: 0FIX: mssql_counters: remove debug output, fix bytes output

by Mathias Kettner

Module: check_mk Branch: master Commit: acbd16290dd9889cd0fc6fb8619a406acd718101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acbd16290dd988… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 17:32:47 2012 +0100 0FIX: mssql_counters: remove debug output, fix bytes output --- ChangeLog | 1 + checks/mssql_counters | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7817c56..04c391b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -231,6 +231,7 @@ Checks & Agents: * FIX: postgres_sessions: handle case of no active/no idle sessions * FIX: winperf_processor: handle parameters "None" (as WATO creates) + * FIX: mssql_counters: remove debug output, fix bytes output Multisite: * FIX: performeter_temparature now returns unicode string, because of °C diff --git a/checks/mssql_counters b/checks/mssql_counters index d49779c..f243a2b 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -219,7 +219,7 @@ def check_mssql_file_sizes(item, params, info): perfdata.append(('data_files', data_file_bytes)) output.append('Log Files: %s (Used: %s)' % - (get_bytes_human_readable(log_file_bytes), get_bytes_human_readable(log_file_used_bytes))) + (get_bytes_human_readable(data_file_bytes), get_bytes_human_readable(log_file_used_bytes))) perfdata.append(('log_files', log_file_bytes)) perfdata.append(('log_files_used', log_file_used_bytes))

11 years, 8 months

Check_MK Git: check_mk: FIX: winperf_processor: handle parameters "None" ( as WATO creates)

by Mathias Kettner

Module: check_mk Branch: master Commit: f1fe4dcb401c9f41d680d416076262b833076b8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1fe4dcb401c9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 17:28:47 2012 +0100 FIX: winperf_processor: handle parameters "None" (as WATO creates) --- ChangeLog | 1 + checks/winperf_processor | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 371a5f5..7817c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -230,6 +230,7 @@ Checks & Agents: * FIX: postgres_sessions: handle case of no active/no idle sessions + * FIX: winperf_processor: handle parameters "None" (as WATO creates) Multisite: * FIX: performeter_temparature now returns unicode string, because of °C diff --git a/checks/winperf_processor b/checks/winperf_processor index f9604af..d2e7d5b 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -57,7 +57,10 @@ def check_winperf_util(item, params, info): used_perc = 0 elif used_perc > 100: used_perc = 100 - warn, crit = params + if params != None: + warn, crit = params + else: + warn, crit = None, None perfdata = [ ("util", "%.2f" % used_perc, warn, crit, 0, 100) ] if num_cpus == 1: num_txt = "" @@ -66,9 +69,9 @@ def check_winperf_util(item, params, info): infotext = " - %d%% used%s (in last %d secs)" % (int(used_perc), num_txt, timedif) - if used_perc >= crit: + if crit != None and used_perc >= crit: return (2, "CRIT" + infotext, perfdata) - elif used_perc >= warn: + elif warn != None and used_perc >= warn: return (1, "WARN" + infotext, perfdata) else: return (0, "OK" + infotext, perfdata)

11 years, 8 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: 1b80ee7802f793c611e01446114197fd05ea7386 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b80ee7802f793… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 17:34:22 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: mode_edit_rule now uses POST method

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c9eb862eb1af0793569d8dd442ae22d17bd3aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c9eb862eb1af0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 15:44:02 2012 +0100 mode_edit_rule now uses POST method (prevents too large URI error) --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 371a5f5..71212d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ like ntp_time and tcp_conn_stats * FIX: Persisting changing of folder titles when only the title has changed * Add: Creating a new rule immediately opens its edit formular + * The rules formular now uses POST as transaction method Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 98bff13..08cb129 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10328,7 +10328,7 @@ def mode_edit_rule(phase, new = False): html.help(rulespec["help"]) - html.begin_form("rule_editor") + html.begin_form("rule_editor", method="POST") # Rule Options vs_rule_options.render_input("options", rule_options)

11 years, 8 months

Check_MK Git: check_mk: FIX: mode_edit_rule no longer falling apart on page reload

by Andreas Boesl

Module: check_mk Branch: master Commit: 88787a77497d94365f49680131d2493371d56c39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88787a77497d94… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 15:36:27 2012 +0100 FIX: mode_edit_rule no longer falling apart on page reload --- web/htdocs/wato.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1244e84..98bff13 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9632,7 +9632,7 @@ def mode_rulesets(phase): html.write('</div>') def create_new_rule_form(rulespec, hostname = None, item = None): - html.begin_form("new_rule") + html.begin_form("new_rule", add_transid = False) html.write('<table>') if hostname: @@ -9657,7 +9657,7 @@ def create_new_rule_form(rulespec, hostname = None, item = None): html.select("rule_folder", folder_selection(g_root_folder)) html.write('</td></tr></table>\n') html.hidden_field("varname", html.var("varname")) - html.hidden_field("mode", html.var("mode")) + html.hidden_field("mode", "new_rule") html.end_form() def mode_edit_ruleset(phase): @@ -9697,10 +9697,6 @@ def mode_edit_ruleset(phase): return elif phase == "action": - # The creation of any new rule is handled by the new_rule mode - if html.has_var("_new_host_rule") or html.has_var("_new_rule"): - return "new_rule" - # Folder for the rule actions is defined by _folder rule_folder = g_folders[html.var("_folder", html.var("folder"))] check_folder_permissions(rule_folder, "write", True) @@ -10325,7 +10321,7 @@ def mode_edit_rule(phase, new = False): "folder %s to %s") % (rulespec["title"], folder["title"], new_rule_folder["title"])) else: - return "edit_ruleset" + return return ("edit_ruleset", _("%s rule in ruleset '%s' in folder %s") % (new and _("Created new") or _("Edited"), rulespec["title"], new_rule_folder["title"]))

11 years, 8 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: 8a4aefa791772516d97774637f5b1eb222572f1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a4aefa7917725… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 15:10:51 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: FIX: quote HTML variable names, fixes potential JS injection

by Mathias Kettner

Module: check_mk Branch: master Commit: 34b7c6d87bc65778bc992314672afe23c3cbe923 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34b7c6d87bc657… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 15:10:31 2012 +0100 FIX: quote HTML variable names, fixes potential JS injection --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2d11c0..371a5f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * FIX: Main Frame without sidebar: reload after activate changes * FIX: output_format json: handle newlines correctly * FIX: handle ldap logins with ',' in distinguished name + * FIX: quote HTML variable names, fixes potential JS injection WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index af25c4c..8f519a6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -330,7 +330,7 @@ class html: def hidden_field(self, var, value, id = None, add_var = False): if value != None: id = id and ' id="%s"' % id or '' - self.write("<input type=hidden name=%s value=\"%s\"%s>" % (var, attrencode(value), id)) + self.write("<input type=hidden name=\"%s\" value=\"%s\"%s>" % (attrencode(var), attrencode(value), id)) if add_var: self.add_form_var(var)

11 years, 8 months

Check_MK Git: check_mk: FIX: quote HTML variable names, fixes potential JS injection

by Mathias Kettner

Module: check_mk Branch: master Commit: d87d0215c125ee0b62e6224b809817955c359246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d87d0215c125ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 15:10:31 2012 +0100 FIX: quote HTML variable names, fixes potential JS injection --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index af25c4c..8f519a6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -330,7 +330,7 @@ class html: def hidden_field(self, var, value, id = None, add_var = False): if value != None: id = id and ' id="%s"' % id or '' - self.write("<input type=hidden name=%s value=\"%s\"%s>" % (var, attrencode(value), id)) + self.write("<input type=hidden name=\"%s\" value=\"%s\"%s>" % (attrencode(var), attrencode(value), id)) if add_var: self.add_form_var(var)

11 years, 8 months

Check_MK Git: check_mk: FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering)

by Mathias Kettner

Module: check_mk Branch: master Commit: e235658500bd98e102a7cd56606b2348fc43c80d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e235658500bd98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 14:32:02 2012 +0100 FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) --- ChangeLog | 3 +++ livestatus/src/logger.c | 4 +++- livestatus/src/module.c | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f34a68..05b7c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,6 +232,9 @@ * FIX: performeter_temparature now returns unicode string, because of °C * FIX: output_format json in webservices now using " as quotes + Livestatus: + * FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) + 1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 3872e2c..82bb982 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -44,8 +44,10 @@ void open_logfile() void close_logfile() { - if (g_logfile) + if (g_logfile) { fclose(g_logfile); + g_logfile = 0; + } } void logger(int priority, const char *loginfo, ...) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 73bdcd8..94ac6c8 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -286,6 +286,7 @@ void terminate_threads() if (g_debug_level > 0) logger(LG_INFO, "Main thread + %u client threads have finished", g_num_clientthreads); g_thread_running = 0; + g_should_terminate = false; } free(g_clientthread_id); }

11 years, 8 months

← Newer
1
2
3
4
5
6
7
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012