Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2100 if64: check can now impose limits on the number of outgoing and incoming non-unicast packets per second

by Goetz Golla

Module: check_mk Branch: master Commit: 1e9d49caceebd752bcdf5ab05cb44e9b6bee3d05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e9d49caceebd7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 10 13:14:15 2015 +0100 #2100 if64: check can now impose limits on the number of outgoing and incoming non-unicast packets per second --- .werks/2100 | 9 +++++++++ ChangeLog | 1 + checkman/if64 | 4 ++++ checks/if.include | 33 ++++++++++++++++++++++++++------- web/plugins/wato/check_parameters.py | 26 ++++++++++++++++++-------- 5 files changed, 58 insertions(+), 15 deletions(-) diff --git a/.werks/2100 b/.werks/2100 new file mode 100644 index 0000000..fb74ea2 --- /dev/null +++ b/.werks/2100 @@ -0,0 +1,9 @@ +Title: if64: check can now impose limits on the number of outgoing and incoming non-unicast packets per second +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425989574 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index db23c0d..14b1041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 1225 sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony... * 2056 winperf_processor: additionally reports user and privileged(system) time... * 1226 mysql: New check to show the version of the mysql deamon + * 2100 if64: check can now impose limits on the number of outgoing and incoming non-unicast packets per second * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/if64 b/checkman/if64 index 9c2421d..69210ed 100644 --- a/checkman/if64 +++ b/checkman/if64 @@ -150,6 +150,10 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as as bits or bytes, too. When this parameter is set to "bit" any traffic related plugin output is reported in bits instead of bytes(default). + {"nucasts"} - a pair of two float values to be used as WARN/CRIT + level for the number of non-unicast packets per second. If this value is not set, + no levels are imposed, which is also the default. + [configuration] if_inventory_porttypes (list of strings): List of interface types the inventory should create checks for. Default is {[ '6', '32', '117' ]}, which means that all Ethernet, Frame Relay and Gigabit Ethernet ports diff --git a/checks/if.include b/checks/if.include index a972cd5..3fd102b 100644 --- a/checks/if.include +++ b/checks/if.include @@ -422,6 +422,12 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n else: err_warn, err_crit = None, None + # broadcast storm detection is turned off by default + if "nucasts" in params: + nucast_warn, nucast_crit = params["nucasts"] + else: + nucast_warn, nucast_crit = None, None + # Traffic checking might be turned off if "traffic" in params: bw_warn_param, bw_crit_param = params["traffic"] @@ -595,13 +601,13 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n for name, counter, warn, crit, mmin, mmax in [ ( "in", ifInOctets, bw_warn_in, bw_crit_in, 0, speed_b_in), ( "inucast", inucast, None, None, None, None), - ( "innucast", saveint(inmcast) + saveint(inbcast), None, None, None, None), + ( "innucast", saveint(inmcast) + saveint(inbcast), nucast_warn, nucast_crit, None, None), ( "indisc", ifInDiscards, None, None, None, None), ( "inerr", ifInErrors, err_warn, err_crit, None, None), ( "out", ifOutOctets, bw_warn_out, bw_crit_out, 0, speed_b_out), ( "outucast", outucast, None, None, None, None), - ( "outnucast", saveint(outmcast) + saveint(outbcast), None, None, None, None), + ( "outnucast", saveint(outmcast) + saveint(outbcast), nucast_warn, nucast_crit, None, None), ( "outdisc", ifOutDiscards, None, None, None, None), ( "outerr", ifOutErrors, err_warn, err_crit, None, None) ]: @@ -636,9 +642,10 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n else: return "%s/s" % get_bytes_human_readable(value) - for what, errorrate, okrate, traffic, speed, bw_warn, bw_crit, bw_warn_min, bw_crit_min in \ - [ ("in", rates[4], rates[1] + rates[2], rates[0], speed_in, bw_warn_in, bw_crit_in, bw_warn_min_in, bw_crit_min_in), - ("out", rates[9], rates[6] + rates[7], rates[5], speed_out, bw_warn_out, bw_crit_out, bw_warn_min_out, bw_crit_min_out) ]: + # loop over incoming and outgoing traffic + for what, errorrate, urate, nurate, traffic, speed, bw_warn, bw_crit, bw_warn_min, bw_crit_min in \ + [ ("in", rates[4], rates[1], rates[2], rates[0], speed_in, bw_warn_in, bw_crit_in, bw_warn_min_in, bw_crit_min_in), + ("out", rates[9], rates[6], rates[7], rates[5], speed_out, bw_warn_out, bw_crit_out, bw_warn_min_out, bw_crit_min_out) ]: infotext += ", %s: %s" % (what, format_value(traffic)) @@ -671,9 +678,10 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n state = max(state, 1) infotext += ' (!) >= ' + format_value(bw_warn_min) - pacrate = okrate + errorrate + # check percentage of error packets + pacrate = urate + nurate + errorrate if pacrate > 0.0: # any packets transmitted? - errperc = 100.0 * errorrate / (okrate + errorrate) + errperc = 100.0 * errorrate / pacrate if errperc > 0: infotext += ", %s-errors: %.2f%%" % (what, errperc) @@ -685,6 +693,17 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n state = max(state, 1) infotext += "(!) >= " + str(err_warn) + # check rate of non-unicast packets + if nucast_crit or nucast_warn: + infotext += ", %s non-unicast packets %.2f/s" % (what, nurate) + + if nucast_crit and nurate >= nucast_crit: + state = 2 + infotext += "(!!) >= " + str(nucast_crit) + elif nucast_warn and nurate >= nucast_warn: + state = max(state,1) + infotext += "(!) >= " + str(nucast_warn) + if node: cluster_items[node] = ( state, infotext, perfdata ) else: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 01a9565..0af05ae 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2500,7 +2500,7 @@ register_check_parameters( ( "traffic", Alternative( title = _("Used bandwidth (maximum traffic)"), - help = _("Settings levels on the used bandwidth is optional. If you do set " + help = _("Setting levels on the used bandwidth is optional. If you do set " "levels you might also consider using an averaging."), elements = [ Tuple( @@ -2519,11 +2519,11 @@ register_check_parameters( ] ) ]) - ), + ), ( "traffic_minimum", Alternative( title = _("Used bandwidth (minimum traffic)"), - help = _("Settings levels on the used bandwidth is optional. If you do set " + help = _("Setting levels on the used bandwidth is optional. If you do set " "levels you might also consider using an averaging."), elements = [ Tuple( @@ -2542,9 +2542,20 @@ register_check_parameters( ] ) ]) - ), + ), + ( "nucasts", + Tuple( + title = _("Non-unicast packet rates"), + help = _("Setting levels on non-unicast packet rates is optional. This may help " + "to detect broadcast storms and other unwanted traffic."), + elements = [ + Integer(title = _("Warning at"), unit = _("pkts / sec")), + Integer(title = _("Critical at"), unit = _("pkts / sec")), + ] + ), + ), - ( "average", + ( "average", Integer( title = _("Average values"), help = _("By activating the computation of averages, the levels on " @@ -2555,10 +2566,9 @@ register_check_parameters( minvalue = 1, default_value = 15, ) - ), - + ), - ]), + ]), TextAscii( title = _("port specification"), allow_empty = False),

9 years, 6 months

Check_MK Git: check_mk: Reenabled improved version of dynamic PNP templates

by Mathias Kettner

Module: check_mk Branch: master Commit: 1eefe4f14089bdff3dcb45cad66d0a8d41929edd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eefe4f14089bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 10 12:14:52 2015 +0100 Reenabled improved version of dynamic PNP templates --- .../{default.php.inactive => default.php} | 99 +++++++--- web/.f12 | 5 +- web/htdocs/metrics.py | 189 +++++++++++++++----- web/plugins/metrics/check_mk.py | 14 +- 4 files changed, 222 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1eefe4f140…

9 years, 6 months

Check_MK Git: check_mk: Missing file added

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2495f2faa9caf9176c94d27102348b5e9a68af56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2495f2faa9caf9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Mar 10 12:06:27 2015 +0100 Missing file added --- checkman/mysql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/checkman/mysql b/checkman/mysql new file mode 100644 index 0000000..f43be82 --- /dev/null +++ b/checkman/mysql @@ -0,0 +1,17 @@ +title: MySQL: Version +agents: linux +catalog: app/mysql +license: GPL +distribution: check_mk +description: + This check only shows the Version of the runnin MySQL Deamon. + + This check needs the agent plugin {mk_mysql} to be installed. + Further details about this plugin and monitoring of MySQL can be + found in the Check_MK online documentation in the article + "Monitoring MySQL with Check_MK". + +inventory: + On each host where the agent plugin {mk_mysql} is being installed + and the MySQL daemon is running one service is being generated. +

9 years, 6 months

Check_MK Git: check_mk: #1226 mysql: New check to show the version of the mysql deamon

by Bastian Kuhn

Module: check_mk Branch: master Commit: aa89e7cd060da3646c679ded9a917c4ea1fef1b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa89e7cd060da3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Mar 10 12:06:06 2015 +0100 #1226 mysql: New check to show the version of the mysql deamon --- .werks/1226 | 9 +++++++++ ChangeLog | 1 + checks/mysql | 54 ++++++++++++++++++++++++++++++++---------------------- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/.werks/1226 b/.werks/1226 new file mode 100644 index 0000000..e30374f --- /dev/null +++ b/.werks/1226 @@ -0,0 +1,9 @@ +Title: mysql: New check to show the version of the mysql deamon +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425985521 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 34b1132..db23c0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ NOTE: Please refer to the migration notes! * 1225 sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony... * 2056 winperf_processor: additionally reports user and privileged(system) time... + * 1226 mysql: New check to show the version of the mysql deamon * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/mysql b/checks/mysql index a699587..7e46a0f 100644 --- a/checks/mysql +++ b/checks/mysql @@ -47,8 +47,8 @@ # | |_| | # '----------------------------------------------------------------------' -def inventory_mysql(info): - if len(info) > 200: # should be at least 321 line +def inventory_mysql(parsed): + if len(parsed.keys()) > 200: # should be at least 321 line return [(None, {})] def parse_mysql(info): @@ -67,6 +67,21 @@ def parse_mysql(info): values[varname] = value return values + +def check_mysql_version(_no_item, _no_params, parsed): + return 0, "Version: "+parsed['version'] + + +check_info['mysql'] = { + "check_function" : check_mysql_version, + "inventory_function" : inventory_mysql, + "service_description" : "MySQL Version", + "has_perfdata" : True, + "group" : "mysql_sessions", + "parse_function" : parse_mysql, +} + + #. # .--Sessions------------------------------------------------------------. # | ____ _ | @@ -84,11 +99,10 @@ def parse_mysql(info): # } -def check_mysql_sessions(_no_item, params, info): - values = parse_mysql(info) - total_sessions = values["Threads_connected"] - running_sessions = values["Threads_running"] - connections = get_rate("mysql.sessions", time.time(), values["Connections"]) +def check_mysql_sessions(_no_item, params, parsed): + total_sessions = parsed["Threads_connected"] + running_sessions = parsed["Threads_running"] + connections = get_rate("mysql.sessions", time.time(), parsed["Connections"]) infotext = " - %d sessions (%d running), %.2f connections/s" % ( total_sessions, running_sessions, connections) @@ -114,7 +128,7 @@ def check_mysql_sessions(_no_item, params, info): warn, crit = None, None perfdata.append((what, value, warn, crit)) - return (status, ", ".join(infos), perfdata) + return status, ", ".join(infos), perfdata check_info['mysql.sessions'] = { @@ -135,14 +149,12 @@ check_info['mysql.sessions'] = { # | | # '----------------------------------------------------------------------' -def inventory_mysql_iostat(info): - values = parse_mysql(info) - if "Innodb_data_read" in values.keys(): +def inventory_mysql_iostat(parsed): + if "Innodb_data_read" in parsed.keys(): return [(None, {})] -def check_mysql_iostat(item, params, info): - values = parse_mysql(info) - line = [ None, None, values["Innodb_data_read"] / 512, values["Innodb_data_written"] / 512] +def check_mysql_iostat(item, params, parsed): + line = [ None, None, parsed["Innodb_data_read"] / 512, parsed["Innodb_data_written"] / 512] return check_diskstat_line(time.time(), 'innodb_io', params, line) @@ -165,21 +177,19 @@ check_info['mysql.innodb_io'] = { # | | # +----------------------------------------------------------------------+ -def inventory_mysql_connections(info): - values = parse_mysql(info) - if 'Max_used_connections' in values and 'max_connections' in values: +def inventory_mysql_connections(parsed): + if 'Max_used_connections' in parsed and 'max_connections' in parsed: return [(None, {})] -def check_mysql_connections(item, params, info): - values = parse_mysql(info) - if 'Max_used_connections' not in values: +def check_mysql_connections(item, params, parsed): + if 'Max_used_connections' not in parsed: return (3, 'Connection information are missing') # The maximum number of connections that have been in use simultaneously # since the server started. - conn = float(values['Max_used_connections']) + conn = float(parsed['Max_used_connections']) # Maximum number of possible parallel connections - max_conn = float(values['max_connections']) + max_conn = float(parsed['max_connections']) perc_used = conn / max_conn * 100

9 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2173

by Andreas Boesl

Module: check_mk Branch: master Commit: a8eee5b4e96f48ee3628e0b65662fa2f49a9c685 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8eee5b4e96f48… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 10 11:39:20 2015 +0100 Updated bug entries #2173 --- .bugs/2173 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.bugs/2173 b/.bugs/2173 new file mode 100644 index 0000000..27a51af --- /dev/null +++ b/.bugs/2173 @@ -0,0 +1,19 @@ +Title: WATO backup: Do not save configuration files which are derived from omd configs +Component: wato +State: open +Date: 2015-03-10 11:30:33 +Targetversion: 1.2.7 +Class: bug + +Example: +Currently the file ~/etc/check_mk/multisite.d/mkeventd.mk can be stored in a WATO backup. +This file is automatically created by the OMD hook MKEVENTD. +If the snapshot is extracted on a site with a different configuration setting +there is a discrepancy, leading to errors.... + +Fix: +- OMD generated files are NEVER put into a WATO snapshot +- When creating a backup, each backup domain stores informations regarding the required + OMD configuration into a info file +- Upon snapshot restore, each backup domain checks if the requirements of this info file + are fulfilled. If not, it raises a warning and the snapshot can not get applied.

9 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2290

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f4a36f9f2eac5df52d39a3eed18f2f89f28c72b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f4a36f9f2eac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 10 09:25:40 2015 +0100 Updated bug entries #2290 --- .bugs/2290 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2290 b/.bugs/2290 new file mode 100644 index 0000000..c540e44 --- /dev/null +++ b/.bugs/2290 @@ -0,0 +1,11 @@ +Title: Clarify encoding within Check_MK (core) +Component: core +State: open +Date: 2015-03-10 09:24:00 +Targetversion: 1.2.7 +Class: nastiness + +We need to deal correctly with encoding within Check_MK. In Multisite we +have a clear situation. Everything is decoded to unicode strings when +reading into Check_MK. When writing out to external programs it's encoded +with UTF-8 again.

9 years, 6 months

Check_MK Git: check_mk: #2056 winperf_processor: additionally reports user and privileged(system) time

by Andreas Boesl

Module: check_mk Branch: master Commit: 06197e7adfabbf8299280b0fb8aab52c36e85018 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06197e7adfabbf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 9 16:49:08 2015 +0100 #2056 winperf_processor: additionally reports user and privileged(system) time The windows performance counter already provided this information, so there is no need to update anything. The check itself now reports the total utilization, as well as the user and privileged percentages. The pnp template has been updated accordingly. --- .werks/2056 | 13 +++ ChangeLog | 1 + checks/winperf_processor | 32 +++++-- pnp-templates/check_mk-winperf_processor.util.php | 100 ++++++++++++++++++++- 4 files changed, 136 insertions(+), 10 deletions(-) diff --git a/.werks/2056 b/.werks/2056 new file mode 100644 index 0000000..1a54767 --- /dev/null +++ b/.werks/2056 @@ -0,0 +1,13 @@ +Title: winperf_processor: additionally reports user and privileged(system) time +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425916010 +Class: feature + +The windows performance counter already provided this information, so there is +no need to update anything. The check itself now reports the total utilization, as +well as the user and privileged percentages. The pnp template has been updated +accordingly. + diff --git a/ChangeLog b/ChangeLog index b4debe9..34b1132 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 2099 ibm_svc_portsas, ibm_svc_portfc: checks now have a more meaningful service description if the device firmware supports it... NOTE: Please refer to the migration notes! * 1225 sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony... + * 2056 winperf_processor: additionally reports user and privileged(system) time... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/winperf_processor b/checks/winperf_processor index ed1309d..69120aa 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -42,16 +42,22 @@ def inventory_winperf_util(info): # params: levels for warn / crit in percentage def check_winperf_util(_no_item, params, info): if not info: - return 3, "Got no information from agent" + yield 3, "Got no information from agent" + return + this_time = int(float(info[0][0])) + what_map = { "-232": "util", + "-96": "user", + "-94": "privileged"} for line in info[1:]: - if line[0] == '-232': + if line[0] in what_map: + what = what_map[line[0]] # Windows sends one counter for each CPU plus one counter that # sums up to total (called _Total). We only need that last value. ticks = int(line[-2]) num_cpus = len(line) - 3 - ticks_per_sec = get_rate("winperf_util", this_time, ticks, onwrap = RAISE) + ticks_per_sec = get_rate("winperf_util.%s" % what, this_time, ticks, onwrap = RAISE) # We get the value of the PERF_100NSEC_TIMER_INV here. # This counter type shows the average percentage of active time observed # during the sample interval. This is an inverse counter. Counters of this @@ -60,7 +66,11 @@ def check_winperf_util(_no_item, params, info): # # 1 tick = 100ns, convert to seconds cpusecs_per_sec = ticks_per_sec / 10000000.0 - used_perc = 100.0 * (1 - cpusecs_per_sec) + + if what == "util": + used_perc = 100.0 * (1 - cpusecs_per_sec) + else: + used_perc = 100.0 * cpusecs_per_sec # Due to timeing invariancies the measured level can become > 100%. # This makes users unhappy, so cut it off. @@ -69,12 +79,16 @@ def check_winperf_util(_no_item, params, info): elif used_perc > 100: used_perc = 100 - state, infotext, perfdata = check_cpu_util(used_perc, params, this_time) - perfdata[0] = perfdata[0][:5] + (num_cpus,) - infotext += ", %d CPUs" % num_cpus - return state, infotext, perfdata + if what == "util": + state, infotext, perfdata = check_cpu_util(used_perc, params, this_time) + perfdata[0] = perfdata[0][:5] + (num_cpus,) + yield state, infotext, perfdata + elif what == "user": + yield 0, "%s perc: %.1f %%" % (what, used_perc), [(what, used_perc)] + else: # privileged + yield 0, "%s perc: %.1f %%" % (what, used_perc) - return (3, "counter for CPU (6) not found") + yield 0, "%d CPUs" % num_cpus check_info["winperf_processor.util"] = { diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php deleted file mode 120000 index a7d9073..0000000 --- a/pnp-templates/check_mk-winperf_processor.util.php +++ /dev/null @@ -1 +0,0 @@ -check_mk-esx_vsphere_hostsystem.cpu_usage.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php new file mode 100644 index 0000000..d9d232b --- /dev/null +++ b/pnp-templates/check_mk-winperf_processor.util.php @@ -0,0 +1,99 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Do not depend on numbers, use names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRD_AVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + +$num_threads = $MAX[1]; +$warnthreads = $WARN[1] * $num_threads / 100.0; +$critthreads = $CRIT[1] * $num_threads / 100.0; +$rightscale = 100.0 / $num_threads; + +$opt[1] = "--vertical-label 'Used CPU threads' --right-axis $rightscale:0 --right-axis-format '%4.1lf%%' --right-axis-label 'Utilization %' -l0 -ru $num_threads --title \"CPU Utilization for $hostname ($num_threads CPU threads)\" "; + +$def[1] = "DEF:perc=$RRD_AVG[util] " + . "CDEF:util=perc,$num_threads,*,100,/ " + . "DEF:userperc=$RRD_AVG[user] " + . "CDEF:user=userperc,$num_threads,*,100,/ " + . "CDEF:privileged=util,user,- " + . "CDEF:privilegedperc=privileged,$num_threads,/,100,* " + ; + +$def[1] .= "HRULE:$MAX[util]#0040d0:\"$num_threads CPU Threads\\n\" " + ; + +$def[1] .= "LINE:util#50b01a:\"Utilization\: \" " + . "GPRINT:perc:LAST:\"%4.1lf%%\" " + . "GPRINT:util:LAST:\"(%3.1lf Threads) \" " + . "GPRINT:perc:MIN:\"min\: %4.1lf%%,\t\" " + . "GPRINT:util:MIN:\"(%4.1lf), \" " + . "GPRINT:perc:MAX:\"max\: %4.1lf%%\" " + . "GPRINT:util:MAX:\"(%4.1lf)\\n\" " + + . "AREA:privileged#f03020:\"Privileged perc\:\" " + . "GPRINT:privilegedperc:LAST:\"%4.1lf%%\" " + . "GPRINT:privileged:LAST:\"(%3.1lf Threads) \" " + . "GPRINT:privilegedperc:MIN:\"min\: %4.1lf%%,\t\" " + . "GPRINT:privileged:MIN:\"(%4.1lf), \" " + . "GPRINT:privilegedperc:MAX:\"max\: %4.1lf%%\" " + . "GPRINT:privileged:MAX:\"(%4.1lf)\\n\" " + + . "AREA:user#6060f0:\"User perc\: \":STACK " + . "GPRINT:userperc:LAST:\"%4.1lf%%\" " + . "GPRINT:user:LAST:\"(%3.1lf Threads) \" " + . "GPRINT:userperc:MIN:\"min\: %4.1lf%%,\t\" " + . "GPRINT:user:MIN:\"(%4.1lf), \" " + . "GPRINT:userperc:MAX:\"max\: %4.1lf%%\" " + . "GPRINT:user:MAX:\"(%4.1lf)\\n\" " + ; + + +if (isset($RRD_AVG["avg"])) { + $def[1] .= "DEF:aperc=$RRD_AVG[avg] ". + "CDEF:avg=aperc,$num_threads,*,100,/ ". + "LINE:avg#004000:\"Averaged\: \" ". + "GPRINT:aperc:LAST:\"%.1lf%%,\" ". + "GPRINT:aperc:MIN:\"min\: %.1lf%%,\" ". + "GPRINT:aperc:MAX:\"max\: %.1lf%%\\n\" ". + ""; +} + +if ($WARN['util']) { + $def[1] .= "HRULE:$warnthreads#fff000:\"Warn at $WARN[util]% \" " + . "HRULE:$critthreads#ff0000:\"Critical at $CRIT[util]%\\n\" "; +} +else { + $def[1] .= "COMMENT:\"\\n\" "; +} + +?>

9 years, 6 months

Check_MK Git: check_mk: #2095 FIX oracle_crs_voting: Also handling voting disks with id 0 (seen on old CRS 10.2.0.5.0)

by Lars Michelsen

Module: check_mk Branch: master Commit: cb3ff63b0408976a626e4177dc05de6d20d3d393 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb3ff63b040897… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 9 15:41:36 2015 +0100 #2095 FIX oracle_crs_voting: Also handling voting disks with id 0 (seen on old CRS 10.2.0.5.0) Current CRS versions start enumerating the voting disks with number 1. These were handled by the agent before. We spotted a voting disk numbered with 0, this was detected with version 10.2.0.5.0. --- .werks/2095 | 12 ++++++++++++ ChangeLog | 1 + agents/plugins/mk_oracle_crs | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2095 b/.werks/2095 new file mode 100644 index 0000000..c5de0e9 --- /dev/null +++ b/.werks/2095 @@ -0,0 +1,12 @@ +Title: oracle_crs_voting: Also handling voting disks with id 0 (seen on old CRS 10.2.0.5.0) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425911976 + +Current CRS versions start enumerating the voting disks with number 1. These were +handled by the agent before. We spotted a voting disk numbered with 0, this was +detected with version 10.2.0.5.0. diff --git a/ChangeLog b/ChangeLog index 08625f1..b4debe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ * 2046 FIX: Replace GBit with Gbit, MBit with Mbit, KBit with Kbit... * 2098 FIX: ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost * 2094 FIX: Fixed missing agent section when ntpq times out after 5 seconds + * 2095 FIX: oracle_crs_voting: Also handling voting disks with id 0 (seen on old CRS 10.2.0.5.0)... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/plugins/mk_oracle_crs b/agents/plugins/mk_oracle_crs index 17df7e0..5bf2da2 100755 --- a/agents/plugins/mk_oracle_crs +++ b/agents/plugins/mk_oracle_crs @@ -85,7 +85,7 @@ function printcrsdata() { echo $crs_version echo "<<<oracle_crs_voting>>>" - $CRSCTL query css votedisk | grep "^ [1-9]" + $CRSCTL query css votedisk | grep "^ [0-9]" ps -e | grep crsd.bin > /dev/null || exit 0 echo "<<<oracle_crs_res:sep(124)>>>"

9 years, 6 months

Check_MK Git: check_mk: #2094 FIX Fixed missing agent section when ntpq times out after 5 seconds

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a23f9bf8bc846c6a703da440e813e56d674e856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a23f9bf8bc846… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 9 15:32:37 2015 +0100 #2094 FIX Fixed missing agent section when ntpq times out after 5 seconds --- .werks/2094 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2094 b/.werks/2094 new file mode 100644 index 0000000..49eaca6 --- /dev/null +++ b/.werks/2094 @@ -0,0 +1,10 @@ +Title: Fixed missing agent section when ntpq times out after 5 seconds +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425911550 + + diff --git a/ChangeLog b/ChangeLog index 7a5d67c..08625f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -240,6 +240,7 @@ * 2091 FIX: The check-mk-agent RPM packages can now update the old check_mk-agent named RPMs... * 2046 FIX: Replace GBit with Gbit, MBit with Mbit, KBit with Kbit... * 2098 FIX: ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost + * 2094 FIX: Fixed missing agent section when ntpq times out after 5 seconds Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index be6408e..6b2b316 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -393,7 +393,7 @@ fi # Time synchronization with NTP if type ntpq > /dev/null 2>&1 ; then # remove heading, make first column space separated - run_cached -s ntp 30 "waitmax 5 ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/'" + run_cached -s ntp 30 "waitmax 5 ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' || true" fi # Time synchronization with Chrony

9 years, 6 months

Check_MK Git: check_mk: #2093 FIX Fixed handling of check_mk commandline parameter "-c"

by Lars Michelsen

Module: check_mk Branch: master Commit: dc227f41f55d2848294f506344056d090129a109 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc227f41f55d28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 9 15:29:30 2015 +0100 #2093 FIX Fixed handling of check_mk commandline parameter "-c" --- .werks/2093 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/2093 b/.werks/2093 new file mode 100644 index 0000000..f2e42fb --- /dev/null +++ b/.werks/2093 @@ -0,0 +1,10 @@ +Title: Fixed handling of check_mk commandline parameter "-c" +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425911364 + + diff --git a/ChangeLog b/ChangeLog index d0566a4..7a5d67c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 2037 FIX: Inventorize piggy back data even if access to normal agent fails * 2016 FIX: Fixed service discovery / monitoring on hosts which have only piggyback data (e.g. ESX VMs)... * 2089 FIX: Debug mode shows details about errors in autochecks as expected now + * 2093 FIX: Fixed handling of check_mk commandline parameter "-c" Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API...

9 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015