Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4550 FIX smart: the services do not crash anymore if a threshold is not provided

by Marcel Arentz

Module: check_mk Branch: master Commit: 4c210705a773934d3300decd098c5aee38b0da0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c210705a77393… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 27 15:47:31 2017 +0200 4550 FIX smart: the services do not crash anymore if a threshold is not provided Change-Id: I2006fcde0b5e93650315aeda306f71d5cbce67fa --- .werks/4550 | 10 ++++++++++ checks/smart | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4550 b/.werks/4550 new file mode 100644 index 0000000..6a79b64 --- /dev/null +++ b/.werks/4550 @@ -0,0 +1,10 @@ +Title: smart: the services do not crash anymore if a threshold is not provided +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490622387 +Class: fix + + diff --git a/checks/smart b/checks/smart index 89e04c8..6d457e7 100644 --- a/checks/smart +++ b/checks/smart @@ -91,7 +91,10 @@ def parse_smart_normalized_values(info): field = line[4] if field != "Unknown_Attribute": value = int(line[6]) - threshold = int(line[8]) + if isinstance(line[8], int): + threshold = int(line[8]) + else: + threshold = None disk[field] = value, threshold return disks

7 years, 3 months

4549 FIX citrix_licenses: Fixed always ok state even if all licenses are used

by Marcel Arentz

Module: check_mk Branch: master Commit: f5654a7a4c069117ca06d8cf350696707593c39d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5654a7a4c0691… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 27 15:24:08 2017 +0200 4549 FIX citrix_licenses: Fixed always ok state even if all licenses are used Previously the state has been always been ok, even if no rule has been set (with default on "Go crit if all licenses are used") and no license has been left. Change-Id: I47a976a2b5baf8b472e37fc3c61ccec7062f8f02 --- .werks/4549 | 12 ++++++++++++ checks/license.include | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4549 b/.werks/4549 new file mode 100644 index 0000000..2923c8e --- /dev/null +++ b/.werks/4549 @@ -0,0 +1,12 @@ +Title: citrix_licenses: Fixed always ok state even if all licenses are used +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490620927 +Class: fix + +Previously the state has been always been ok, even if no rule has been set +(with default on "Go crit if all licenses are used") and no license has +been left. diff --git a/checks/license.include b/checks/license.include index 269086b..e5ef665 100644 --- a/checks/license.include +++ b/checks/license.include @@ -45,9 +45,9 @@ def license_check_levels(have, used, params): else: infotext = "used %d licenses, but you have only %d" % (used, have) - if crit != None and used > crit: + if crit != None and used >= crit: status = 2 - elif warn != None and used > warn: + elif warn != None and used >= warn: status = 1 else: status = 0

7 years, 3 months

Tighten access. Unify classes a bit more.

by Sven Panne

Module: check_mk Branch: master Commit: d53849f5c8d55f586cc1262bd350588b67052a0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d53849f5c8d55f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 27 14:52:35 2017 +0200 Tighten access. Unify classes a bit more. Change-Id: I29360a6283c8c2d62adc995709992f9cae5e1cca --- livestatus/src/OffsetSStringColumn.h | 5 +++-- livestatus/src/OffsetStringColumn.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/livestatus/src/OffsetSStringColumn.h b/livestatus/src/OffsetSStringColumn.h index 48abd43..1919088 100644 --- a/livestatus/src/OffsetSStringColumn.h +++ b/livestatus/src/OffsetSStringColumn.h @@ -30,8 +30,6 @@ #include "StringColumn.h" class OffsetSStringColumn : public StringColumn { - int _offset; - public: OffsetSStringColumn(const std::string& name, const std::string& description, int offset, int indirect_offset, int extra_offset, @@ -40,6 +38,9 @@ public: extra_extra_offset) , _offset(offset) {} std::string getValue(void* data) const override; + +private: + const int _offset; }; #endif // OffsetSStringColumn_h diff --git a/livestatus/src/OffsetStringColumn.h b/livestatus/src/OffsetStringColumn.h index 5048bbc..61c1ec1 100644 --- a/livestatus/src/OffsetStringColumn.h +++ b/livestatus/src/OffsetStringColumn.h @@ -39,7 +39,7 @@ public: , _offset(offset) {} std::string getValue(void* data) const override; -protected: +private: const int _offset; };

7 years, 3 months

8628 FIX printer_alerts: Fix discovery when there are no alerts

by Konstantin Büttner

Module: check_mk Branch: master Commit: 71c51fc41a0cf7fcea2d40765460dac514d376fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71c51fc41a0cf7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 14:55:36 2017 +0200 8628 FIX printer_alerts: Fix discovery when there are no alerts Previously, the discovery would only work, when the device listed some alerts, but not in the (hopefully more common) case that the list of alerts was empty. This has been fixed. Change-Id: I5639f4bac49a391844831979c3fa609c6c85801a --- .werks/8628 | 13 +++++++++++++ checks/printer_alerts | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/8628 b/.werks/8628 new file mode 100644 index 0000000..7f24dde --- /dev/null +++ b/.werks/8628 @@ -0,0 +1,13 @@ +Title: printer_alerts: Fix discovery when there are no alerts +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490619155 + +Previously, the discovery would only work, when the device listed +some alerts, but not in the (hopefully more common) case that the +list of alerts was empty. This has been fixed. diff --git a/checks/printer_alerts b/checks/printer_alerts index 5a33357..c1041f9 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -244,6 +244,6 @@ check_info["printer_alerts"] = { '7', # prtAlertCode '8', # prtAlertDescription ]), - 'snmp_scan_function': \ - lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, + 'handle_empty_info': True, + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None, }

7 years, 3 months

Update Werk description

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0cbd5e3a57c087bd806fd80441d029d52d81d834 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cbd5e3a57c087… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 14:57:20 2017 +0200 Update Werk description Change-Id: I82da89b7fcdf823ef9664161e18d027c65572bc7 --- .werks/8628 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/8628 b/.werks/8628 index 7f24dde..4e3a59c 100644 --- a/.werks/8628 +++ b/.werks/8628 @@ -11,3 +11,5 @@ Date: 1490619155 Previously, the discovery would only work, when the device listed some alerts, but not in the (hopefully more common) case that the list of alerts was empty. This has been fixed. + +Thanks to Andreas Döhler for the patch!

7 years, 3 months

4529 FIX hp_proliant_raid: Fixed incomplete raid detection;

by Simon Betz

Added missing states Message-ID: <58d90ace.ZaLXJNGoBiCHZbGL%si(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: 7f2b88a773ba5a901cd7e2dcf263dbfc1a21b522 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f2b88a773ba5a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 27 14:46:57 2017 +0200 4529 FIX hp_proliant_raid: Fixed incomplete raid detection; Added missing states Change-Id: I579af05382f7dfca5f0c119f3514655351beb519 --- .werks/4529 | 11 +++++ checks/hp_proliant_raid | 113 +++++++++++++++++++++++++++++------------------- 2 files changed, 80 insertions(+), 44 deletions(-) diff --git a/.werks/4529 b/.werks/4529 new file mode 100644 index 0000000..74c0b04 --- /dev/null +++ b/.werks/4529 @@ -0,0 +1,11 @@ +Title: hp_proliant_raid: Fixed incomplete raid detection; Added missing states +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490618589 + + diff --git a/checks/hp_proliant_raid b/checks/hp_proliant_raid index 7552273..5d7cf3b 100644 --- a/checks/hp_proliant_raid +++ b/checks/hp_proliant_raid @@ -25,54 +25,79 @@ # Boston, MA 02110-1301 USA. -def inventory_hp_proliant_raid(info): - if len(info) > 0: - inventory = [] - for line in info: - inventory.append((line[0], None)) - return inventory +def parse_hp_proliant_raid(info): + parsed = {} + for number, name, status, size_str, rebuild in info: + if name in parsed: + itemname = "%s %s" % (name, number) + else: + itemname = name -def check_hp_proliant_raid(item, _no_params, info): - hp_proliant_raid_statusmap = { - 3 : "More physical drives have failed than the fault tolerance mode can handle.", - 4 : "Logical drive is not configured.", - 5 : "Recovery for at least one physical drive hasfailed. No data loss currently.", - 6 : "Logical drive is ready for recovery but is still operating in Interim Recovery Mode.", - 8 : "The wrong physical drive was replaced after failure.", - 9 : "A physical drive is not responding.", - 10 : "Enclosue is overheated but drives still functioning and should be shutdown.", - 11 : "Enclosure is overheated and drives are shutdown.", - 12 : "Logical drive is currently doing Automatic Data Expansion.", - 13 : "Logical drive is currently unavailable.", - 14 : "Logical drive is in the queue for expansion.", + parsed.setdefault(itemname.strip(), { + "status" : status, + "size" : int(size_str) * 1024 * 1024, + "rebuild_perc" : rebuild, + }) + return parsed + + +def inventory_hp_proliant_raid(parsed): + for raid in parsed: + yield raid, None + + +def check_hp_proliant_raid(item, _no_params, parsed): + map_states = { + "1" : (3, "other"), + "2" : (0, "OK"), + "3" : (2, "failed"), + "4" : (1, "unconfigured"), + "5" : (1, "recovering"), + "6" : (1, "ready for rebuild"), + "7" : (1, "rebuilding"), + "8" : (2, "wrong drive"), + "9" : (2, "bad connect"), + "10" : (2, "overheating"), + "11" : (1, "shutdown"), + "12" : (1, "automatic data expansion"), + "13" : (2, "not available"), + "14" : (1, "queued for expansion"), + "15" : (1, "multi-path access degraded"), + "16" : (1, "erasing"), } - for line in info: - if line[0] == item: - state, size_mb, percent_rebuild = map(saveint, line[1:]) - drive_size = "Logical Volume Size: %s" % get_bytes_human_readable(size_mb * 1024 * 1024 ) - if state == 7: - return 1, "Rebuild: %d%% finished. %s" % ( percent_rebuild, drive_size ) - if state == 2: - return 0, "In normal operation mode. " + drive_size - if state in [ 4, 5, 6, 12, 14 ]: - return 1, hp_proliant_raid_statusmap[state] + drive_size - if state in [ 3, 8, 9, 10, 12, 13 ]: - return 2, hp_proliant_raid_statusmap[state] + drive_size - return (3, "Drive not found or Uknown state") + + if item in parsed: + data = parsed[item] + dev_status = data["status"] + state, state_readable = map_states[dev_status] + infotext = "Status: %s, Logical volume size: %s" % \ + (state_readable, get_bytes_human_readable(data["size"])) + + # From CPQIDA-MIB: + # This value is the percent complete of the rebuild. + # This value is only valid if the Logical Drive Status is + # rebuilding (7) or expanding (12). + # If the value cannot be determined or a rebuild is not active, + # the value is set to 4,294,967,295. + if dev_status in [ "7", "12" ]: + infotext += "Rebuild: %s%%" % data["rebuild_perc"] + + return state, infotext + check_info["hp_proliant_raid"] = { - 'check_function': check_hp_proliant_raid, - 'inventory_function': inventory_hp_proliant_raid, - 'service_description': 'Logical Device %s', - 'snmp_info': ( - ".1.3.6.1.4.1.232.3.2.3.1.1", [ - 14, # Drive Name - 4, # Logical Drive status - 9, # Drive Size - 12, # Percent rebuild - ] - ), - 'snmp_scan_function': \ + 'parse_function' : parse_hp_proliant_raid, + 'check_function' : check_hp_proliant_raid, + 'inventory_function' : inventory_hp_proliant_raid, + 'service_description' : 'Logical Device %s', + 'snmp_info' : (".1.3.6.1.4.1.232.3.2.3.1.1", [ + "2", # CPQIDA-MIB::cpqDaLogDrvIndex + "14", # CPQIDA-MIB::cpqDaLogDrvOsName + "4", # CPQIDA-MIB::cpqDaLogDrvStatus + "9", # CPQIDA-MIB::cpqDaLogDrvSize + "12", # CPQIDA-MIB::cpqDaLogDrvPercentRebuild + ]), + 'snmp_scan_function' : \ lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), }

7 years, 3 months

Updated werk

by Lars Michelsen

Module: check_mk Branch: master Commit: afbb7c7ea73acbc2051236161d4386502614a57a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afbb7c7ea73acb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 13:59:32 2017 +0200 Updated werk Change-Id: I83aad91225ee925a1728bea8b3005b4b17be9043 --- .werks/4514 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/4514 b/.werks/4514 index fdb14f0..007ce21 100644 --- a/.werks/4514 +++ b/.werks/4514 @@ -10,3 +10,5 @@ Class: fix The debian packages created by the agent bakery contained the whole agent configuration. This could contain secrets that should not be available with the description, e.g. when using the alert handlers. + +The RPMs and Debian packages now have the same description.

7 years, 3 months

Updated bug entries #2843

by Lars Michelsen

Module: check_mk Branch: master Commit: df12b312b04c56d0ea48a2de14d98c6012c0f2d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df12b312b04c56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 13:59:52 2017 +0200 Updated bug entries #2843 Change-Id: I36b923c8910a59fd967da702ecdcef8de88ae9cd --- .bugs/2843 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2843 b/.bugs/2843 index b1fcd20..ee236ee 100644 --- a/.bugs/2843 +++ b/.bugs/2843 @@ -1,9 +1,9 @@ Title: SSH private key of linux remote handler visible in agent package Component: agents -State: open +Class: bug +State: done Date: 2017-02-14 15:05:49 Targetversion: 1.4.0 -Class: bug The private SSH key for remote login and execution of remote alert handlers is part of the agent configuration because it is done in an agent bakery @@ -17,3 +17,6 @@ a) Try to remove just that key from the visiable agent configuration (hack) b) Remove the information about the configuration totally c) Use the valuespec totext() for the information rather than repr() (if possible) + +2017-03-27 13:59:50: changed state open -> done +Has been fixed by removing the config from the description of the deb packages

7 years, 3 months

4514 FIX Removed agent configuration from debian package descriptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d6453a935a0f8d863ba53e9fc5e04cff979f830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d6453a935a0f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 13:59:06 2017 +0200 4514 FIX Removed agent configuration from debian package descriptions The debian packages created by the agent bakery contained the whole agent configuration. This could contain secrets that should not be available with the description, e.g. when using the alert handlers. Change-Id: I239702a694c2201782f1d3b527e917db1116fbda --- .werks/4514 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4514 b/.werks/4514 new file mode 100644 index 0000000..fdb14f0 --- /dev/null +++ b/.werks/4514 @@ -0,0 +1,12 @@ +Title: Removed agent configuration from debian package descriptions +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1490615882 +Class: fix + +The debian packages created by the agent bakery contained the whole +agent configuration. This could contain secrets that should not be +available with the description, e.g. when using the alert handlers.

7 years, 3 months

Fixed web.log file copy

by Lars Michelsen

Module: check_mk Branch: master Commit: 15c8140f5408787edc1e6ebbceab0af9a523b89a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c8140f540878… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 12:30:08 2017 +0200 Fixed web.log file copy Change-Id: I39cf59be5a466447b0f10277b33335bd1ff31b56 --- tests/web/test_crawl.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 58c78bd..2186970 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -10,7 +10,6 @@ import signal import threading import Queue import traceback -import shutil from urlparse import urlsplit, parse_qsl, urlunsplit, urljoin from urllib import urlencode from bs4 import BeautifulSoup @@ -386,7 +385,7 @@ class TestCrawler(object): # Save the web.log for later diagnose if self.site.file_exists("var/log/web.log"): - shutil.copyfile(self.site.read_file("var/log/web.log"), self.web_log_file()) + open(self.web_log_file(), "w").write(self.site.read_file("var/log/web.log")) if self.errors: pytest.fail("Crawled %d URLs in %d seconds. Failures:\n%s" %

7 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017