Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 02aabc943d2ba016b55ee4a78462afc5fb45dfff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02aabc943d2ba0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 11:13:23 2018 +0100 Remove confusing comment Change-Id: I8b876a80931fbbae792da847f91b3d584428a6db --- checks/cpu_util.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index c595a5c..d4bf8ce 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -184,7 +184,7 @@ def check_cpu_util_unix(values, params, cores = None): else: steal_perc = 0 - if len(values) >= 10: # and (values[8] or values[9]): + if len(values) >= 10: guest = diff_values[8] + diff_values[9] guest_perc = 100.0 * float(guest) / float(sum_jiffies) yield 0, "guest: %.1f%%" % guest_perc, [ ("guest", guest_perc) ]

6 years, 8 months

Added another missing dependency.

by Sven Panne

Module: check_mk Branch: master Commit: d64c2ab9fdec0b690652f1547dade6c1dc6e479a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d64c2ab9fdec0b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 19 11:01:04 2018 +0100 Added another missing dependency. Change-Id: Ia2b70e35fd45df1e5cb842a84c1d68470d84e52e --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e582196..0c26ee9 100644 --- a/Makefile +++ b/Makefile @@ -401,6 +401,7 @@ setup: g++ \ libboost-dev \ libboost-system-dev \ + libclang-5.0-dev \ libpcap-dev \ librrd-dev \ llvm-5.0-dev \

6 years, 8 months

fix Makefile setup targets

by Andreas Umbreit

Module: check_mk Branch: master Commit: c798db57724ab02acd6114548156a370675b4191 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c798db57724ab0… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Jan 19 10:50:07 2018 +0100 fix Makefile setup targets Change-Id: Ib5c149fb9a850da11b4ac18f0666d219a8456203 --- Makefile | 1 + tests/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ec238e8..bc281c5 100644 --- a/Makefile +++ b/Makefile @@ -390,6 +390,7 @@ mrproper: setup: sudo apt-get install \ + aptitude \ autoconf \ bear \ build-essential \ diff --git a/tests/Makefile b/tests/Makefile index 3b239cc..2be40b7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -67,7 +67,7 @@ test-shellcheck-ci: setup: sudo apt-get install \ python-pip \ - chrpath + chrpath \ cabal-install sudo pip install --upgrade pip sudo pip install --upgrade --ignore-installed -r requirements.txt

6 years, 8 months

Addded missing dependency.

by Sven Panne

Module: check_mk Branch: master Commit: d15f82b3cd1a2ee60e970bd04ce791d124fda1fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d15f82b3cd1a2e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 19 10:57:08 2018 +0100 Addded missing dependency. Change-Id: I720ef324d3193b4f32e6ef0df3d1bf1a800eb76f --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 73d8cef..e582196 100644 --- a/Makefile +++ b/Makefile @@ -403,6 +403,7 @@ setup: libboost-system-dev \ libpcap-dev \ librrd-dev \ + llvm-5.0-dev \ pngcrush \ slimit $(MAKE) -C tests setup

6 years, 8 months

Added a few more build dependencies.

by Sven Panne

Module: check_mk Branch: master Commit: 725071f898024366f088c1f7a4029807736f9603 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=725071f8980243… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 19 08:54:56 2018 +0100 Added a few more build dependencies. Change-Id: I0a766f633954330ed27d1753176656e836c0c223 --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index bc281c5..73d8cef 100644 --- a/Makefile +++ b/Makefile @@ -394,7 +394,11 @@ setup: autoconf \ bear \ build-essential \ + clang-5.0 \ + clang-format-5.0 \ + clang-tidy-5.0 \ figlet \ + g++ \ libboost-dev \ libboost-system-dev \ libpcap-dev \

6 years, 8 months

Remove misleading comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2cec6d564dbbf836878ea9ba45320e1cddcad77f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cec6d564dbbf8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 10:32:26 2018 +0100 Remove misleading comment Change-Id: I8e1481d2277e4b66b79aed6c2aed25f07a505514 --- checks/cpu_util.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 20d608a..c595a5c 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -146,7 +146,7 @@ def check_cpu_util_unix(values, params, cores = None): diff_values.append(v - last_val) set_item_state(countername, (this_time, v)) - sum_jiffies = sum(diff_values) # do not account for steal! + sum_jiffies = sum(diff_values) if sum_jiffies == 0: raise MKCounterWrapped("Too short time difference since last check")

6 years, 8 months

5554 FIX ps: Fixed missing Total RAM if AIX is the source and percentual thresholds are configured

by Marcel Arentz

Module: check_mk Branch: master Commit: cc040325edbf5e04949b9fe674fca59f442335ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc040325edbf5e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jan 18 16:05:18 2018 +0100 5554 FIX ps: Fixed missing Total RAM if AIX is the source and percentual thresholds are configured AIX has not been considered while computing the percentual thresholds for Memory. This is now fixed. Change-Id: I932b8c8e5e2ca915584aaa7bd9f24f9cfabc4763 --- .werks/5554 | 11 +++++++++++ checks/ps | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/5554 b/.werks/5554 new file mode 100644 index 0000000..cb1127a --- /dev/null +++ b/.werks/5554 @@ -0,0 +1,11 @@ +Title: ps: Fixed missing Total RAM if AIX is the source and percentual thresholds are configured +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516287829 +Class: fix + +AIX has not been considered while computing the percentual thresholds for +Memory. This is now fixed. diff --git a/checks/ps b/checks/ps index ac99281..74f97f9 100644 --- a/checks/ps +++ b/checks/ps @@ -236,18 +236,20 @@ def parse_ps(info): def inventory_ps(info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info return inventory_ps_common(inventory_processes, inventory_processes_rules, parsed) def check_ps(item, params, info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info: total_ram = solaris_mem_info.get("MemTotal") * 1024 elif statgrab_mem_info: total_ram = statgrab_mem_info.get("MemTotal") * 1024 + elif aix_memory_info: + total_ram = int(aix_memory_info[0][0]) * 4 * 1024 else: total_ram = None @@ -264,7 +266,7 @@ check_info['ps'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], } # NOTE: This check is deprecated and will be removed any decade now. ps now @@ -277,5 +279,5 @@ check_info['ps.perf'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], }

6 years, 8 months

hp_psu: Handle some quirks not documented in the MIB

by Konstantin Büttner

Module: check_mk Branch: master Commit: ffa08cc2161e48971815e51c6a03c09127a25867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffa08cc2161e48… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jan 18 17:04:20 2018 +0100 hp_psu: Handle some quirks not documented in the MIB Change-Id: Ia455fdec49ce6086fec4ce6a49541e981485935e --- checkman/hp_psu | 3 ++- checks/hp_psu | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checkman/hp_psu b/checkman/hp_psu index e55d60d..7460c1b 100644 --- a/checkman/hp_psu +++ b/checkman/hp_psu @@ -6,7 +6,8 @@ distribution: check_mk description: This check monitors the state of power supplies in HP switches. "maxstate" is treated as UNKNOWN, "not present", "not plugged" and "permanent failure" as CRIT, - "failed" as WARN and "powered" as OK. + "failed" as WARN and "powered" as OK. The status code 8, which is not documented + in the MIB, appears to mean the device is unplugged, which we treat as CRIT. item: The power supplies' index. diff --git a/checks/hp_psu b/checks/hp_psu index 2b21187..abeec97 100644 --- a/checks/hp_psu +++ b/checks/hp_psu @@ -50,6 +50,9 @@ def inventory_hp_psu_temp(parsed): def check_hp_psu_temp(item, params, parsed): + temp_unknown_status = ["8"] # For some status, the device simply reports 0 as a temperature value. + if parsed[item]["status"] in temp_unknown_status and parsed[item]["temp"] == 0: + return 3, "No temperature data available" return check_temperature(parsed[item]["temp"], params, item) @@ -89,9 +92,10 @@ def check_hp_psu(item, params, parsed): "4" : (1, "Failed"), "5" : (2, "Permanent Failure"), "6" : (3, "Max"), + "8" : (2, "Unplugged"), # This value is not specified in the MIB, but has been observed in the wild. } - return ps_statemap[parsed[item]["status"]] + return ps_statemap.get(parsed[item]["status"],(3, "Unknown status code sent by device")) check_info['hp_psu'] = {

6 years, 8 months

Yet another fix for the Boost paths.

by Sven Panne

Module: check_mk Branch: master Commit: fffef02eb2217e2fb250217636d993a20927144b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fffef02eb2217e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 18 13:41:06 2018 +0100 Yet another fix for the Boost paths. The amount of copy-n-paste is really impressive... :-/ While we're here: Removed the special case for Boost 1.41 on CentOS 5, it is too old to be even compiled nowadways. Change-Id: Ib00179ead40325bb655e1c8aa49acc83ebbf5fb1 --- Makefile | 2 -- omd/distros/CENTOS_5.mk | 1 - omd/packages/mk-livestatus/Makefile | 8 ++------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c0e227a..ec238e8 100644 --- a/Makefile +++ b/Makefile @@ -420,8 +420,6 @@ config.status: $(DIST_DEPS) BOOST_OPT="--with-boost=$(abspath ../boost/destdir)" ; \ elif test -d omd/packages/boost/destdir ; then \ BOOST_OPT="--with-boost=$(abspath omd/packages/boost/destdir)" ; \ - elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ - BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ diff --git a/omd/distros/CENTOS_5.mk b/omd/distros/CENTOS_5.mk index 78623fc..adabad9 100644 --- a/omd/distros/CENTOS_5.mk +++ b/omd/distros/CENTOS_5.mk @@ -1,6 +1,5 @@ DISTRO_CODE = el5 BUILD_PACKAGES = -BUILD_PACKAGES += boost141-devel BUILD_PACKAGES += curl-devel # needed by perl modules / thruk BUILD_PACKAGES += expat-devel BUILD_PACKAGES += fping diff --git a/omd/packages/mk-livestatus/Makefile b/omd/packages/mk-livestatus/Makefile index 23a77ad..90a586a 100644 --- a/omd/packages/mk-livestatus/Makefile +++ b/omd/packages/mk-livestatus/Makefile @@ -10,12 +10,8 @@ build: clean $(MAKE) -C ../../.. $(DIR).tar.gz ; \ fi tar xzf ../../../$(DIR).tar.gz - @if test -d ../boost/local ; then \ - BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \ - elif test -d ../cmk-omd/packages/boost/local ; then \ - BOOST_OPT="--with-boost=$(abspath ../cmk-omd/packages/boost/local)" ; \ - elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ - BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ + @if test -d "$(PACKAGE_BOOST_DESTDIR)" ; then \ + BOOST_OPT="--with-boost=$(PACKAGE_BOOST_DESTDIR)" ; \ else \ BOOST_OPT="DUMMY1=" ; \ fi ; \

6 years, 8 months

5619 FIX memory.include: Ignoring levels led to a crash because the handling of the paramters was not correct

by Simon Betz

Module: check_mk Branch: master Commit: ddc0cf0432919336d2ee8bda9ab9bbb4f7858568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddc0cf04329193… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 18 13:12:34 2018 +0100 5619 FIX memory.include: Ignoring levels led to a crash because the handling of the paramters was not correct Change-Id: Ibfffb74ea8a391d4f27eaa24849fe8b4920ab319 --- .werks/5619 | 11 +++++++++++ checks/memory.include | 53 ++++++++++++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.werks/5619 b/.werks/5619 new file mode 100644 index 0000000..efb311c --- /dev/null +++ b/.werks/5619 @@ -0,0 +1,11 @@ +Title: memory.include: Ignoring levels led to a crash because the handling of the paramters was not correct +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516277491 + + diff --git a/checks/memory.include b/checks/memory.include index c5e40ef..3b34235 100644 --- a/checks/memory.include +++ b/checks/memory.include @@ -39,38 +39,35 @@ def check_memory_simple(used, total, params): get_bytes_human_readable(used), get_bytes_human_readable(total)) - levelstext = "" - status = 0 - # No levels imposed - if params["levels"][0] == "ignore": - warn_abs, crit_abs = None, None - - # Absolute or percentual levels - else: - if params["levels"][0] == "perc_used": - warn_perc, crit_perc = params["levels"][1] - warn_abs = (warn_perc / 100.0) * total - crit_abs = (crit_perc / 100.0) * total - levelstext = " (warn/crit at %s/%s used)" % ( - get_percent_human_readable(warn_perc), - get_percent_human_readable(crit_perc)) + if params["levels"][0] == "perc_used": + warn_perc, crit_perc = params["levels"][1] + warn_abs = (warn_perc / 100.0) * total + crit_abs = (crit_perc / 100.0) * total + levelstext = " (warn/crit at %s/%s used)" % ( + get_percent_human_readable(warn_perc), + get_percent_human_readable(crit_perc)) - elif params["levels"][0] == "abs_free": - warn_abs_free, crit_abs_free = params["levels"][1] - warn_abs = total - warn_abs_free - crit_abs = total - crit_abs_free - levelstext = " (warn/crit below %s/%s free)" % ( - get_bytes_human_readable(warn_abs_free), - get_bytes_human_readable(crit_abs_free)) + elif params["levels"][0] == "abs_free": + warn_abs_free, crit_abs_free = params["levels"][1] + warn_abs = total - warn_abs_free + crit_abs = total - crit_abs_free + levelstext = " (warn/crit below %s/%s free)" % ( + get_bytes_human_readable(warn_abs_free), + get_bytes_human_readable(crit_abs_free)) - if used >= crit_abs: - status = 2 - elif used >= warn_abs: - status = 1 + else: + # No levels imposed, ie. params = {'levels': 'ignore'} + crit_abs = None + warn_abs = None + levelstext = "" - if status: - infotext += levelstext + if crit_abs is not None and used >= crit_abs: + status = 2 + elif warn_abs is not None and used >= warn_abs: + status = 1 + if status: + infotext += levelstext perfdata = [ ("memory_used", used, warn_abs, crit_abs, 0, total) ] return status, infotext, perfdata

6 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018