Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: a29a37aad50546042021645e34f1877221a7c504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29a37aad50546… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Apr 26 13:26:58 2016 +0200 Fixed some spellings and formulations Conflicts: web/htdocs/metrics.py --- web/htdocs/metrics.py | 2 +- web/plugins/dashboard/dashlets.py | 2 +- web/plugins/views/painters.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index d92b21c..172fdbd3a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1467,7 +1467,7 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti else: raise MKGeneralException(_("Failed to calculate a graph definition.")) except MKLivestatusNotFoundError: - html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot reander graphs: cannot fetch data via Livestatus"))) + html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot render graphs: cannot fetch data via Livestatus"))) return # When the legend is enabled, we need to reduce the height by the height of the legend to diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 70d8d23..f32bcba 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -827,7 +827,7 @@ dashlet_types["snapin"] = { "parameters" : [ ('snapin', DropdownChoice( title = _('Snapin'), - help = _('Choose the snapin you like to show.'), + help = _('Choose the snapin you would like to show.'), choices = dashlet_snapin_get_snapins, )), ], diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e888ce4..4c04472 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -783,7 +783,7 @@ def paint_cache_info(row): cache_interval = row["service_cache_interval"] cache_age = time.time() - cached_at percentage = 100.0 * cache_age / cache_interval - return "", _("Cache generated %s ago, cache interval: %s, elapsed cache livetime: %s") % ( + return "", _("Cache generated %s ago, cache interval: %s, elapsed cache lifespan: %s") % ( age_human_readable(cache_age), age_human_readable(cache_interval), percent_human_redable(percentage)) multisite_painters["svc_check_cache_info"] = { diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 44664f2..98695eb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2166,11 +2166,11 @@ register_rule(group, register_rule(group, "non_inline_snmp_hosts", title = _("Hosts not using Inline-SNMP"), - help = _("Check_MK has an efficicient SNMP implementation called Inline-SNMP which reduces the " - "load produced by SNMP monitoring on the monitoring host significant. This option is " + help = _("Check_MK has an efficient SNMP implementation called Inline SNMP which reduces the " + "load produced by SNMP monitoring on the monitoring host significantly. This option is " "enabled by default for all SNMP hosts and it is a good idea to keep this default " - "settings. However, there are SNMP devices which have problems with this SNMP " - "implementation. You can use this rule to disable Inline-SNMP for these hosts.")) + "setting. However, there are SNMP devices which have problems with this SNMP " + "implementation. You can use this rule to disable Inline SNMP for these hosts.")) register_rule(group,

8 years, 2 months

Fixed a couple of typos

by Mathias Kettner

Module: check_mk Branch: master Commit: de24513024841176624f9a8c5582ddd54f74aa8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de245130248411… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 13:09:20 2016 +0200 Fixed a couple of typos --- web/plugins/metrics/check_mk.py | 4 ++-- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7dfdef5..88d7f24 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2621,13 +2621,13 @@ metric_info["connector_outlets"] = { } metric_info["qos_dropped_bytes_rate"] = { - "title" : _("Qos dropped bytes"), + "title" : _("QoS dropped bytes"), "unit" : "bytes/s", "color" : "41/a", } metric_info["qos_outbound_bytes_rate"] = { - "title" : _("Qos outbound bytes"), + "title" : _("QoS outbound bytes"), "unit" : "bytes/s", "color" : "26/a", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d804c1d..050ee54 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1445,7 +1445,7 @@ register_check_parameters( register_check_parameters( subgroup_storage, "blank_tapes", - _("Remaining blank tabes in DIVA CSM Devices"), + _("Remaining blank tapes in DIVA CSM Devices"), Tuple( elements = [ Integer(title = _("Warning below"), default_value = 5), @@ -4852,7 +4852,7 @@ register_check_parameters( ( "levels_swap", DualMemoryLevels(_("Swap"))), ( "levels_virtual", DualMemoryLevels(_("Total virtual memory"), ( 80.0, 90.0))), ( "levels_total", UpperMemoryLevels(_("Total Data in relation to RAM"), (120.0, 150.0), _("RAM"))), - ( "levels_shm", UpperMemoryLevels(_("Shared Memory"), ( 20.0, 30.0), _("RAM"))), + ( "levels_shm", UpperMemoryLevels(_("Shared memory"), ( 20.0, 30.0), _("RAM"))), ( "levels_pagetables", UpperMemoryLevels(_("Page tables"), ( 8.0, 16.0), _("RAM"))), ( "levels_writeback", UpperMemoryLevels(_("Disk Writeback"))), ( "levels_committed", UpperMemoryLevels(_("Committed memory"), (100.0, 150.0), _("RAM + Swap"))),

8 years, 2 months

3524 fileinfo, fileinfo.groups: both checks are now cluster ready

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e4a128ada44e0ee63a95059f2d6ed273008d7b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4a128ada44e0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 26 11:58:53 2016 +0200 3524 fileinfo, fileinfo.groups: both checks are now cluster ready fileinfo: The check now tries to find the file on all cluster nodes. fileinfo.groups: Fixed an exception when data came from multiple nodes. --- .werks/3524 | 11 +++++++++++ ChangeLog | 1 + checks/fileinfo | 25 +++++++++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.werks/3524 b/.werks/3524 new file mode 100644 index 0000000..0c169a0 --- /dev/null +++ b/.werks/3524 @@ -0,0 +1,11 @@ +Title: fileinfo, fileinfo.groups: both checks are now cluster ready +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461664629 +Class: feature + +fileinfo: The check now tries to find the file on all cluster nodes. + +fileinfo.groups: Fixed an exception when data came from multiple nodes. diff --git a/ChangeLog b/ChangeLog index 38d42ca..1c1fb4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 3423 papouch_th2e_sensors, papouch_th2e_sensors.dewpoint, papouch_th2e_sensors.humidity: new checks which monitor the temperature, dew point and humidity sensors of Papouch TH2E devices * 3473 fileinfo.groups: the include patterns now also support the pattern YESTERDAY, in addition to DATE... * 3428 bluenet2_powerrail, bluenet2_powerrail.rcm, bluenet2_powerrail.temp, bluenet2_powerrail.humidity: new checks for Bachmann Bluenet2 Powerrails which support the BACHMANN-bluenet2-MIB + * 3524 fileinfo, fileinfo.groups: both checks are now cluster ready... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/fileinfo b/checks/fileinfo index b5580c9..ff5201a 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -108,15 +108,19 @@ def check_fileinfo(item, params, info): if len(info) == 0: return (3, "no information sent by agent") - outof_range_txt = fileinfo_check_timeranges(params) - in_timerange = outof_range_txt == None - reftime = int(info[0][0]) + outof_range_txt = fileinfo_check_timeranges(params) + in_timerange = outof_range_txt == None + reftime = None check_definition = False - state_missing = params.get("state_missing", 3) - for line in info[1:]: + state_missing = params.get("state_missing", 3) + for line in info: + if len(line) == 1: + reftime = int(line[0]) + continue + if item == line[0]: if line[1] == "missing": - return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") + continue state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -127,6 +131,7 @@ def check_fileinfo(item, params, info): if check_definition == False: return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") + return fileinfo_check_function(check_definition, params, outof_range_txt) # Extracts patterns that are relevant for the current host and item. @@ -151,7 +156,7 @@ def check_fileinfo_groups(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) - reftime = int(info[0][0]) + reftime = None count_all = 0 age_oldest = None @@ -161,7 +166,11 @@ def check_fileinfo_groups(item, params, info): size_largest = 0 date_inclusion = "" # Start counting values on all files - for line in info[1:]: + for line in info: + if len(line) == 1: + reftime = int(line[0]) + continue + for pattern in params['precompiled_patterns']: inclusion, exclusion = pattern inclusion_tmp = fileinfo_process_date(inclusion,reftime)

8 years, 2 months

Fixed some typos

by Mathias Kettner

Module: check_mk Branch: master Commit: 43a1508cf69a4cfab45e44bdd43d8ddc1c2a82ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43a1508cf69a4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 11:36:50 2016 +0200 Fixed some typos --- web/htdocs/wato.py | 2 +- web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a92b6e8..d6eb611 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4387,7 +4387,7 @@ def mode_changelog(phase): html.icon_button(edit_url, _("Edit the properties of this site"), "edit") site_url = site.get("multisiteurl") if site_url: - html.icon_button(site_url, _("Open this site's local web user inteface"), "url", target="_blank") + html.icon_button(site_url, _("Open this site's local web user interface"), "url", target="_blank") # ID & Alias table.cell(_("ID"), site_id) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0deb98b..7dfdef5 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5045,7 +5045,7 @@ graph_info.append({ graph_info.append({ - "title" : _("Qos class traffic"), + "title" : _("QoS class traffic"), "metrics" : [ ( "qos_outbound_bytes_rate", "area" ), ( "qos_dropped_bytes_rate", "-area" ),

8 years, 2 months

Fixed some typos in help texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 3b80ad971ef1f30f900ced88b9237909c6c11b55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b80ad971ef1f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 11:00:44 2016 +0200 Fixed some typos in help texts --- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2c8f63a..44664f2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1845,7 +1845,7 @@ register_rule(group, )), ( "excluded_time", TimeofdayRanges( - title = _("Never discovery or activate changes in the following time ranges"), + title = _("Never do discovery or activate changes in the following time ranges"), help = _("This avoids automatic changes during these times so " "that the automatic system doesn't interfere with " "user activity."), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9e67552..d804c1d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -719,8 +719,8 @@ register_check_parameters( ], ), sameline = True, - label = _("Levels device time drifted"), - none_label = _("Time drifted levels not set"), + label = _("Levels for <i>device time drifted</i>"), + none_label = _("No levels set"), none_value = (None, None) ), Optional(

8 years, 2 months

fixed bug introduced in werk 3108 that lead to no interfaces being discovered

by Sebastian Herbord

Module: check_mk Branch: master Commit: 55dc49e85b5405032f786330bc61d203343fcf18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55dc49e85b5405… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 26 10:26:48 2016 +0200 fixed bug introduced in werk 3108 that lead to no interfaces being discovered --- checks/if.include | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checks/if.include b/checks/if.include index 2a056a5..e3bdbb2 100644 --- a/checks/if.include +++ b/checks/if.include @@ -224,6 +224,10 @@ def inventory_if_common(info, has_nodeinfo = False): global_seen = set() pre_inventory = [] + if not settings_sets: + # if there are no settings, use defaults + settings_sets.append({}) + for settings in settings_sets: uses_description = settings.get('use_desc', if_inventory_uses_description) uses_alias = settings.get('use_alias', if_inventory_uses_alias)

8 years, 2 months

Fixed typos in help texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 656018394f4d9295f231ce2ffd5727e20530160d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=656018394f4d92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 10:25:51 2016 +0200 Fixed typos in help texts --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7e09876..9e67552 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -731,8 +731,8 @@ register_check_parameters( ], ), sameline = True, - label = _("Levels device not responding"), - none_label = _("Not responding levels not set"), + label = _("Levels for <i>device not responding</i>"), + none_label = _("No levels set"), none_value = (None, None) ), ], @@ -8402,8 +8402,8 @@ register_check_parameters( default_value = "on" ), TextAscii( - title = _("Plug Item number or name"), - help = _("If you need the number or the name depends on the check. Just take a look to the service description. "), + title = _("Plug item number or name"), + help = _("Whether you need the number or the name depends on the check. Just take a look to the service description."), allow_empty = True), match_type = "first", )

8 years, 2 months

Fixed typo in help message

by Mathias Kettner

Module: check_mk Branch: master Commit: d9698dd36c2a610b18a99ffa901156cd4534fb6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9698dd36c2a61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 09:34:52 2016 +0200 Fixed typo in help message --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index edc8c1b..7e09876 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1977,7 +1977,7 @@ process_level_elements = [ title = _("Enable per-process details in long-output"), label = _("Enable per-process details"), help = _("If active, the long output of this service will contain a list of " - "all the matching processes and their details (i.e. pid, cpu usage, memory usage. " + "all the matching processes and their details (i.e. PID, CPU usage, memory usage). " "Please note that HTML output will only work if \"Escape HTML codes in plugin output\" is " "disabled in global settings. This might expose you to Cross-Site-Scripting (everyone " "with write-access to checks could get scripts executed on the monitoring site in the context "

8 years, 2 months

3428 bluenet2_powerrail, bluenet2_powerrail.rcm, bluenet2_powerrail.temp, bluenet2_powerrail.humidity: new checks for Bachmann Bluenet2 Powerrails which support the BACHMANN-bluenet2-MIB

by Simon Betz

Module: check_mk Branch: master Commit: f89732dbcec1ef10e132385e94415550b7cce7db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f89732dbcec1ef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 26 08:51:34 2016 +0200 3428 bluenet2_powerrail, bluenet2_powerrail.rcm, bluenet2_powerrail.temp, bluenet2_powerrail.humidity: new checks for Bachmann Bluenet2 Powerrails which support the BACHMANN-bluenet2-MIB --- .werks/3428 | 9 + ChangeLog | 1 + checkman/bluenet2_powerrail | 21 ++ checkman/bluenet2_powerrail.humidity | 18 ++ checkman/bluenet2_powerrail.rcm | 19 ++ checkman/bluenet2_powerrail.temp | 18 ++ checks/bluenet2_powerrail | 352 ++++++++++++++++++++++++++++++++++ checks/elphase.include | 28 +-- web/plugins/metrics/check_mk.py | 12 ++ web/plugins/wato/check_parameters.py | 18 +- 10 files changed, 483 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f89732dbce…

8 years, 2 months

3427 FIX mssql_counters.sqlstats: fixed rate calculation

by Simon Betz

Module: check_mk Branch: master Commit: 611b64cbd79b5c27f19a6c442e620949a7b4bb7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611b64cbd79b5c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 25 18:45:56 2016 +0200 3427 FIX mssql_counters.sqlstats: fixed rate calculation --- .werks/3427 | 10 ++++++++++ ChangeLog | 1 + checks/mssql_counters | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3427 b/.werks/3427 new file mode 100644 index 0000000..4c57cb4 --- /dev/null +++ b/.werks/3427 @@ -0,0 +1,10 @@ +Title: mssql_counters.sqlstats: fixed rate calculation +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461602704 + + diff --git a/ChangeLog b/ChangeLog index f3617a4..3eb46b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -185,6 +185,7 @@ * 3523 FIX: esx_vsphere_hostsystem: fixed exception when no multipath state info is available * 3425 FIX: Fixed extra section handling if no related check plugin exists * 3465 FIX: df: Fix displayed vertical range of graph of all filesystem checks... + * 3427 FIX: mssql_counters.sqlstats: fixed rate calculation Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mssql_counters b/checks/mssql_counters index 7867eff..5bb9861 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -244,7 +244,8 @@ def check_mssql_counters_sqlstats(item, params, info): for line in info: if mssql_counters_item(line, True) == item: counter_type = item.split()[-1] - rate = float(line[-1]) + rate = get_rate("mssql_counters_sqlstats.%s.%s" % \ + (counter_type, item), time.time(), float(line[-1])) status = 0 infotext = "%.1f/sec" % rate

8 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016