Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3417 FIX wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions

by Mathias Kettner

Module: check_mk Branch: master Commit: 0fd537a93974c23dab09b0c8e0c1a0571b49eeca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd537a93974c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:07:35 2016 +0200 3417 FIX wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions --- .werks/3417 | 10 ++++++++++ ChangeLog | 1 + checks/wmi.include | 6 ++++++ checks/wmi_cpuload | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3417 b/.werks/3417 new file mode 100644 index 0000000..5e7423e --- /dev/null +++ b/.werks/3417 @@ -0,0 +1,10 @@ +Title: wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461143230 + + diff --git a/ChangeLog b/ChangeLog index f64f98e..8463214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 3386 FIX: AIX agent: Cached local scripts / plugins need to be configured in seconds... NOTE: Please refer to the migration notes! * 3387 FIX: ps: Fixed crash during service discovery on AIX hosts having defunct processes + * 3417 FIX: wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/wmi.include b/checks/wmi.include index f34c234..7795213 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -70,12 +70,18 @@ def parse_wmi_table(info, key="Name"): self.__row_lookup = {} self.__rows = [] + + def __repr__(self): + return repr((self.__headers, self.__rows)) + + def add_row(self, row): self.__rows.append(row) if self.__key_index is not None: key = row[self.__key_index] self.__row_lookup[key] = len(self.__rows) - 1 + def get(self, row, column): if isinstance(row, int): row_index = row diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index c8735fe..543b60d 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -38,7 +38,7 @@ def check_wmi_cpuload(item, params, parsed): try: cores = int(parsed["computer_system"].get(0, "NumberOfLogicalProcessors")) - except ValueError: + except (ValueError, KeyError), e: # NumberOfLogicalProcessors can be an empty string, not sure why cores = int(parsed["computer_system"].get(0, "NumberOfProcessors"))

8 years, 2 months

Horrible temporary hack needed to make cmc work again.

by Sven Panne

Module: check_mk Branch: master Commit: 3f0e614de333fcab5848ce84e2cb04ef070b839c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f0e614de333fc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 20 10:22:58 2016 +0200 Horrible temporary hack needed to make cmc work again. The ugly #ifdefs should really die soon, but the alternative is currently even worse: Duplicating headers and classes in cmc even more. What *really* should be done is putting a thin compatibility layer into the system, abstracting away from the differences in the Nagios/CMC worlds. This isn't hard, just a bit of mechanical work, but this needs to be postponed for now... :-/ --- livestatus/src/TableHosts.h | 14 +++++++++++--- livestatus/src/TableHostsByGroup.h | 6 ++++++ livestatus/src/TableLog.cc | 29 +++++++++++++++++++++-------- livestatus/src/TableLog.h | 11 ++++++++--- livestatus/src/TableServices.h | 16 ++++++++++++---- livestatus/src/TableServicesByGroup.h | 6 ++++++ livestatus/src/TableServicesByHostGroup.h | 6 ++++++ livestatus/src/TableStateHistory.cc | 29 ++++++++++++++++++++++------- livestatus/src/TableStateHistory.h | 12 +++++++++--- 9 files changed, 101 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f0e614de3…

8 years, 2 months

3423 papouch_th2e_sensors, papouch_th2e_sensors.dewpoint,

by Simon Betz

papouch_th2e_sensors.humidity: new checks which monitor the temperature, dew point and humidity sensors of Papouch TH2E devices Message-ID: <57173bb9.SKvR/c3hQvqXCMHF%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: 2607ea281aef261d1665293c54a688cf443ef010 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2607ea281aef26… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 20 10:19:51 2016 +0200 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 --- .werks/3423 | 9 ++ ChangeLog | 1 + checkman/papouch_th2e_sensors | 20 ++++ checkman/papouch_th2e_sensors.dewpoint | 20 ++++ checkman/papouch_th2e_sensors.humidity | 20 ++++ checks/papouch_th2e_sensors | 176 ++++++++++++++++++++++++++++++++ 6 files changed, 246 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2607ea281a…

8 years, 2 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: c7f667f28d1e0a0a6948742cf9abca67b28f3f8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7f667f28d1e0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 20 10:18:49 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 1d3a8c6..d0f1d75 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3423 +3433

8 years, 2 months

Updated bug entries #2489

by Mathias Kettner

Module: check_mk Branch: master Commit: f2d0a6f8e28c0f8d2eeeafa193ee9192faf3649f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2d0a6f8e28c0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 10:00:02 2016 +0200 Updated bug entries #2489 --- .bugs/2489 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.bugs/2489 b/.bugs/2489 index 5426d17..e281d4e 100644 --- a/.bugs/2489 +++ b/.bugs/2489 @@ -11,3 +11,21 @@ um dann dafür einen bulk edit zu machen werden genau die Änderungen aus der vorhergehenden Änderung vorgelegt. Bug oder Feature? Auf jeden Fall verwirrend, weil in der Regel die Hosts des zweiten Durchganges andere Merkmale bekommen sollen. + +Das hier wäre ein möglicher Patch. Aber es ist noch nicht klar, +ob das funktioniert und ob das Nebenwirkungen hat. + +diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py +index 31a6deb..0d0d10f 100644 +--- a/web/htdocs/wato.py ++++ b/web/htdocs/wato.py +@@ -631,6 +631,9 @@ def show_hosts(folder): + hostnames.sort(cmp = lambda a, b: cmp(num_split(a), num_split(b))) + search_text = html.var("search") + ++ html.del_all_vars(prefix = "attr_") ++ html.del_all_vars(prefix = "bulk_change_") ++ + # Helper function for showing bulk actions. This is needed at the bottom + # of the table of hosts and - if there are more than just a few - also + # at the top of the table.

8 years, 2 months

Really kill g_store.

by Sven Panne

Module: check_mk Branch: master Commit: 4d259fbe611dc885a488685a6243a736a35baa33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d259fbe611dc8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 20 08:48:05 2016 +0200 Really kill g_store. --- livestatus/src/DownCommColumn.cc | 13 +++------ livestatus/src/DownCommColumn.h | 8 +++--- livestatus/src/Store.cc | 17 ++++++------ livestatus/src/Store.h | 5 ++-- livestatus/src/TableDownComm.cc | 23 +++++++++------- livestatus/src/TableDownComm.h | 3 ++- livestatus/src/TableHosts.cc | 40 +++++++++++++++++----------- livestatus/src/TableHosts.h | 8 ++++-- livestatus/src/TableHostsByGroup.cc | 7 +++-- livestatus/src/TableHostsByGroup.h | 4 ++- livestatus/src/TableLog.cc | 21 +++++++++------ livestatus/src/TableLog.h | 5 +++- livestatus/src/TableServices.cc | 35 +++++++++++++----------- livestatus/src/TableServices.h | 8 ++++-- livestatus/src/TableServicesByGroup.cc | 7 +++-- livestatus/src/TableServicesByGroup.h | 4 ++- livestatus/src/TableServicesByHostGroup.cc | 8 ++++-- livestatus/src/TableServicesByHostGroup.h | 4 ++- livestatus/src/TableStateHistory.cc | 19 +++++++------ livestatus/src/TableStateHistory.h | 5 +++- 20 files changed, 148 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d259fbe61…

8 years, 2 months

Move bug to the future

by Mathias Kettner

Module: check_mk Branch: master Commit: 08acafc15f5a1a76e1bf3bf20cc579d9c11a784a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08acafc15f5a1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 17:04:48 2016 +0200 Move bug to the future --- .bugs/2488 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/2488 b/.bugs/2488 index 1832403..9a24c4c 100644 --- a/.bugs/2488 +++ b/.bugs/2488 @@ -2,7 +2,7 @@ Title: View-Editor: Remove [Try out] button. It's broken. Component: multisite State: open Date: 2016-04-14 10:54:21 -Targetversion: 1.2.8 +Targetversion: future Class: bug This functionality is very complex and still has some bugs. Better remove

8 years, 2 months

Updated bug entries #2488

by Mathias Kettner

Module: check_mk Branch: master Commit: 54b4d2092c72cc23cd63af399fa552cdda9870e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54b4d2092c72cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 17:04:26 2016 +0200 Updated bug entries #2488 --- .bugs/2488 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.bugs/2488 b/.bugs/2488 index ebf3bd5..1832403 100644 --- a/.bugs/2488 +++ b/.bugs/2488 @@ -1,9 +1,9 @@ -Title: View-Editor: Try out does not work anymore... +Title: View-Editor: Remove [Try out] button. It's broken. Component: multisite State: open Date: 2016-04-14 10:54:21 Targetversion: 1.2.8 Class: bug -If you hit Try out then you will just see the edit form again, but not the actual -view below it. +This functionality is very complex and still has some bugs. Better remove +it. It was never requested by any customers in the first place.

8 years, 2 months

3416 FIX Avoid warning in cmc.log when rescheduling non-existing discovery check

by Mathias Kettner

Module: check_mk Branch: master Commit: 87e1a9478523104f164c085094e6b4f515c28018 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e1a947852310… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 16:46:35 2016 +0200 3416 FIX Avoid warning in cmc.log when rescheduling non-existing discovery check This avoids the folloing message: F+:var/log/cmc.log 2016-04-19 13:49:24 [4] Ignoring command SCHEDULE_FORCED_SVC_CHECK;10.1.1.199;Check_MK Discovery;1461066564: invalid parameters F-: --- .werks/3416 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/.werks/3416 b/.werks/3416 new file mode 100644 index 0000000..d660dfd --- /dev/null +++ b/.werks/3416 @@ -0,0 +1,13 @@ +Title: Avoid warning in cmc.log when rescheduling non-existing discovery check +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461077110 + +This avoids the folloing message: +F+:var/log/cmc.log +2016-04-19 13:49:24 [4] Ignoring command SCHEDULE_FORCED_SVC_CHECK;10.1.1.199;Check_MK Discovery;1461066564: invalid parameters +F-: diff --git a/ChangeLog b/ChangeLog index dafbd35..0346a79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 3349 FIX: Added rule to disable Inline-SNMP per host... * 3123 FIX: fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration * 3385 FIX: Fixed not updated discovery service after grouped auto discovery... + * 3416 FIX: Avoid warning in cmc.log when rescheduling non-existing discovery check... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index bff1197..f50ac70 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1505,6 +1505,11 @@ def schedule_inventory_check(hostname): else: # TODO: Remove this old name handling one day command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK inventory;%d" % (hostname, now) + + # Ignore missing check and avoid warning in cmc.log + if monitoring_core == "cmc": + command += ";TRY" + s.send("COMMAND [%d] %s\n" % (now, command)) except Exception, e: if opt_debug:

8 years, 2 months

Removed some global variables plus related cleanup.

by Sven Panne

Module: check_mk Branch: master Commit: adf99f9a90ca9f0813f412d3e500023581eca99b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adf99f9a90ca9f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 19 14:51:51 2016 +0200 Removed some global variables plus related cleanup. --- livestatus/src/Store.cc | 4 +++- livestatus/src/Store.h | 1 - livestatus/src/TableLog.cc | 22 +++++++------------ livestatus/src/TableLog.h | 4 +++- livestatus/src/TableStateHistory.cc | 23 ++++++++++---------- livestatus/src/TableStateHistory.h | 4 +++- livestatus/src/store_c.cc | 40 ++++++++++++++++------------------- 7 files changed, 46 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=adf99f9a90…

8 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
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