Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 9767794d39e0402b5f307bfeda58c799bc8a3510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9767794d39e040… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 25 10:02:30 2017 +0200 Fixed CustomVars* class hierarchy. Apart from being simpler and more consistent, this enables the full power of our filtering machinery custom variable names/values. Previously only a membership test was possible. Change-Id: I6b3b6c7af56bc23ff52c731e1a85397f40de21f6 --- livestatus/src/CustomVarsColumn.cc | 66 -------------------------------- livestatus/src/CustomVarsColumn.h | 47 ----------------------- livestatus/src/CustomVarsDictColumn.cc | 34 ++++++++-------- livestatus/src/CustomVarsDictColumn.h | 16 +++++--- livestatus/src/CustomVarsDictFilter.cc | 10 +++-- livestatus/src/CustomVarsDictFilter.h | 6 +-- livestatus/src/CustomVarsListFilter.cc | 64 ------------------------------- livestatus/src/CustomVarsListFilter.h | 51 ------------------------ livestatus/src/CustomVarsNamesColumn.cc | 52 +++++++++++++------------ livestatus/src/CustomVarsNamesColumn.h | 25 ++++++------ livestatus/src/CustomVarsValuesColumn.cc | 49 +++++++++++++----------- livestatus/src/CustomVarsValuesColumn.h | 25 ++++++------ livestatus/src/Makefile.am | 2 - livestatus/src/Renderer.h | 2 +- 14 files changed, 119 insertions(+), 330 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9767794d39…

6 years, 10 months

5350 check_http: Special characters in expected string of the content

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f4caa30fafb1549f82b2b81c575fc033cdc22e5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4caa30fafb154… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 25 12:06:50 2017 +0200 5350 check_http: Special characters in expected string of the content The option "Fixed string to expect in the content" of the WATO-Rule "Check HTTP service" now allows the user to enter special character like umlauts. Change-Id: If9d373bd5ab35222c524a5e03a32eb9966dc698b --- .werks/5350 | 12 ++++++++++++ web/plugins/wato/active_checks.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5350 b/.werks/5350 new file mode 100644 index 0000000..71fa635 --- /dev/null +++ b/.werks/5350 @@ -0,0 +1,12 @@ +Title: check_http: Special characters in expected string of the content +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508925797 +Class: feature + +The option "Fixed string to expect in the content" of the WATO-Rule +"Check HTTP service" now allows the user to enter special character +like umlauts. diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index ce015c6..95e2f83 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1044,7 +1044,7 @@ register_rule(group, ) ), ( "expect_string", - TextAscii( + TextUnicode( title = _("Fixed string to expect in the content"), allow_empty = False, )

6 years, 10 months

5131 suseconnect: New check to monitor information about SLES licenses via SUSEConnect

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7fd05746f83dbc6645e5cda8c5cede20ccc49081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd05746f83dbc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Sep 14 11:59:27 2017 +0200 5131 suseconnect: New check to monitor information about SLES licenses via SUSEConnect This check parses the information provided by the SUSEConnect command. If the command is availible, information about the registration status, subscription status, subscription type, registration code as well as the start and end date of the SLES license are shown. The information is also shown in the Hardware/Software Inventory. As a preparation you need to install the agent plugin {SUSEConnect} into your agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). The check can be configured via the corresponding WATO rule {SLES License}. Change-Id: I2823064d2c69b1baaa949fb3d1de7c9fcc944072 --- .werks/5131 | 20 ++++++ agents/plugins/mk_suseconnect | 30 +++++++++ checkman/suseconnect | 23 +++++++ checks/suseconnect | 123 +++++++++++++++++++++++++++++++++++ inventory/suseconnect | 46 +++++++++++++ web/plugins/wato/check_parameters.py | 42 ++++++++++++ 6 files changed, 284 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7fd05746f8…

6 years, 10 months

Made MetricsColumn a ListColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 64f5197e84cd71f34f9f59b0f2aef47beb117407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64f5197e84cd71… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 25 09:21:36 2017 +0200 Made MetricsColumn a ListColumn. This unifies things and enables the use of our filtering machinery on this column type (which was previously not possible). Change-Id: I5130c9d68f760c5f0211dbf452becd6b45884909 --- livestatus/src/DoubleColumn.h | 2 +- livestatus/src/ListColumn.h | 2 +- livestatus/src/MetricsColumn.cc | 14 +++++++++++--- livestatus/src/MetricsColumn.h | 13 ++++++++----- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/livestatus/src/DoubleColumn.h b/livestatus/src/DoubleColumn.h index 4a2b560..8ba6017 100644 --- a/livestatus/src/DoubleColumn.h +++ b/livestatus/src/DoubleColumn.h @@ -43,7 +43,7 @@ public: int offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} - virtual double getValue(Row data) const = 0; + virtual double getValue(Row row) const = 0; void output(Row row, RowRenderer &r, const contact *auth_user) const override; ColumnType type() const override { return ColumnType::double_; } diff --git a/livestatus/src/ListColumn.h b/livestatus/src/ListColumn.h index c4cb893..1537ab1 100644 --- a/livestatus/src/ListColumn.h +++ b/livestatus/src/ListColumn.h @@ -51,7 +51,7 @@ public: // TODO(sp) What we actually want here is a stream of strings, not a // concrete container. virtual std::vector<std::string> getValue( - Row data, const contact *auth_user) const = 0; + Row row, const contact *auth_user) const = 0; }; #endif // ListColumn_h diff --git a/livestatus/src/MetricsColumn.cc b/livestatus/src/MetricsColumn.cc index 380fecf..2a13b5b 100644 --- a/livestatus/src/MetricsColumn.cc +++ b/livestatus/src/MetricsColumn.cc @@ -26,8 +26,16 @@ #include "Renderer.h" #include "Row.h" -void MetricsColumn::output(Row /* row */, RowRenderer &r, - const contact * /* auth_user */) const { - (void)_mc; +void MetricsColumn::output(Row row, RowRenderer &r, + const contact *auth_user) const { ListRenderer l(r); + for (const auto &metric : getValue(row, auth_user)) { + l.output(metric); + } +} + +std::vector<std::string> MetricsColumn::getValue( + Row /*row*/, const contact * /*auth_user*/) const { + (void)_mc; + return {}; } diff --git a/livestatus/src/MetricsColumn.h b/livestatus/src/MetricsColumn.h index e775e3c..c30bf4c 100644 --- a/livestatus/src/MetricsColumn.h +++ b/livestatus/src/MetricsColumn.h @@ -27,25 +27,28 @@ #include "config.h" // IWYU pragma: keep #include <string> -#include "Column.h" +#include <vector> +#include "ListColumn.h" #include "contact_fwd.h" class MonitoringCore; class Row; class RowRenderer; -class MetricsColumn : public Column { +class MetricsColumn : public ListColumn { public: MetricsColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset, MonitoringCore *mc) - : Column(name, description, indirect_offset, extra_offset, - extra_extra_offset, offset) + : ListColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset, offset) , _mc(mc) {} - ColumnType type() const override { return ColumnType::list; } void output(Row row, RowRenderer &r, const contact *auth_user) const override; + std::vector<std::string> getValue(Row row, + const contact *auth_user) const override; + private: MonitoringCore *const _mc; };

6 years, 10 months

Fixed compile calls of chroot builds

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c8c69c83f5fe8115c3686e842babc8c470895af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c8c69c83f5fe8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 25 08:59:25 2017 +0200 Fixed compile calls of chroot builds Change-Id: I0b111c746307188b3e478e34efa76a6d2cdeaa49 --- agents/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/Makefile b/agents/Makefile index a765110..d28a1b8 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -66,7 +66,7 @@ build: $(MAKE) packages cd windows && sudo \ CHROOT_NAME=$$CHROOT_NAME \ - CHROOT_PATH=$$CHROOT_PATH \ + CHROOT_BASE_PATH=$$CHROOT_BASE_PATH \ CHROOT_BUILD_DIR=$$CHROOT_BUILD_DIR \ ./make-agent

6 years, 10 months

made help text more general

by Marcel Arentz

Module: check_mk Branch: master Commit: 6b2c2d13ec1f48229f10196961516b520a0d956d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b2c2d13ec1f48… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 25 08:28:47 2017 +0200 made help text more general Change-Id: I35d5e7cb9143353fd94763071b4b71d5c851aa68 --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index c127b7f..4d05751 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1010,7 +1010,7 @@ register_configvar(group, label = _("enable GIT version control"), help = _("When enabled, all changes of configuration files are tracked with the " "version control system GIT. You need to make sure that git is installed " - "on your Nagios server. The version history currently cannot be viewed " + "on your monitoring server. The version history currently cannot be viewed " "via the web GUI. Please use git command line tools within your Check_MK " "configuration directory."), ),

6 years, 10 months

chroot builds: Fixed paths of chroots

by Lars Michelsen

Module: check_mk Branch: master Commit: 900b3f6afbd0f436f8edbb5880cd0c7a665ee458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900b3f6afbd0f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 16:19:51 2017 +0200 chroot builds: Fixed paths of chroots Change-Id: I7c12085937de6a919245324de66db5b535afacac --- agents/windows/make-agent | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 8567303..372efe4 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -22,6 +22,7 @@ chroot_dependencies=(debootstrap debian-archive-keyring) versionfile=chroot_version base="$(realpath ../..)" +base_rel_dir=agents/windows # May be set from external environment. Otherwise use chroot # directory in agents/windows @@ -39,8 +40,9 @@ fi # elements to make # a) different namespaces possible for (windows agent, agent updater) # b) parallel builds of different chroot versions possible +CHROOT_VERSION=$(<$base/agents/windows/$versionfile) CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} -export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION +export CHROOT_PATH=$CHROOT_BASE_PATH/$CHROOT_NAME/$CHROOT_VERSION echo "CHROOT_PATH is $CHROOT_PATH"

6 years, 10 months

Log chroot path; Hand over chroot vars to test .f12 calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 87ab35d0b219d47384515e971685290e037b973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ab35d0b219d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 16:13:19 2017 +0200 Log chroot path; Hand over chroot vars to test .f12 calls Change-Id: I8b9a86f8bae5888979ad3e009bd7b11d0abaad05 --- agents/windows/make-agent | 2 ++ tests/testlib/__init__.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index b7ea530..8567303 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -42,6 +42,8 @@ fi CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION +echo "CHROOT_PATH is $CHROOT_PATH" + # Realize a file based locking for the chroot setup. There must be only # a single caller executing the setup of a chroot. Once the chroot was # created, multiple jobs may be executed in the chroot simultaneously, diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2ee739d..1feac9b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -526,7 +526,9 @@ class Site(object): print("Executing .f12 in \"%s\"..." % path) sys.stdout.flush() assert os.system("cd \"%s\" ; " - "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s bash -x .f12" % + "sudo PATH=$PATH ONLY_COPY=1 ALL_EDITIONS=0 SITE=%s " + "CHROOT_BASE_PATH=$CHROOT_BASE_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR " + "bash -x .f12" % (path, self.id)) >> 8 == 0 print("Executing .f12 in \"%s\" DONE" % path) sys.stdout.flush()

6 years, 10 months

Added CHROOT_NAME to chroot directory hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: bb98c18468f1eaaa5dd4360c0bcfc9bc4ffd1203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb98c18468f1ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 16:02:46 2017 +0200 Added CHROOT_NAME to chroot directory hierarchy Change-Id: I89edbb26bd67786e70de3577afa753b25f99e1fe --- agents/windows/make-agent | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index c664283..b7ea530 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -25,7 +25,6 @@ base="$(realpath ../..)" # May be set from external environment. Otherwise use chroot # directory in agents/windows -export CHROOT_PATH=${CHROOT_PATH:-$base/agents/windows/chroot} export CHROOT_BUILD_DIR=${CHROOT_BUILD_DIR:-build} export CHROOT_NAME=${CHROOT_NAME:-WinAgent} @@ -35,6 +34,14 @@ if [ ! -f "$base/agents/windows/$versionfile" ] ; then exit 1 fi +# Get possible CHROOT_BASE_PATH from environment. Default to the "chroot" +# subdirectory. Add the CHROOT_NAME and CHROOT_VERSION as additional path +# elements to make +# a) different namespaces possible for (windows agent, agent updater) +# b) parallel builds of different chroot versions possible +CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} +export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION + # Realize a file based locking for the chroot setup. There must be only # a single caller executing the setup of a chroot. Once the chroot was # created, multiple jobs may be executed in the chroot simultaneously,

6 years, 10 months

Blacklisted non executable build specific files

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fe0b556a9b1d02fa035cc25ca9caef95a667392 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fe0b556a9b1d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 15:39:04 2017 +0200 Blacklisted non executable build specific files Change-Id: I2f4cc7845e88c3a1a490efda2bbb68e1ec576d28 --- tests/git/test_permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 4204762..e67eebc 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -32,7 +32,7 @@ permissions = [ ('enterprise/bin/*', is_executable, []), ('enterprise/active_checks/*', is_executable, []), ('enterprise/agents/bakery/*', is_not_executable, []), - ('enterprise/agents/plugins/*', is_executable, []), + ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make"]), ('enterprise/alert_handlers/*', is_executable, []), ('enterprise/alert_handlers/*', is_executable, []), ]

6 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017