Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

Unified HostListColumn implementations, deriving from ListColumn now.

by Sven Panne

Module: check_mk Branch: master Commit: b1e260cdbe1cfbed001c1ccd2f6212d45d7a85aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e260cdbe1cfb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 26 11:41:36 2017 +0200 Unified HostListColumn implementations, deriving from ListColumn now. Apart from being much simpler, this does two things: * It makes our list filtering machinery available for those columns. * It fixes a bug: The filter didn't take the AuthUser into account. Change-Id: I77650760e69b4ae259a07fd1a6b605244492c5d0 --- livestatus/src/HostListColumn.cc | 83 +++++++++++++++++++++-------- livestatus/src/HostListColumn.h | 39 +++++++------- livestatus/src/HostListFilter.cc | 110 --------------------------------------- livestatus/src/HostListFilter.h | 51 ------------------ livestatus/src/Makefile.am | 1 - 5 files changed, 82 insertions(+), 202 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1e260cdbe…

6 years, 10 months

5419 Graphs can now be exported as PNG from the graph context menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 53a567a36379826f433d0f692dc6f2d0c98a0c7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53a567a3637982… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 12:03:41 2017 +0200 5419 Graphs can now be exported as PNG from the graph context menu Change-Id: I673fb912188476b38bccf3119453ea0d374d3819 --- .werks/5419 | 10 ++++++++++ web/htdocs/js/checkmk.js | 4 ++-- web/htdocs/visuals.py | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/5419 b/.werks/5419 new file mode 100644 index 0000000..b525a98 --- /dev/null +++ b/.werks/5419 @@ -0,0 +1,10 @@ +Title: Graphs can now be exported as PNG from the graph context menu +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1509012187 +Class: feature + + diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index afcbab8..f60ca18 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3269,13 +3269,13 @@ function pagetype_add_to_container(page_type, page_name) }); } -function graph_export() +function graph_export(page) { var request = { "specification": popup_data[2]["definition"]["specification"], "data_range": popup_data[2]["data_range"], }; - location.href = "graph_export.py?request=" + encodeURIComponent(JSON.stringify(request)); + location.href = page + ".py?request=" + encodeURIComponent(JSON.stringify(request)); } //#. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 19308f4..1b01ed6 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1575,10 +1575,14 @@ def ajax_popup_add(): html.close_li() html.open_li() - html.open_a(href="javascript:graph_export()") + html.open_a(href="javascript:graph_export(\"graph_export\")") html.img(src="images/icon_download.png") html.write(_("Export as JSON")) html.close_a() + html.open_a(href="javascript:graph_export(\"graph_image\")") + html.img(src="images/icon_download.png") + html.write(_("Export as PNG")) + html.close_a() html.close_li() html.close_ul()

6 years, 10 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: a1468577993e1b36c15e60e1c9ca3848273f8265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1468577993e1b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 26 11:08:21 2017 +0200 Reserved 20 Werk IDS Change-Id: I110287eb84176b5cebfaec366ed6a4eb23820fee --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2244fb3..ec296f1 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5438 +5458

6 years, 10 months

Fixed wrong makefile targets

by Lars Michelsen

Module: check_mk Branch: master Commit: 48ab056b03333db9dca5a3337d23ae8b912179f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48ab056b03333d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 11:02:07 2017 +0200 Fixed wrong makefile targets Change-Id: I4fe6e7530e641f24d647fc28f6cfa2ce1dc14d2c --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2f6eb29..f20de9d 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ check-version: # And --transform is also missing ... dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) ifeq ($(ENTERPRISE),yes) - $(MAKE) -C enterprise enterprise/agents/plugins/cmk-update-agent + $(MAKE) -C enterprise agents/plugins/cmk-update-agent endif @EXCLUDES= ; \ if [ -d .git ]; then \

6 years, 10 months

2nd temporary hack: Exclude additional agent updater build artefacts

by Lars Michelsen

Module: check_mk Branch: master Commit: 00e365fb7f105d322ff2b5aa7dbd96fc0f5c6770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00e365fb7f105d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 10:48:34 2017 +0200 2nd temporary hack: Exclude additional agent updater build artefacts Change-Id: I86cd3249259e0cf311d409bc76f6d92454899330 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6569282..2f6eb29 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ endif --exclude .gitmodules \ --exclude .gitattributes \ --exclude $(DIST_ARCHIVE) \ - --exclude enterprise/agents/plugins/build \ + --exclude enterprise/agents/plugins/{build,src} \ $$EXCLUDES \ * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) ; \ if [ -f COMMIT ]; then \

6 years, 10 months

5307 FIX windows_updates: Added information about default cache age and asynchronious execution

by Marcel Arentz

Module: check_mk Branch: master Commit: a6baffae86e4ccd4cf03209682982cf39d53e4da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6baffae86e4cc… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Oct 26 10:31:56 2017 +0200 5307 FIX windows_updates: Added information about default cache age and asynchronious execution In werk #4835 a default caching and asynchronious execution of the plugin has been added. The information about default caching and execution mode is now also available in the help text of the bakery rule. Change-Id: If727dfafc5a19c954518d3a820c589a0066cb72d --- .werks/5307 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5307 b/.werks/5307 new file mode 100644 index 0000000..aca7b83 --- /dev/null +++ b/.werks/5307 @@ -0,0 +1,12 @@ +Title: windows_updates: Added information about default cache age and asynchronious execution +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509006506 +Class: fix + +In werk #4835 a default caching and asynchronious execution of the plugin +has been added. The information about default caching and execution mode is +now also available in the help text of the bakery rule.

6 years, 10 months

Unified ServiceListFilter implementations.

by Sven Panne

Module: check_mk Branch: master Commit: c84e8b9b8e80b6fb11e2c72e5790799934487d63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84e8b9b8e80b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 26 09:19:53 2017 +0200 Unified ServiceListFilter implementations. Change-Id: I8d73fdc103c1df933a26daeafa6b35c32bd3beaf --- livestatus/src/ServiceListColumn.cc | 2 +- livestatus/src/ServiceListColumn.h | 6 ++- livestatus/src/ServiceListFilter.cc | 83 +++++++++++++++++++++++++------------ 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index abe6146..8b8c849 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -33,7 +33,7 @@ extern TimeperiodsCache *g_timeperiods_cache; -servicesmember *ServiceListColumn::getMembers(Row row) const { +ServiceListColumn::service_list ServiceListColumn::getMembers(Row row) const { if (auto p = columnData<servicesmember *>(row)) { return *p; } diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index 8e1fc47..617c77e 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -59,11 +59,13 @@ public: const contact *auth_user) const override; std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + #ifdef CMC - const Host::services_t *getMembers(Row row) const; + using service_list = const Host::services_t *; #else - servicesmember *getMembers(Row row) const; + using service_list = servicesmember *; #endif + service_list getMembers(Row row) const; private: MonitoringCore *_mc; diff --git a/livestatus/src/ServiceListFilter.cc b/livestatus/src/ServiceListFilter.cc index 6cfebb0..ad54925 100644 --- a/livestatus/src/ServiceListFilter.cc +++ b/livestatus/src/ServiceListFilter.cc @@ -27,7 +27,14 @@ #include "Logger.h" #include "Row.h" #include "ServiceListColumn.h" + +#ifdef CMC +#include <memory> +#include "Host.h" +#include "Service.h" +#else #include "nagios.h" +#endif namespace { constexpr char hostservice_separator = '|'; @@ -49,7 +56,7 @@ ServiceListFilter::ServiceListFilter(const ServiceListColumn &column, auto pos = value.find(hostservice_separator); if (pos == std::string::npos) { if (_hostname_required) { - Informational(column.logger()) + Informational(_column.logger()) << "Invalid reference value for service " "list membership. Must be 'hostname" << std::string(1, hostservice_separator) << "servicename'"; @@ -62,40 +69,64 @@ ServiceListFilter::ServiceListFilter(const ServiceListColumn &column, } } -bool ServiceListFilter::accepts( - Row row, const contact * /* auth_user */, - std::chrono::seconds /* timezone_offset */) const { - // data points to a primary data object. We need to extract a pointer to a - // service list - servicesmember *mem = _column.getMembers(row); +namespace { +bool isEmpty(ServiceListColumn::service_list servicelist) { +#ifdef CMC + return servicelist->empty(); +#else + return servicelist == nullptr; +#endif +} - // test for empty list - if (_ref_host.empty()) { - if (_relOp == RelationalOperator::equal) { - return mem == nullptr; - } - if (_relOp == RelationalOperator::not_equal) { - return mem != nullptr; +bool contains(ServiceListColumn::service_list servicelist, + const std::string &ref_host, const std::string &ref_service, + bool hostname_required) { +#ifdef CMC + for (const auto &service : *servicelist) { + if ((!hostname_required || service->host()->name() == ref_host) && + service->name() == ref_service) { + return true; } } - - bool is_member = false; - for (; mem != nullptr; mem = mem->next) { - service *svc = mem->service_ptr; - if ((!_hostname_required || svc->host_name == _ref_host) && - svc->description == _ref_service) { - is_member = true; - break; + return false; +#else + for (; servicelist != nullptr; servicelist = servicelist->next) { + service *svc = servicelist->service_ptr; + if ((!hostname_required || svc->host_name == ref_host) && + svc->description == ref_service) { + return true; } } + return false; +#endif +} +} // namespace +bool ServiceListFilter::accepts( + Row row, const contact * /* auth_user */, + std::chrono::seconds /* timezone_offset */) const { + auto servicelist = _column.getMembers(row); switch (_relOp) { - case RelationalOperator::less: - return !is_member; - case RelationalOperator::greater_or_equal: - return is_member; case RelationalOperator::equal: + if (!_ref_host.empty()) { + Informational(_column.logger()) + << "Sorry, equality for service lists implemented only for emptiness"; + return false; + } + return isEmpty(servicelist); case RelationalOperator::not_equal: + if (!_ref_host.empty()) { + Informational(_column.logger()) + << "Sorry, inequality for service lists implemented only for emptiness"; + return false; + } + return !isEmpty(servicelist); + case RelationalOperator::less: + return !contains(servicelist, _ref_host, _ref_service, + _hostname_required); + case RelationalOperator::greater_or_equal: + return contains(servicelist, _ref_host, _ref_service, + _hostname_required); case RelationalOperator::matches: case RelationalOperator::doesnt_match: case RelationalOperator::equal_icase:

6 years, 10 months

Temorary hack to fix agent updater builds

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a1a9af65c81c9d16b9389a17ba4fcefec401b49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a1a9af65c81c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 10:02:02 2017 +0200 Temorary hack to fix agent updater builds Change-Id: I8078d7dc5a18bc5f30e0d6dfb2ceb5175c0ae2dc --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0af623a..6569282 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ check-version: # And --transform is also missing ... dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) ifeq ($(ENTERPRISE),yes) - $(MAKE) -C enterprise make-agent-updater + $(MAKE) -C enterprise enterprise/agents/plugins/cmk-update-agent endif @EXCLUDES= ; \ if [ -d .git ]; then \ @@ -220,6 +220,7 @@ endif --exclude .gitmodules \ --exclude .gitattributes \ --exclude $(DIST_ARCHIVE) \ + --exclude enterprise/agents/plugins/build \ $$EXCLUDES \ * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) ; \ if [ -f COMMIT ]; then \

6 years, 10 months

Try to fix building RPMs

by Lars Michelsen

Module: check_mk Branch: master Commit: 10e8e0b8716931c14058ce594ed73147f3af44e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10e8e0b8716931… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 08:57:42 2017 +0200 Try to fix building RPMs Change-Id: Ib8cc4184c47501264fd648afccb37d91118bb0ee --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 3adacc4..0af623a 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,8 @@ check-version: echo "Version $(VERSION) not listed at top of ChangeLog!" ; \ false ; } +# Is executed by our build environment from a "git archive" snapshot and during +# RPM building to create the source tar.gz for the RPM build process. # Would use --exclude-vcs-ignores but that's available from tar 1.29 which # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available

6 years, 10 months

Make IWYU happy again.

by Sven Panne

Module: check_mk Branch: master Commit: d9dac2db981c2dc67e8e4a562aac87855e1af058 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9dac2db981c2d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 26 08:06:16 2017 +0200 Make IWYU happy again. Change-Id: I9bd5d574b0574c61dabf7a21d27603ae1512180e --- livestatus/src/HostListFilter.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/HostListFilter.cc b/livestatus/src/HostListFilter.cc index 5e18c6b..9ac5f29 100644 --- a/livestatus/src/HostListFilter.cc +++ b/livestatus/src/HostListFilter.cc @@ -33,7 +33,6 @@ #include <unordered_set> #include "World.h" #include "cmc.h" -class Host; #else #include "nagios.h" #endif

6 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
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