Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Just for consistency: Handle unknown timeperiod as 24X7.

by Sven Panne

Module: check_mk Branch: master Commit: 164f1f1ba2cccb8bf2b7474c5545541f6766ed9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164f1f1ba2cccb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 3 12:24:34 2018 +0200 Just for consistency: Handle unknown timeperiod as 24X7. Change-Id: I876ba0a87033171972f6d3956e20e20c17fe4ca8 --- livestatus/src/TimeperiodColumn.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/livestatus/src/TimeperiodColumn.cc b/livestatus/src/TimeperiodColumn.cc index 6986acd..dbad88b 100644 --- a/livestatus/src/TimeperiodColumn.cc +++ b/livestatus/src/TimeperiodColumn.cc @@ -51,6 +51,5 @@ int32_t TimeperiodColumn::getValue(Row row, return g_timeperiods_cache->inTimeperiod(tp) ? 1 : 0; } #endif - // no timeperiod set -> assume 24X7 - return 0; + return 1; // unknown timeperiod is assumed to be 24X7 }

6 years

Fix missing blanks in help text

by Moritz Kiemer

Module: check_mk Branch: master Commit: bbb6e40dceb9c2600ae812eb0a9bf3f53b162b03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbb6e40dceb9c2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Aug 31 09:51:34 2018 +0200 Fix missing blanks in help text Change-Id: I214d191b0e3c2e6795521eb7ef79279c67b81904 --- cmk/gui/plugins/wato/check_mk_configuration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 6ae87ae..8fa083b 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -2705,9 +2705,9 @@ register_rule(group, ("specific_missing_sections", ListOf( Tuple(elements=[ RegExpUnicode( - help = _('Beside of setting the generic "Missing sections" state above' - 'you can specify a regex pattern to match specific section names and' - 'give them an individual state in case they are missing.' + help = _('Beside of setting the generic "Missing sections" state above ' + 'you can specify a regex pattern to match specific section names and ' + 'give them an individual state in case they are missing. ' 'Note that the first match is used.'), mode = RegExpUnicode.prefix), MonitoringState(),

6 years

6529 FIX df: Fixed inode monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 841e386d860d01b2220716c68efb43230bb12d3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=841e386d860d01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 3 09:31:28 2018 +0200 6529 FIX df: Fixed inode monitoring Change-Id: I5b6ec003fc92737891487e96edfe24ca1b7a213b --- .werks/6529 | 11 +++++++++++ checks/df.include | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6529 b/.werks/6529 new file mode 100644 index 0000000..ea20768 --- /dev/null +++ b/.werks/6529 @@ -0,0 +1,11 @@ +Title: df: Fixed inode monitoring +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535959761 + + diff --git a/checks/df.include b/checks/df.include index 9cf5e02..84eb691 100644 --- a/checks/df.include +++ b/checks/df.include @@ -301,8 +301,8 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): return df_check_filesystem_single(mp, blocks_info[mp]["size_mb"], blocks_info[mp]["avail_mb"], blocks_info[mp]["reserved_mb"], - blocks_info[mp].get("inodes_total", None), - blocks_info[mp].get("inodes_avail", None), + inodes_info.get(mp, {}).get("inodes_total", None), + inodes_info.get(mp, {}).get("inodes_avail", None), params) else: return 3, "filesystem not found"

6 years

Revert "5170 FIX Removed TMPFS config hook"

by Lars Michelsen

Module: check_mk Branch: master Commit: 28332240bf3d7f7ac5cc84821b847a5ae69f5623 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28332240bf3d7f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Sep 1 19:42:55 2018 +0200 Revert "5170 FIX Removed TMPFS config hook" This reverts commit 8bbd16c4d130816fabcef373eaf7c22db86eb7fa. Change-Id: I5bc8c05a810a6492517cb5308363fd4f5def96dc --- omd/packages/omd/TMPFS.hook | 25 +++++++++++++++++++++++++ omd/packages/omd/omd | 13 +++++++++++++ 2 files changed, 38 insertions(+) diff --git a/omd/packages/omd/TMPFS.hook b/omd/packages/omd/TMPFS.hook new file mode 100755 index 0000000..350221d --- /dev/null +++ b/omd/packages/omd/TMPFS.hook @@ -0,0 +1,25 @@ +#!/bin/bash + +# Alias: Use a ramdisk for temporary files +# Menu: Basic +# This settings decides, wether this site uses a ramdisk for +# temporary files. Using a ramdisk reduces disk IO produced +# during monitoring dramatically. It is highly recommended to +# leave this option enabled. Only disable this if you really +# need to. + +case "$1" in + default) + echo "on" + ;; + choices) + echo "on: Use a ramdisk for temporary files" + echo "off: Do not use a ramdisk within this site" + ;; + set) + # Unmount the tmpfs when it was mounted before + if [ "$2" == "off" ]; then + omd umount + fi + ;; +esac diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 0a7f7ae..ede9538 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -1594,6 +1594,19 @@ def prepare_tmpfs(sitename, tmp): if tmpfs_mounted(sitename): return # Fine: Mounted + if g_site_conf["TMPFS"] != "on": + if os.path.exists(tmp): + return + + sys.stdout.write("Preparing tmp directory %s..." % tmp) + sys.stdout.flush() + try: + os.mkdir(tmp) + except OSError, e: + if e.errno != errno.EEXIST: # File exists + raise + return + sys.stdout.write("Creating temporary filesystem %s..." % tmp) sys.stdout.flush() if not os.path.exists(tmp):

6 years

6528 FIX TMPFS config hook is now available again

by Lars Michelsen

Module: check_mk Branch: master Commit: 894a4de5b39ee66d403c65adb37412ec4bf8a43a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894a4de5b39ee6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Sep 1 19:48:20 2018 +0200 6528 FIX TMPFS config hook is now available again The hook as removed during 1.5 development (#5170). Since it is useful to disable TMPFS especially when Check_MK sites are used in container environments. E.g. when using Docker tmpfs mounts in containers are only possible with privileged containers or SYS_ADMIN capability. In this situation it is better to turn off the TMPFS in the site and tell docker to mount a tmpfs in the sites tmp directory during container creation (e.g. using docker run --tmpfs /omd/sites/[site]/tmp). Change-Id: I203ba1e44f1bbf253d647a85e0633d3c2db1fd9e --- .werks/6528 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/6528 b/.werks/6528 new file mode 100644 index 0000000..957b46f --- /dev/null +++ b/.werks/6528 @@ -0,0 +1,19 @@ +Title: TMPFS config hook is now available again +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535823785 + +The hook as removed during 1.5 development (#5170). Since it is +useful to disable TMPFS especially when Check_MK sites are used +in container environments. + +E.g. when using Docker tmpfs mounts in containers are only possible with +privileged containers or SYS_ADMIN capability. In this situation it is +better to turn off the TMPFS in the site and tell docker to mount a +tmpfs in the sites tmp directory during container creation +(e.g. using docker run --tmpfs /omd/sites/[site]/tmp).

6 years

6527 FIX Add missing package dependency cron/cronie on most distros

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ca5a0c654256bfc90c7a9fdcc462e9e6ae55390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca5a0c654256b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Sep 1 19:34:47 2018 +0200 6527 FIX Add missing package dependency cron/cronie on most distros Change-Id: I660c7621ed9756b413980a1b5458cf62d1a6872b --- .werks/6527 | 11 +++++++++++ omd/distros/DEBIAN_7.mk | 1 + omd/distros/DEBIAN_8.mk | 1 + omd/distros/DEBIAN_9.mk | 1 + omd/distros/SLES_11SP1.mk | 1 + omd/distros/SLES_11SP2.mk | 1 + omd/distros/SLES_11SP3.mk | 1 + omd/distros/SLES_11SP4.mk | 1 + omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + omd/distros/SLES_12SP2.mk | 1 + omd/distros/SLES_12SP3.mk | 1 + omd/distros/UBUNTU_12.04.mk | 1 + omd/distros/UBUNTU_13.04.mk | 1 + omd/distros/UBUNTU_14.04.mk | 1 + omd/distros/UBUNTU_15.04.mk | 1 + omd/distros/UBUNTU_16.04.mk | 1 + omd/distros/UBUNTU_16.10.mk | 1 + omd/distros/UBUNTU_17.04.mk | 1 + omd/distros/UBUNTU_17.10.mk | 1 + omd/distros/UBUNTU_18.04.mk | 1 + 21 files changed, 31 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ca5a0c654…

6 years

6531 FIX Fixed background color of host state columns in views when host is down

by Lars Michelsen

Module: check_mk Branch: master Commit: 914f938e385ded7cfb8f30739ba7f6f9de24b3e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=914f938e385ded… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 3 11:46:18 2018 +0200 6531 FIX Fixed background color of host state columns in views when host is down The DOWN state was always colored yellow instead of red. Change-Id: I87dc2239ebd451113264fbdd02dae88ef8e95669 --- .werks/6531 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6531 b/.werks/6531 new file mode 100644 index 0000000..9c62305 --- /dev/null +++ b/.werks/6531 @@ -0,0 +1,11 @@ +Title: Fixed background color of host state columns in views when host is down +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1535967942 + +The DOWN state was always colored yellow instead of red.

6 years

mgmt_ipmi_sensors: Provide more info about IPMI state mapping

by Moritz Kiemer

Module: check_mk Branch: master Commit: cf67368681b4246905ad0b5fef6a0b681d5f2bd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf67368681b424… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 3 11:59:01 2018 +0200 mgmt_ipmi_sensors: Provide more info about IPMI state mapping Change-Id: I5343bf1e8c36e7ab04cf2a8c4c32e0724242716a --- checkman/mgmt_ipmi_sensors | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/checkman/mgmt_ipmi_sensors b/checkman/mgmt_ipmi_sensors index 82491bc..3218696 100644 --- a/checkman/mgmt_ipmi_sensors +++ b/checkman/mgmt_ipmi_sensors @@ -8,6 +8,13 @@ description: management board monitoring reports states about all available fans, temperature sensors and power supplies. + Note that IPMI provides four states: 'ok', 'non-critical', 'critical' and + 'non-recoverable'. The default Check-MK behaviour is to map 'ok' to {OK}, + 'non-critical' to {WARN} and 'critical' and 'non-recoverable' to {CRIT}. + However, some manufacturers choose to display both 'ok' and 'non-critical' + as normal on their provided tools. If you want Check-MK to behave similarly, + you can set up a corresponding "Service State Translation" rule. + item: The name of the sensor as provided via IPMI.

6 years

6473 zpool: Now also available for linux

by Marcel Arentz

Module: check_mk Branch: master Commit: 511deefbebb8f001dee1353e11bfd5f6a6b9b0e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=511deefbebb8f0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 29 13:14:59 2018 +0200 6473 zpool: Now also available for linux The zpool will now be checked also on linux systems. Change-Id: Ic6f8335e2163b9fbbbdd5c2025f380e4b2cb08ac --- .werks/6473 | 10 ++++++++++ agents/check_mk_agent.linux | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6473 b/.werks/6473 new file mode 100644 index 0000000..e94c0d6 --- /dev/null +++ b/.werks/6473 @@ -0,0 +1,10 @@ +Title: zpool: Now also available for linux +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535541128 +Class: feature + +The zpool will now be checked also on linux systems. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8a1e6b3..5180426 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -839,8 +839,10 @@ fi # We do not endorse running ZFS on linux if your vendor doesnt support it ;) # check zpool status if type zpool >/dev/null; then - echo "<<<zpool_status>>>" - zpool status -x + echo "<<<zpool_status>>>" + zpool status -x + echo "<<<zpool>>>" + zpool list fi

6 years

Make IWYU happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 319a81193858ab41e5e0ae76d31deeba2548f294 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=319a81193858ab… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 3 09:54:06 2018 +0200 Make IWYU happy again. Change-Id: Ib27033ecdd6ef2f254e6744b5ebf84141157e9dc --- livestatus/src/Logfile.cc | 5 +---- livestatus/src/Logfile.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f66efb1..e96fcae 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -29,6 +29,7 @@ #include <cstdlib> #include <sstream> #include <utility> +#include <vector> #include "LogCache.h" #include "LogEntry.h" #include "Logger.h" @@ -37,11 +38,7 @@ #include "Row.h" #ifdef CMC -#include <new> #include "cmc.h" -#else -#include <memory> -#include <vector> #endif namespace { diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 4a97391..5f07068 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -40,7 +40,6 @@ class MonitoringCore; class Query; #ifdef CMC -#include <vector> class World; #endif

6 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018