Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

3560 emcvnx_disks: now able to configure states for hard read/

by Andreas Boesl

write errors and when enclosure rebuilds Message-ID: <57aae641.rV0cylrJwnRfaLlB%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3a9697cf342891d9506d248e9a8c30d0198baaaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a9697cf342891… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 10 10:30:32 2016 +0200 3560 emcvnx_disks: now able to configure states for hard read/write errors and when enclosure rebuilds --- .werks/3560 | 9 +++++++++ ChangeLog | 1 + checks/emcvnx_disks | 20 ++++++++++++-------- web/plugins/wato/check_parameters.py | 32 +++++++++++++++++++++++++++++++- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/.werks/3560 b/.werks/3560 new file mode 100644 index 0000000..3400e28 --- /dev/null +++ b/.werks/3560 @@ -0,0 +1,9 @@ +Title: emcvnx_disks: now able to configure states for hard read/write errors and when enclosure rebuilds +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470817777 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e4e6329..9a65d47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ * 3725 mssql_instance: Changed MSSQL monitoring to report connection issues with only one service... * 3732 esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster: Providing mem_total as dedicated metric * 3712 ispro_sensors_temp, ispro_sensors_humid, ispro_sensors_digital: new checks which monitor Interseptro Pro devices which support the ISPRO-MIB + * 3560 emcvnx_disks: now able to configure states for hard read/write errors and when enclosure rebuilds * 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/emcvnx_disks b/checks/emcvnx_disks index 92942c2..c717bc3 100644 --- a/checks/emcvnx_disks +++ b/checks/emcvnx_disks @@ -134,13 +134,16 @@ def inventory_emcvnx_disks(parsed): inventory = [] for disk in parsed: if parsed[disk]["state"] != "Empty": - inventory.append((disk, None)) + inventory.append((disk, {})) return inventory -def check_emcvnx_disks(item, _no_params, parsed): +def check_emcvnx_disks(item, params, parsed): now = time.time() perfdata = [] + if params == None: # convert legacy params + params = {} + if item not in parsed: return 3, "Enclosure %s not found in agent output" % item @@ -149,8 +152,8 @@ def check_emcvnx_disks(item, _no_params, parsed): if diskstate in ["Unbound", "Hot Spare Ready", "Enabled", "Ready"]: nagstate = 0 elif diskstate == "Rebuilding": - nagstate = 1 - message += " (!)" + nagstate = params.get("state_rebuilding", 1) + message += " %s" % state_markers[nagstate] else: nagstate = 2 message += " (!!)" @@ -160,14 +163,14 @@ def check_emcvnx_disks(item, _no_params, parsed): read_errors = parsed[item]["Hard Read Errors"] message += ", Hard Read Errors: %s" % read_errors if read_errors > 0: - nagstate = 2 - message += " (!!)" + nagstate = params.get("state_read_error", 2) + message += " %s" % state_markers[nagstate] write_errors = parsed[item]["Hard Write Errors"] message += ", Hard Write Errors: %s" % write_errors if write_errors > 0: - nagstate = 2 - message += " (!!)" + nagstate = params.get("state_write_error", 2) + message += " %s" % state_markers[nagstate] read_bytes = parsed[item]["Kbytes Read"] * 1024 write_bytes = parsed[item]["Kbytes Written"] * 1024 @@ -190,5 +193,6 @@ check_info['emcvnx_disks'] = { "inventory_function" : inventory_emcvnx_disks, "check_function" : check_emcvnx_disks, "service_description" : "Enclosure %s", + "group" : "emcvnx_disks", "has_perfdata" : True, } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5b848f2..573cdc0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2310,6 +2310,37 @@ register_check_parameters( match_type = "dict" ) +register_check_parameters( + subgroup_storage, + "emcvnx_disks", + _("EMC VNX Enclosures"), + Dictionary( + elements = [ + ("state_read_error", + MonitoringState( + default_value = 2, + title = _("State on hard read error") + ) + ), + ("state_write_error", + MonitoringState( + default_value = 2, + title = _("State on hard write error") + ) + ), + ("state_rebuilding", + MonitoringState( + default_value = 1, + title = _("State when rebuildung enclosure") + ) + ), + ] + ), + TextAscii( + title = _("Enclosure ID"), + allow_empty = True), + match_type = "dict", +) #. @@ -12131,4 +12162,3 @@ register_check_parameters( TextAscii( title = _("Node ID")), "first" ) -

8 years, 1 month

C => C++

by Sven Panne

Module: check_mk Branch: master Commit: 8d2018f593ebd843129cdae857ef92254eea1052 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d2018f593ebd8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 10 08:33:49 2016 +0200 C => C++ --- bin/Makefile | 12 +-- bin/{mkevent.c => mkevent.cc} | 120 +++++++++++++---------- bin/{mkeventd_open514.c => mkeventd_open514.cc} | 63 ++++++------ 3 files changed, 107 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d2018f593…

8 years, 1 month

clang-formatted.

by Sven Panne

Module: check_mk Branch: master Commit: 4325f4445dcbebc933c8fe6fc63a8191f19f0fbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4325f4445dcbeb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 16:27:57 2016 +0200 clang-formatted. --- livestatus/src/Query.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 0078ffb..12b6373 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -39,7 +39,7 @@ #include "RendererBrokenCSV.h" #include "VariadicFilter.h" #include "data_encoding.h" -#include "nagios.h" // IWYU pragma: keep +#include "nagios.h" // IWYU pragma: keep #include "opids.h" class Aggregator; class Column;

8 years, 1 month

Make the data encoding a scoped enum.

by Sven Panne

Module: check_mk Branch: master Commit: f825a5642de1db445602f6f407e0e5a8f9317e99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f825a5642de1db… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 16:25:21 2016 +0200 Make the data encoding a scoped enum. --- livestatus/src/Query.cc | 2 +- livestatus/src/Query.h | 7 ++++--- livestatus/src/Renderer.cc | 21 +++++++++------------ livestatus/src/Renderer.h | 9 +++++---- livestatus/src/RendererBrokenCSV.cc | 2 +- livestatus/src/RendererBrokenCSV.h | 3 ++- livestatus/src/RendererCSV.cc | 2 +- livestatus/src/RendererCSV.h | 3 ++- livestatus/src/RendererJSON.cc | 2 +- livestatus/src/RendererJSON.h | 3 ++- livestatus/src/RendererPython.cc | 2 +- livestatus/src/RendererPython.h | 4 +++- livestatus/src/RendererPython3.cc | 2 +- livestatus/src/RendererPython3.h | 4 +++- livestatus/src/Store.cc | 3 ++- livestatus/src/data_encoding.h | 4 +--- livestatus/src/module.cc | 8 ++++---- 17 files changed, 43 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f825a5642d…

8 years, 1 month

Updated help text of Check State of BI Aggregation

by Marcel Arentz

Module: check_mk Branch: master Commit: b7734827b955bb5b5d826425f4df250e2c54e2d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7734827b955bb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Aug 9 15:59:44 2016 +0200 Updated help text of Check State of BI Aggregation --- web/plugins/wato/active_checks.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index edb4755..20140a4 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1531,17 +1531,18 @@ register_rule(group, elements = [ TextAscii( title = _("Base URL (OMD Site)"), - help = _("The base URL to the monitoring instance. For example <tt>http://mycheckmk01/mysite</tt>. You can use " - "macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this URL to make them be replaced by " - "the hosts values."), + help = _("The base URL to the monitoring instance. For example <tt>http://mycheckmk01/mysite</tt>. " + "You can use macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this URL to " + "make them be replaced by the hosts values."), size = 60, allow_empty = False ), TextAscii( title = _("Aggregation Name"), - help = _("The name of the aggregation to fetch. It will be added to the service description. You can use " - "macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this parameter to make them be replaced by " - "the hosts values."), + help = _("The name of the aggregation to fetch. It will be added to the service description. You can " + "use macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this parameter to " + "make them be replaced by the hosts values. The aggregation name is the title in the " + "top-level-rule of your BI pack."), allow_empty = False ), TextAscii( @@ -1554,7 +1555,7 @@ register_rule(group, Password( title = _("Password / Secret"), help = _("Valid automation secret or password for the user, depending on the chosen " - "authentication mode."), + "authentication mode. Be aware that this mode has to be enabled on the monitoring instance. " "Otherwise authentication will fail."), allow_empty = False ), Dictionary(

8 years, 1 month

Refactoring: Use 'for' instead of 'while' where it makes sense.

by Sven Panne

Module: check_mk Branch: master Commit: 1c06cedf2d10cc356c5891f382c5cb88c168d16b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c06cedf2d10cc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 14:18:00 2016 +0200 Refactoring: Use 'for' instead of 'while' where it makes sense. This makes the intention much clearer: We do not randomly do things with the loop variable, we just do some kind of iteration. --- livestatus/src/ContactgroupsColumn.cc | 10 ++++----- livestatus/src/CustomTimeperiodColumn.cc | 5 ++--- livestatus/src/CustomVarsExplicitColumn.cc | 5 ++--- livestatus/src/CustomVarsFilter.cc | 4 ++-- livestatus/src/HostgroupsColumn.cc | 8 +++----- livestatus/src/HostlistColumn.cc | 7 ++----- livestatus/src/HostlistStateColumn.cc | 15 ++++++-------- livestatus/src/LogEntry.cc | 2 +- livestatus/src/Logfile.cc | 18 +++++++---------- livestatus/src/OffsetStringMacroColumn.cc | 3 +-- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/PerfdataAggregator.cc | 3 +-- livestatus/src/Query.cc | 8 +++----- livestatus/src/ServiceSpecialDoubleColumn.cc | 5 ++--- livestatus/src/ServicegroupsColumn.cc | 7 +++---- livestatus/src/ServicelistColumn.cc | 13 +++++------- livestatus/src/ServicelistStateColumn.cc | 5 ++--- livestatus/src/TableContactgroups.cc | 4 +--- livestatus/src/TableContacts.cc | 4 +--- livestatus/src/TableHostgroups.cc | 4 +--- livestatus/src/TableServicegroups.cc | 4 +--- livestatus/src/TableStateHistory.cc | 3 +-- livestatus/src/TableTimeperiods.cc | 4 +--- livestatus/src/TimeperiodsCache.cc | 12 +++-------- livestatus/src/VariadicFilter.cc | 2 +- livestatus/src/module.cc | 28 +++++++++----------------- livestatus/src/strutil.cc | 4 ++-- 27 files changed, 68 insertions(+), 121 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1c06cedf2d…

8 years, 1 month

fixed empty choices handling in cascadingdropdown valuespec

by Simon Betz

Module: check_mk Branch: master Commit: 3bbc1ad0600ed56499ab2929ef5e4d30cf4abb0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bbc1ad0600ed5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 9 13:17:24 2016 +0200 fixed empty choices handling in cascadingdropdown valuespec --- web/htdocs/valuespec.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6440e81..3ebb50b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1400,6 +1400,9 @@ class CascadingDropdown(ValueSpec): else: self._encoding_type = tuple + self._no_elements_text = kwargs.get("no_elements_text", + _("There are no elements defined for this selection")) + def normalize_choices(self, choices): new_choices = [] @@ -1417,6 +1420,9 @@ class CascadingDropdown(ValueSpec): def canonical_value(self): choices = self.choices() + if not choices: + return None + if choices[0][2]: return self._encoding_type((choices[0][0], choices[0][2].canonical_value())) else: @@ -1427,6 +1433,9 @@ class CascadingDropdown(ValueSpec): return self._default_value except: choices = self.choices() + if not choices: + return None + if choices[0][2]: return self._encoding_type((choices[0][0], choices[0][2].default_value())) else: @@ -1436,6 +1445,10 @@ class CascadingDropdown(ValueSpec): def_val = '0' options = [] choices = self.choices() + if not choices: + html.write(self._no_elements_text) + return + for nr, (val, title, vs) in enumerate(choices): options.append((str(nr), title)) # Determine the default value for the select, so the

8 years, 1 month

Nuke even more generated files.

by Sven Panne

Module: check_mk Branch: master Commit: b356e98a501962674ce968a2cccc541839d0fda8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b356e98a501962… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 11:11:54 2016 +0200 Nuke even more generated files. --- livestatus/.gitignore | 2 + livestatus/config.guess | 1444 ------------------------------------- livestatus/config.sub | 1813 ----------------------------------------------- livestatus/configure.ac | 3 + 4 files changed, 5 insertions(+), 3257 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b356e98a50…

8 years, 1 month

3772 FIX ipmi_sensors: fixed missing states

by Simon Betz

Module: check_mk Branch: master Commit: 84a355cdffd0fc6848820238222b7699867ef656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84a355cdffd0fc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 9 11:02:04 2016 +0200 3772 FIX ipmi_sensors: fixed missing states --- .werks/3772 | 10 ++++++++++ ChangeLog | 1 + checks/ipmi_sensors | 16 ++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.werks/3772 b/.werks/3772 new file mode 100644 index 0000000..b857510 --- /dev/null +++ b/.werks/3772 @@ -0,0 +1,10 @@ +Title: ipmi_sensors: fixed missing states +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470733291 + + diff --git a/ChangeLog b/ChangeLog index 05ceab6..e4e6329 100644 --- a/ChangeLog +++ b/ChangeLog @@ -327,6 +327,7 @@ * 3734 FIX: esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing * 3759 FIX: cpu.loads: Fixed possible crash on missing data * 3715 FIX: agent_ipmi_sensors: fixed error handling + * 3772 FIX: ipmi_sensors: fixed missing states Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ipmi_sensors b/checks/ipmi_sensors index 43a8412..87254f8 100644 --- a/checks/ipmi_sensors +++ b/checks/ipmi_sensors @@ -76,7 +76,6 @@ # 875 Power_Supply_PS_Status NA_NA_(NA/NA) [Presence_detected] - def inventory_freeipmi(info): return [ (line[1], "", None) for line in info if not ( line[-1] in ['[Unknown]', '[NA]'] or @@ -131,14 +130,15 @@ def check_freeipmi(item, _no_params, info): perfdata = [] infotext = "Current value %.1f%s%s" % (current, unit, levelstext) - if status == "OK" \ - or status == "Entity_Present" \ - or status.endswith("is_connected") \ - or status.endswith("Presence_detected") \ - or status == "battery_presence_detected" \ - or status == "Drive_Presence" \ - or status.startswith("Fully_Redundant"): + + if status in [ "OK", "Entity_Present", "battery_presence_detected", + "Drive_Presence", "transition_to_Running", "Device_Enabled" ] or \ + status.startswith("Fully_Redundant") or \ + status.endswith("is_connected") or \ + status.endswith("Presence_detected") or \ + status.endswith("Device_Present"): return (0, infotext, perfdata) + else: return (2, infotext, perfdata)

8 years, 1 month

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 33f792cf909f58c903fef2ce45b7ee79f4ceaaf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33f792cf909f58… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 9 11:01:07 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 791d825..0235404 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3772 +3782

8 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016