Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6c69c18642f9e365fe0ea02111b892f2f1625732 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c69c18642f9e3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 8 13:48:28 2017 +0200 Reserved 10 Werk IDS Change-Id: Id49ceec2c7bb22bbca4369d4f9830e81a6e05b36 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d8526bd..758c203 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4798 +4808

7 years

4776 FIX solaris_psrinfo: Fixed handling of newer output eg. of Solaris SPARC T5

by Simon Betz

Module: check_mk Branch: master Commit: 37314b619a9c1bfa8876029a87beddc4b07014ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37314b619a9c1b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 13:18:25 2017 +0200 4776 FIX solaris_psrinfo: Fixed handling of newer output eg. of Solaris SPARC T5 Change-Id: Ibed192241c93acdb796111529fd13641c60d7e32 --- .werks/4776 | 11 +++++++++++ inventory/solaris_psrinfo | 26 ++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.werks/4776 b/.werks/4776 new file mode 100644 index 0000000..6ce0224 --- /dev/null +++ b/.werks/4776 @@ -0,0 +1,11 @@ +Title: solaris_psrinfo: Fixed handling of newer output eg. of Solaris SPARC T5 +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496920610 + + diff --git a/inventory/solaris_psrinfo b/inventory/solaris_psrinfo index 5821ae7..596e1d1 100644 --- a/inventory/solaris_psrinfo +++ b/inventory/solaris_psrinfo @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#Example output: + #<<<solaris_psrinfo:persist(1405715354)>>> #The physical processor has 8 virtual processors (0-7) # SPARC64-VII+ (portid 1024 impl 0x7 ver 0xc1 clock 2660 MHz) @@ -35,12 +35,30 @@ #The physical processor has 8 virtual processors (24-31) # SPARC64-VII+ (portid 1048 impl 0x7 ver 0xc1 clock 2660 MHz) +#<<<solaris_psrinfo:persist(1405715354)>>> +#The physical processor has 10 cores and 80 virtual processors (0-79) +# The core has 8 virtual processors (0-7) +# The core has 8 virtual processors (8-15) +# The core has 8 virtual processors (16-23) +# The core has 8 virtual processors (24-31) +# The core has 8 virtual processors (32-39) +# The core has 8 virtual processors (40-47) +# The core has 8 virtual processors (48-55) +# The core has 8 virtual processors (56-63) +# The core has 8 virtual processors (64-71) +# The core has 8 virtual processors (72-79) +# SPARC-T5 (chipid 0, clock 3600 MHz) + +#<<<solaris_psrinfo:persist(1405715354)>>> +#The physical processor has 8 virtual processors (0-7) +# SPARC-T5 (chipid 0, clock 3600 MHz) + def inv_solaris_psrinfo(info): - solaris_uname = {} node = inv_tree("hardware.cpu.") - node["Model"] = info[1][0] - node["Maximum Speed"] = "%s %s" %(info[1][-2], info[1][-1].strip(')') ) + node["Model"] = info[-1][0] + node["Maximum Speed"] = "%s %s" %(info[-1][-2], info[-1][-1].strip(')') ) + inv_info['solaris_psrinfo'] = { "inv_function" : inv_solaris_psrinfo,

7 years

4792 FIX Fixed wrong unit in graph for tape utilization

by Marcel Arentz

Module: check_mk Branch: master Commit: 0bc4aba2baec9fede66385d996dce26ce09168f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bc4aba2baec9f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 12:13:35 2017 +0200 4792 FIX Fixed wrong unit in graph for tape utilization The unit has been percent but the it's actually a counter for used tapes if all of them would be completely filled up. Thanks to Peter Husemann for this hint. Change-Id: I9be7c7fb4f159afe8f2afeb783f81543e8d0f03e --- .werks/4792 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4792 b/.werks/4792 new file mode 100644 index 0000000..d7dc030 --- /dev/null +++ b/.werks/4792 @@ -0,0 +1,11 @@ +Title: Fixed wrong unit in graph for tape utilization +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496916692 +Class: fix + +The unit has been percent but the it's actually a counter for used tapes if all +of them would be completely filled up. Thanks to Peter Husemann for this hint. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3bf4b54..91444f6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1077,7 +1077,7 @@ metric_info["tapes_free"] = { metric_info["tapes_util"] = { "title" : _("Tape utilization"), - "unit" : "%", + "unit" : "count", "color" : "#ff8020", }

7 years

4791 tsm_scratch: Now creates graph for remaining tapes

by Marcel Arentz

Module: check_mk Branch: master Commit: b3a5a99eb3209f6daf5ca2f84c69728f333395bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3a5a99eb3209f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 12:10:45 2017 +0200 4791 tsm_scratch: Now creates graph for remaining tapes Change-Id: I46c6fac57670904c91a07fd3fe3f323f38e11cb6 --- .werks/4791 | 10 ++++++++++ checks/tsm_scratch | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4791 b/.werks/4791 new file mode 100644 index 0000000..9b3796b --- /dev/null +++ b/.werks/4791 @@ -0,0 +1,10 @@ +Title: tsm_scratch: Now creates graph for remaining tapes +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496916602 +Class: feature + + diff --git a/checks/tsm_scratch b/checks/tsm_scratch index 900b249..62a69c1 100644 --- a/checks/tsm_scratch +++ b/checks/tsm_scratch @@ -55,14 +55,16 @@ def check_tsm_scratch(item, params, info): elif tapes <= warn: state = 1 - return state, "Found %d tapes" % tapes + return state, "Found %d tapes" % tapes, \ + [ ("tapes_free"), tapes, warn, crit ] return 3, "UNKNOWN - Check no implemented" check_info["tsm_scratch"] = { - "check_function" : check_tsm_scratch, "inventory_function" : inventory_tsm_scratch, + "check_function" : check_tsm_scratch, "service_description" : "Scratch Pool %s", + "has_perfdata" : True, }

7 years

4635 FIX raritan_emx_sensors.temp, raritan_px_sensors: Fix checks for Nagios core, add missing WATO rule to raritan_px_sensors

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2ad1349199d54bcb1f0566692e10193834c612b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad1349199d54b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 8 12:00:07 2017 +0200 4635 FIX raritan_emx_sensors.temp, raritan_px_sensors: Fix checks for Nagios core, add missing WATO rule to raritan_px_sensors Change-Id: I13c01c02463f7cd17f9305dfff108e56dadcfe17 --- .werks/4635 | 11 +++++++++++ checks/raritan_emx_sensors | 2 +- checks/raritan_px_sensors | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4635 b/.werks/4635 new file mode 100644 index 0000000..6af6398 --- /dev/null +++ b/.werks/4635 @@ -0,0 +1,11 @@ +Title: raritan_emx_sensors.temp, raritan_px_sensors: Fix checks for Nagios core, add missing WATO rule to raritan_px_sensors +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496915844 + + diff --git a/checks/raritan_emx_sensors b/checks/raritan_emx_sensors index 76c38df..69bb076 100644 --- a/checks/raritan_emx_sensors +++ b/checks/raritan_emx_sensors @@ -75,7 +75,7 @@ check_info['raritan_emx_sensors.temp'] = { 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'group' : "temperature", - 'includes' : [ "temperature.include" ], + 'includes' : [ "raritan.include", "temperature.include" ], } #. diff --git a/checks/raritan_px_sensors b/checks/raritan_px_sensors index 2d870d3..7463dc2 100644 --- a/checks/raritan_px_sensors +++ b/checks/raritan_px_sensors @@ -119,7 +119,8 @@ check_info['raritan_px_sensors'] = { "34", # sensorUpperWarn ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13742.4", - 'includes' : [ "raritan.include" ], + 'includes' : [ "raritan.include", "temperature.include" ], + 'group' : "temperature", }

7 years

4775 FIX fortigate_sessions: Improved missing or invalid output handling

by Simon Betz

Module: check_mk Branch: master Commit: 80abb7b41ed3c99e0898ad1eab6b96d06b99ca53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80abb7b41ed3c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 12:06:18 2017 +0200 4775 FIX fortigate_sessions: Improved missing or invalid output handling Change-Id: I90c91922b0ecb5944c5ddd6b76f71b7347f393a1 --- .werks/4775 | 11 +++++++++++ checks/fortigate_sessions | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/4775 b/.werks/4775 new file mode 100644 index 0000000..3dd05c8 --- /dev/null +++ b/.werks/4775 @@ -0,0 +1,11 @@ +Title: fortigate_sessions: Improved missing or invalid output handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496916338 + + diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 88f8c2e..529c58b 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -30,12 +30,12 @@ def inventory_fortigate_sessions(info): return [(None, "fortigate_sessions_default_levels")] def check_fortigate_sessions(item, params, info): - warn, crit = params - - if not info[0]: + try: + current = int(info[0][0]) + except (IndexError, ValueError): return - current = int(info[0][0]) + warn, crit = params state = 0 icon = '' if current >= warn:

7 years

4711 FIX mknotifyd: parts of master configuration could be transfered to the slave sites

by Andreas Boesl

Module: check_mk Branch: master Commit: 2ceb3221859de01da9967eeb21bdd05fd115b775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ceb3221859de0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 8 11:45:36 2017 +0200 4711 FIX mknotifyd: parts of master configuration could be transfered to the slave sites Global configuration settings for the master site, which were configured through the <i>Distributed Monitoring</i> page, were transfered to any slave sites. This caused problems on the mknotifyd running on the slave sites. This has been fixed. Change-Id: I043de88e10050633971ef2940ea46e0903317a59 --- .werks/4711 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/4711 b/.werks/4711 new file mode 100644 index 0000000..a2f1d93 --- /dev/null +++ b/.werks/4711 @@ -0,0 +1,15 @@ +Title: mknotifyd: parts of master configuration could be transfered to the slave sites +Level: 2 +Component: notifications +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1496914893 + +Global configuration settings for the master site, which were configured through the +<i>Distributed Monitoring</i> page, were transfered to any slave sites. +This caused problems on the mknotifyd running on the slave sites. + +This has been fixed.

7 years

4710 FIX mknotifyd did not always reload its configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: a30f82f48d734af3c6f0e1a4b6b8128469d273c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a30f82f48d734a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 8 11:36:06 2017 +0200 4710 FIX mknotifyd did not always reload its configuration The mknotifyd did not automatically detect changes, when they were configured through the site specific global settings in the distributed monitoring page. A restart of the mknotifyd was required. Change-Id: I5622c662bf6c7e11b3d14be03d089f1fa5dd0f94 --- .werks/4710 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4710 b/.werks/4710 new file mode 100644 index 0000000..2422f65 --- /dev/null +++ b/.werks/4710 @@ -0,0 +1,13 @@ +Title: mknotifyd did not always reload its configuration +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1496914391 + +The mknotifyd did not automatically detect changes, when they were configured +through the site specific global settings in the distributed monitoring page. +A restart of the mknotifyd was required.

7 years

4774 FIX wmi_cpuload: Expanded missing information handling

by Simon Betz

Module: check_mk Branch: master Commit: c7cf577e0b8a626d9fb962ba9f39bb2b941e1ac6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7cf577e0b8a62… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 11:36:22 2017 +0200 4774 FIX wmi_cpuload: Expanded missing information handling Change-Id: I7180a004806c112d5bb5a6396fb4b81cd72e8022 --- .werks/4774 | 11 +++++++++++ checks/wmi_cpuload | 13 ++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/4774 b/.werks/4774 new file mode 100644 index 0000000..5323d48 --- /dev/null +++ b/.werks/4774 @@ -0,0 +1,11 @@ +Title: wmi_cpuload: Expanded missing information handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496914500 + + diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index d120721..954dce7 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -36,15 +36,14 @@ def check_wmi_cpuload(item, params, parsed): # unlike cpu load this does not include processes currently being processed, # so unless to cpu is (almost) fully utilized, this will be 0. - load = int(parsed["system_perf"].get(0, "ProcessorQueueLength")) - this_time = get_wmi_time(parsed["system_perf"], 0) - load5min = get_average("load_5min", this_time, load, 5) - load15min = get_average("load_15min", this_time, load, 15) - try: + load = int(parsed["system_perf"].get(0, "ProcessorQueueLength")) + this_time = get_wmi_time(parsed["system_perf"], 0) + load5min = get_average("load_5min", this_time, load, 5) + load15min = get_average("load_15min", this_time, load, 15) computer_system = parsed["computer_system"] - except KeyError: - return 3, "Missing information from agent" + except KeyError, e: + return 3, "Missing information from agent: %s" % e try: cores = int(computer_system.get(0, "NumberOfLogicalProcessors"))

7 years

4773 FIX mssql_instance: Added error handling if plugin fails to gather SQL server instances

by Simon Betz

Module: check_mk Branch: master Commit: 2778fc7f4ae9d78021f93029be90f480bebb259a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2778fc7f4ae9d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 10:52:03 2017 +0200 4773 FIX mssql_instance: Added error handling if plugin fails to gather SQL server instances Change-Id: I6862709533d9c6b08baac6eab7883d352cbcdfa4 --- .werks/4773 | 11 +++++++++++ agents/windows/plugins/mssql.vbs | 1 + checks/mssql_instance | 9 +++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/4773 b/.werks/4773 new file mode 100644 index 0000000..24ce3d6 --- /dev/null +++ b/.werks/4773 @@ -0,0 +1,11 @@ +Title: mssql_instance: Added error handling if plugin fails to gather SQL server instances +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496911830 + + diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 47207ec..0b592d1 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -88,6 +88,7 @@ registry.EnumValues HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\Instance Name value_names, value_types If Not IsArray(value_names) Then + addOutput("<<<mssql_instance:sep(124)>>>") addOutput("ERROR: Failed to gather SQL server instances") wscript.quit(1) End If diff --git a/checks/mssql_instance b/checks/mssql_instance index 3d0bef9..4aaa042 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -37,12 +37,17 @@ # <<<mssql_instance:sep(124)>>> # MSSQL_MICROSOFT##SSEE|state|0|[DBNETLIB][ConnectionOpen (Connect()).]SQL Server existiert nicht oder Zugriff verweigert. +# <<<mssql_instance:sep(124)>>> +# ERROR: Failed to gather SQL server instances + def parse_mssql_instance(info): parsed = {} for line in info: - # Remove the MSSQL_ prefix from the ID for this check - if line[0][:6] == "MSSQL_": + if line[0].startswith("ERROR:"): + continue + elif line[0][:6] == "MSSQL_": + # Remove the MSSQL_ prefix from the ID for this check instance_id = line[0][6:] else: instance_id = line[0]

7 years

← Newer
1
...
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017