Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: multisite: fixed garbled description for sorter ' Service performance data'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0104ca6d449dff8ffa5502b987e13dc52c6fe49c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0104ca6d449dff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 15:30:53 2012 +0200 multisite: fixed garbled description for sorter 'Service performance data' --- ChangeLog | 1 + web/plugins/views/sorters.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c40c691..f572302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * WATO Folder Filter no longer available in single host views * Added new painters "Service check command expanded" and "Host check command expanded" + * FIX: Corrected garbled description for sorter "Service Performance data" Livestatus: * Added new table statehist, used for SLA queries diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index dcab883..cd7f0b4 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -160,14 +160,14 @@ def cmp_perfdata_nth_value(r1, r2, n): return cmp(savefloat(get_perfdata_nth_value(r1, n)), savefloat(get_perfdata_nth_value(r2, n))) multisite_sorters['svc_perf_val01'] = { - "title" : _("Service performance data - value number %02d") % 1, + "title" : _("Service performance data - value number %02d" % 1), "columns" : [ 'service_perf_data' ], "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 0), } multisite_sorters['svc_perf_val02'] = { - "title" : _("Service performance data - value number %02d"), + "title" : _("Service performance data - value number %02d" % 2), "columns" : [ 'service_perf_data' ], - "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 1 % 2), + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 1), } multisite_sorters['svc_perf_val03'] = { "title" : _("Service performance data - value number %02d" % 3),

11 years, 11 months

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: 453e2cc3c2bc2a720b3b573ed3030ac9f240d050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453e2cc3c2bc2a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 15:31:03 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fb51a913ca7c40eeeabb513896d57b874537c36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fb51a913ca7c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 15:26:12 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: ntp/ntp. time parameters are now configurable via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25a1a93d15f74c373dec9c277be696cc1d009bf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a1a93d15f74c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 15:25:26 2012 +0200 ntp/ntp.time parameters are now configurable via WATO --- ChangeLog | 1 + checks/ntp | 3 +++ web/plugins/wato/check_parameters.py | 31 ++++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82f49b7..cf16cc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ WATO: * Added progress indicator in single site WATO "Activate Changes" * Users & Contacts: Case-insensitive sorting of 'Full name' column + * ntp/ntp.time parameters are now configurable via WATO * FIX: Implemented basic non HTTP 200 status code response handling in interactive progress dialogs (e.g. bulk inventory mode) * FIX: Fixed editing of icon_image rules diff --git a/checks/ntp b/checks/ntp index 2fa39ae..ee3bc80 100644 --- a/checks/ntp +++ b/checks/ntp @@ -153,4 +153,7 @@ def check_ntp_summary(item, params, info): return (2, "CRIT - found %d peers, but none is suitable" % len(info)) check_info['ntp'] = (check_ntp, "NTP Peer %s", 1, inventory_ntp) +checkgroup_of['ntp'] = 'ntp_time' + check_info['ntp.time'] = (check_ntp_summary, "NTP Time", 1, inventory_ntp_summary) +checkgroup_of['ntp.time'] = 'ntp_time' diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4cc68e9..9a2b960 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -321,7 +321,7 @@ checkgroups.append(( checkgroups.append(( subgroup_os, "systemtime", - _("System time offset"), + _("Windows system time offset"), Tuple( title = _("Time offset"), elements = [ @@ -1718,6 +1718,35 @@ checkgroups.append(( help = _("The identificator of the themal sensor.")), "first")) +checkgroups.append(( + subgroup_os, + "ntp_time", + _("State of NTP time synchronisation"), + Tuple( + elements = [ + Integer( + title = _("Max. allowed stratum"), + default_value = 10, + help = _("The stratum (\"distance\" to the reference clock) at which the check gets critical."), + ), + Float( + title = _("Warning at"), + unit = _("Miliseconds"), + default_value = 200.0, + help = _("The offset in ms at which a warning state is triggered."), + ), + Float( + title = _("Critical at"), + unit = _("Miliseconds"), + default_value = 500.0, + help = _("The offset in ms at which a critical state is triggered."), + ), + ] + ), + None, + "first" +)) + # Create rules for check parameters of inventorized checks for subgroup, checkgroup, title, valuespec, itemspec, matchtype in checkgroups: if not valuespec:

11 years, 11 months

Check_MK Git: check_mk: resolved merge conflict in changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85106d2b8bca4f55065bcddc5779fed1b2c0e595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85106d2b8bca4f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 15:06:02 2012 +0200 resolved merge conflict in changelog ---

11 years, 11 months

Check_MK Git: check_mk: livestatus: environment_macros warning updated

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c8263b7d965a0c8b614eb8d2bc9a18e0596209d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8263b7d965a0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 12:49:59 2012 +0200 livestatus: environment_macros warning updated --- livestatus/src/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index dcb25b7..acef1ff 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -799,7 +799,7 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han logger(LG_INFO, "Your event_broker_options are sufficient for livestatus.."); if (enable_environment_macros == 1) - logger(LG_INFO, "Warning: environment_macros are enabled"); + logger(LG_INFO, "Warning: environment_macros are enabled. This might decrease the overall nagios performance"); store_init(); register_callbacks();

11 years, 11 months

Check_MK Git: check_mk: Check_MK service now able to output additional performance data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7400da0bb58a4a5ecb1bd08e508442d73a2853e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7400da0bb58a4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 15:04:25 2012 +0200 Check_MK service now able to output additional performance data user_time, system_time, children_user_time, children_system_time --- ChangeLog | 3 ++ modules/check_mk.py | 2 + modules/check_mk_base.py | 9 +++++++- pnp-templates/check-mk.php | 29 ++++++++++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 10 +++++++++ 5 files changed, 52 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbf50d7..bbb2b60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,9 @@ Checks & Agents: * New check mssql_counters.locks: Monitors locking related information of MSSQL tablespaces + * Check_MK service is now able to output additional performance data + user_time, system_time, children_user_time, children_system time + 1.2.0p3: Mulitisite diff --git a/modules/check_mk.py b/modules/check_mk.py index 1e8b667..5b8d352 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -219,6 +219,7 @@ cluster_max_cachefile_age = 90 # secs. simulation_mode = False agent_simulator = False perfdata_format = "pnp" # also possible: "standard" +check_mk_perfdata_with_times = False debug_log = None monitoring_host = None # deprecated max_num_processes = 50 @@ -2623,6 +2624,7 @@ no_inventory_possible = None 'snmpwalks_dir', 'check_mk_basedir', 'nagios_user', 'www_group', 'cluster_max_cachefile_age', 'check_max_cachefile_age', 'simulation_mode', 'agent_simulator', 'aggregate_check_mk', 'debug_log', + 'check_mk_perfdata_with_times' ]: output.write("%s = %r\n" % (var, globals()[var])) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fbe2f6f..2778f0e 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -738,7 +738,14 @@ def do_check(hostname, ipaddress, only_check_types = None): close_checkresult_file() run_time = time.time() - start_time - output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + if check_mk_perfdata_with_times: + times = os.times() + output += "execution time %.1f sec|execution_time=%.3f user_time=%.3f "\ + "system_time=%.3f children_user_time=%.3f children_system_time=%.3f\n" %\ + (run_time, run_time, times[0], times[1], times[2], times[3]) + else: + output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + sys.stdout.write(output) sys.exit(status) diff --git a/pnp-templates/check-mk.php b/pnp-templates/check-mk.php index 5ea7b6f..f37e76c 100644 --- a/pnp-templates/check-mk.php +++ b/pnp-templates/check-mk.php @@ -33,4 +33,33 @@ $def[1] .= "LINE1:extime#d020a0: "; $def[1] .= "GPRINT:extime:LAST:\"current\: %.2lf s\" "; $def[1] .= "GPRINT:extime:MAX:\"max(+/-)\: %.2lf s \" "; $def[1] .= "GPRINT:extime:AVERAGE:\"avg(+/-)\: %.2lf s\" "; + +if (isset($RRDFILE[2])) { + +$opt[2] = "--vertical-label 'time (s)' -l 0 --title '$hostname: Check_MK process times' "; +$def[2] = "DEF:user_time=$RRDFILE[2]:$DS[1]:MAX "; +$def[2] .= "LINE1:user_time#d020a0:\"user time\" "; +$def[2] .= "GPRINT:user_time:LAST:\" current\: %.2lf s\" "; +$def[2] .= "GPRINT:user_time:MAX:\"max(+/-)\: %.2lf s \" "; +$def[2] .= "GPRINT:user_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; + +$def[2] .= "DEF:system_time=$RRDFILE[3]:$DS[1]:MAX "; +$def[2] .= "LINE1:system_time#d08400:\"system time\" "; +$def[2] .= "GPRINT:system_time:LAST:\" current\: %.2lf s\" "; +$def[2] .= "GPRINT:system_time:MAX:\"max(+/-)\: %.2lf s \" "; +$def[2] .= "GPRINT:system_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; + +$def[2] .= "DEF:children_user_time=$RRDFILE[4]:$DS[1]:MAX "; +$def[2] .= "LINE1:children_user_time#308400:\"childr. user time \" "; +$def[2] .= "GPRINT:children_user_time:LAST:\" current\: %.2lf s\" "; +$def[2] .= "GPRINT:children_user_time:MAX:\"max(+/-)\: %.2lf s \" "; +$def[2] .= "GPRINT:children_user_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; + +$def[2] .= "DEF:children_system_time=$RRDFILE[5]:$DS[1]:MAX "; +$def[2] .= "LINE1:children_system_time#303400:\"childr. system time\" "; +$def[2] .= "GPRINT:children_system_time:LAST:\"current\: %.2lf s\" "; +$def[2] .= "GPRINT:children_system_time:MAX:\"max(+/-)\: %.2lf s \" "; +$def[2] .= "GPRINT:children_system_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +} + ?> diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index a54857d..039fb19 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -342,6 +342,16 @@ register_configvar(group, ("file", _("Create check files")) ]), need_restart = True) +register_configvar(group, + "check_mk_perfdata_with_times", + Checkbox(title = _("Check_MK with times performance data"), + label = _("Return process times within performance data"), + help = _("Enabling this option results in additional performance data " + "for the Check_MK output, giving information regarding the process times. " + "It provides the following fields: user_time, system_time, children_user_time " + "and children_system_time")), + need_restart = True) + group = _("Inventory - automatic service detection") register_configvar(group,

11 years, 11 months

Check_MK Git: check_mk: FIX: mssql_counters checks now really only inventorize percentage based

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01eac7115109eb2792fbe69f4bf79823a783ca88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01eac7115109eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 14:17:23 2012 +0200 FIX: mssql_counters checks now really only inventorize percentage based counters if a base value is set --- ChangeLog | 2 ++ checks/mssql_counters | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b647584..82f49b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,8 @@ MSSQL tablespaces * windows_updates agent plugin: Fetching data in background mode, caching update information for 30 minutes + * FIX: mssql_counters checks now really only inventorize percentage based + counters if a base value is set 1.2.0p3: Mulitisite diff --git a/checks/mssql_counters b/checks/mssql_counters index 6d5e1b6..f243a2b 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -59,7 +59,8 @@ def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, if perc_w_base: base = 0.0 for line2 in info: - if line2[1] == this_counter + '_base': + if mssql_counters_item(line2, add_counter_name) == \ + mssql_counters_item(line, add_counter_name) + '_base': base = float(line2[-1]) break if base == 0.0: @@ -76,6 +77,7 @@ def check_mssql_counters_perc(item, params, info, perc_w_base = True): counter_name = None value = None base = None + for line in info: if mssql_counters_item(line, True) == item: value = float(line[-1])

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cef64482747fd1a4d21186c84cf957d12bb1b45b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cef64482747fd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 14:45:30 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 16a0ed00c8b7601dd59b0b11c1ec60dc7694271b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16a0ed00c8b760… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 13:39:52 2012 +0200 Add new bug entry --- .bugs/808 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/808 b/.bugs/808 new file mode 100644 index 0000000..3a12f92 --- /dev/null +++ b/.bugs/808 @@ -0,0 +1,12 @@ +Title: Handle ctrl-c for inventory +Component: core +State: open +Date: 2012-10-10 13:37:24 +Targetversion: 1.2.0 +Class: cleanup + +Currently, trying to abort an inventory only kills the current inventory. If you +have simply specified cmk -I you'll need to abort as many times as there are h +hosts +It would be nice to be able to press ctrl-c once and have that handled by +cmk so that it aborts the whole process, ideally in a consistent state.

11 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012