Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Sven Panne

Module: check_mk Branch: master Commit: f7ce37bfd8b0a38b34f782d9fef2b95c8254ac9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7ce37bfd8b0a3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 10:27:54 2017 +0100 IWYU fixes. Change-Id: I9284ea53c1b54b1cc3692ee9b1970daa64089b9b --- livestatus/src/Column.h | 1 + livestatus/src/TableEventConsole.h | 1 + 2 files changed, 2 insertions(+) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index a396f83..9a2ec06 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -26,6 +26,7 @@ #define Column_h #include "config.h" // IWYU pragma: keep +#include <chrono> #include <cstddef> #include <memory> #include <string> diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 88fca97..f0b7d53 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <sys/types.h> +#include <chrono> #include <cstdint> #include <cstdlib> #include <functional>

6 years, 11 months

Extract update logic, separating it from filtering logic.

by Sven Panne

Module: check_mk Branch: master Commit: dcdb151e5e9e945650a943dd6e3e5ecbb887206c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcdb151e5e9e94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 10:12:32 2017 +0100 Extract update logic, separating it from filtering logic. Change-Id: I5a4832b109da1e99bbcf8834cfb8fbee2cd1484f --- livestatus/src/HostListStateColumn.cc | 113 ++++++++++++++++--------------- livestatus/src/HostListStateColumn.h | 2 + livestatus/src/ServiceListStateColumn.cc | 67 ++++++++++-------- livestatus/src/ServiceListStateColumn.h | 2 + 4 files changed, 99 insertions(+), 85 deletions(-) diff --git a/livestatus/src/HostListStateColumn.cc b/livestatus/src/HostListStateColumn.cc index 9f43fc5..a3d5002 100644 --- a/livestatus/src/HostListStateColumn.cc +++ b/livestatus/src/HostListStateColumn.cc @@ -55,66 +55,69 @@ int32_t HostListStateColumn::getValue(Row row, const contact *auth_user) const { host *hst = mem->host_ptr; if (auth_user == nullptr || is_authorized_for(_mc, auth_user, hst, nullptr)) { - switch (_logictype) { - case Type::num_svc_pending: - case Type::num_svc_ok: - case Type::num_svc_warn: - case Type::num_svc_crit: - case Type::num_svc_unknown: - case Type::num_svc: - result += ServiceListStateColumn::getValue( - _mc, - static_cast<ServiceListStateColumn::Type>(_logictype), - hst->services, auth_user); - break; + update(hst, auth_user, result); + } + } + return result; +} - case Type::worst_svc_state: { - int state = ServiceListStateColumn::getValue( - _mc, - static_cast<ServiceListStateColumn::Type>(_logictype), - hst->services, auth_user); - if (ServiceListStateColumn::svcStateIsWorse(state, - result)) { - result = state; - } - break; - } +// static +void HostListStateColumn::update(host *hst, const contact *auth_user, + int32_t &result) const { + switch (_logictype) { + case Type::num_svc_pending: + case Type::num_svc_ok: + case Type::num_svc_warn: + case Type::num_svc_crit: + case Type::num_svc_unknown: + case Type::num_svc: + result += ServiceListStateColumn::getValue( + _mc, static_cast<ServiceListStateColumn::Type>(_logictype), + hst->services, auth_user); + break; - case Type::num_hst_up: - case Type::num_hst_down: - case Type::num_hst_unreach: - if (hst->has_been_checked != 0 && - hst->current_state == - static_cast<int>(_logictype) - - static_cast<int>(Type::num_hst_up)) { - result++; - } - break; + case Type::worst_svc_state: { + int state = ServiceListStateColumn::getValue( + _mc, static_cast<ServiceListStateColumn::Type>(_logictype), + hst->services, auth_user); + if (ServiceListStateColumn::svcStateIsWorse(state, result)) { + result = state; + } + break; + } - case Type::num_hst_pending: - if (hst->has_been_checked == 0) { - result++; - } - break; + case Type::num_hst_up: + case Type::num_hst_down: + case Type::num_hst_unreach: + if (hst->has_been_checked != 0 && + hst->current_state == + static_cast<int>(_logictype) - + static_cast<int>(Type::num_hst_up)) { + result++; + } + break; + + case Type::num_hst_pending: + if (hst->has_been_checked == 0) { + result++; + } + break; - case Type::num_hst: - result++; - break; + case Type::num_hst: + result++; + break; - case Type::worst_hst_state: - if (hst_state_is_worse(hst->current_state, result)) { - result = hst->current_state; - } - break; - case Type::num_svc_hard_ok: - case Type::num_svc_hard_warn: - case Type::num_svc_hard_crit: - case Type::num_svc_hard_unknown: - case Type::worst_svc_hard_state: - // TODO(sp) Why are these not handled? - break; + case Type::worst_hst_state: + if (hst_state_is_worse(hst->current_state, result)) { + result = hst->current_state; } - } + break; + case Type::num_svc_hard_ok: + case Type::num_svc_hard_warn: + case Type::num_svc_hard_crit: + case Type::num_svc_hard_unknown: + case Type::worst_svc_hard_state: + // TODO(sp) Why are these not handled? + break; } - return result; } diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index 15e7350..dfa17a5 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -91,6 +91,8 @@ public: private: MonitoringCore *_mc; const Type _logictype; + + void update(host *hst, const contact *auth_user, int32_t &result) const; }; #endif // HostListStateColumn_h diff --git a/livestatus/src/ServiceListStateColumn.cc b/livestatus/src/ServiceListStateColumn.cc index 0c3da04..fa1f368 100644 --- a/livestatus/src/ServiceListStateColumn.cc +++ b/livestatus/src/ServiceListStateColumn.cc @@ -50,6 +50,7 @@ servicesmember *ServiceListStateColumn::getMembers(Row row) const { return nullptr; } +// static int32_t ServiceListStateColumn::getValue(MonitoringCore *mc, Type logictype, servicesmember *mem, const contact *auth_user) { @@ -58,36 +59,7 @@ int32_t ServiceListStateColumn::getValue(MonitoringCore *mc, Type logictype, service *svc = mem->service_ptr; if (auth_user == nullptr || is_authorized_for(mc, auth_user, svc->host_ptr, svc)) { - int service_state; - Type lt; - if (static_cast<int>(logictype) >= 60) { - service_state = svc->last_hard_state; - lt = static_cast<Type>(static_cast<int>(logictype) - 64); - } else { - service_state = svc->current_state; - lt = logictype; - } - switch (lt) { - case Type::worst_state: - if (svcStateIsWorse(service_state, result)) { - result = service_state; - } - break; - case Type::num: - result++; - break; - case Type::num_pending: - if (svc->has_been_checked == 0) { - result++; - } - break; - default: - if (svc->has_been_checked != 0 && - service_state == static_cast<int>(lt)) { - result++; - } - break; - } + update(logictype, svc, result); } } return result; @@ -97,3 +69,38 @@ int32_t ServiceListStateColumn::getValue(Row row, const contact *auth_user) const { return getValue(_mc, _logictype, getMembers(row), auth_user); } + +// static +void ServiceListStateColumn::update(Type logictype, service *svc, + int32_t &result) { + int service_state; + Type lt; + if (static_cast<int>(logictype) >= 60) { + service_state = svc->last_hard_state; + lt = static_cast<Type>(static_cast<int>(logictype) - 64); + } else { + service_state = svc->current_state; + lt = logictype; + } + switch (lt) { + case Type::worst_state: + if (svcStateIsWorse(service_state, result)) { + result = service_state; + } + break; + case Type::num: + result++; + break; + case Type::num_pending: + if (svc->has_been_checked == 0) { + result++; + } + break; + default: + if (svc->has_been_checked != 0 && + service_state == static_cast<int>(lt)) { + result++; + } + break; + } +} diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 29ca063..21d98a6 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -80,6 +80,8 @@ public: private: MonitoringCore *_mc; const Type _logictype; + + static void update(Type logictype, service *svc, int32_t &result); }; #endif // ServiceListStateColumn_h

6 years, 11 months

5441 FIX mk_oracle: Werk 5321 introduced usage of nawk for SunOS but was implemented incorrectly for Linux

by Simon Betz

Module: check_mk Branch: master Commit: c37e8679f68c3b8695a04b6914b2d1f87000fac7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c37e8679f68c3b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 2 10:01:42 2017 +0100 5441 FIX mk_oracle: Werk 5321 introduced usage of nawk for SunOS but was implemented incorrectly for Linux Change-Id: Ib2c12aafb3e1343daf42c0895edf0fc31c680ef9 --- .werks/5441 | 11 +++++++++++ agents/plugins/mk_oracle | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5441 b/.werks/5441 new file mode 100644 index 0000000..2d14343 --- /dev/null +++ b/.werks/5441 @@ -0,0 +1,11 @@ +Title: mk_oracle: Werk 5321 introduced usage of nawk for SunOS but was implemented incorrectly for Linux +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509613020 + + diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 5259008..c06679b 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -749,7 +749,6 @@ function set_osenv () { GREP=$(which grep) STATCX='stat -c %X' STATCY='stat -c %Y' - AWK=$(which nawk) elif [ ${ostype} = 'SunOS' ] ; then @@ -767,6 +766,8 @@ function set_osenv () { STATCX='file_mtime' STATCY='file_mtime' + AWK=$(which nawk) + else ostype="unknown OS: "${ostype} fi

6 years, 11 months

Make RRDColumn a subclass of ListColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 79730a47f08f3cd2d50918af0e6e7d1fe99a1689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79730a47f08f3c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 08:06:39 2017 +0100 Make RRDColumn a subclass of ListColumn. This enables filtering on this column, but more importantly: It unifies things quite a bit. As a side effect, we have to thread through the time zone offset in a few places, but that's somehow nice, too: It makes the offset handling more explicit. We simplify and clean this up later. Change-Id: I98a5b27abd1c5c9712ffb4d45aaa0747eca2eeb1 --- livestatus/src/AttributeListColumn.cc | 5 ++-- livestatus/src/AttributeListColumn.h | 5 ++-- livestatus/src/BlobColumn.cc | 4 +-- livestatus/src/BlobColumn.h | 5 ++-- livestatus/src/Column.h | 4 +-- livestatus/src/CommentColumn.cc | 6 ++-- livestatus/src/CommentColumn.h | 10 ++++--- livestatus/src/ContactGroupsColumn.cc | 3 +- livestatus/src/ContactGroupsColumn.h | 6 ++-- livestatus/src/ContactGroupsMemberColumn.cc | 3 +- livestatus/src/ContactGroupsMemberColumn.h | 6 ++-- livestatus/src/CustomVarsDictColumn.cc | 5 ++-- livestatus/src/CustomVarsDictColumn.h | 5 ++-- livestatus/src/CustomVarsNamesColumn.cc | 3 +- livestatus/src/CustomVarsNamesColumn.h | 6 ++-- livestatus/src/CustomVarsValuesColumn.cc | 3 +- livestatus/src/CustomVarsValuesColumn.h | 6 ++-- livestatus/src/DoubleColumn.cc | 3 +- livestatus/src/DoubleColumn.h | 5 ++-- livestatus/src/DowntimeColumn.cc | 6 ++-- livestatus/src/DowntimeColumn.h | 10 ++++--- livestatus/src/HostContactsColumn.cc | 3 +- livestatus/src/HostContactsColumn.h | 6 ++-- livestatus/src/HostGroupsColumn.cc | 3 +- livestatus/src/HostGroupsColumn.h | 6 ++-- livestatus/src/HostListColumn.cc | 7 +++-- livestatus/src/HostListColumn.h | 10 ++++--- livestatus/src/IntColumn.cc | 4 +-- livestatus/src/IntColumn.h | 5 ++-- livestatus/src/ListColumn.cc | 6 ++-- livestatus/src/ListColumn.h | 8 +++-- livestatus/src/ListFilter.cc | 46 ++++++++++++++++------------- livestatus/src/ListFilter.h | 5 ++-- livestatus/src/LogwatchListColumn.cc | 3 +- livestatus/src/LogwatchListColumn.h | 6 ++-- livestatus/src/MetricsColumn.cc | 3 +- livestatus/src/MetricsColumn.h | 6 ++-- livestatus/src/NullColumn.cc | 3 +- livestatus/src/NullColumn.h | 5 ++-- livestatus/src/OffsetStringMacroColumn.cc | 5 ++-- livestatus/src/OffsetStringMacroColumn.h | 5 ++-- livestatus/src/Query.cc | 4 +-- livestatus/src/ServiceContactsColumn.cc | 3 +- livestatus/src/ServiceContactsColumn.h | 6 ++-- livestatus/src/ServiceGroupMembersColumn.cc | 8 +++-- livestatus/src/ServiceGroupMembersColumn.h | 11 +++---- livestatus/src/ServiceGroupsColumn.cc | 3 +- livestatus/src/ServiceGroupsColumn.h | 6 ++-- livestatus/src/ServiceListColumn.cc | 6 ++-- livestatus/src/ServiceListColumn.h | 10 ++++--- livestatus/src/StringColumn.cc | 3 +- livestatus/src/StringColumn.h | 5 ++-- livestatus/src/TableEventConsole.h | 3 +- livestatus/src/TimeColumn.cc | 4 +-- livestatus/src/TimeColumn.h | 5 ++-- 55 files changed, 201 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79730a47f0…

6 years, 11 months

Removed useless override.

by Sven Panne

Module: check_mk Branch: master Commit: 68026dfa5affb25937723907e66edc520a576058 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68026dfa5affb2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 08:00:26 2017 +0100 Removed useless override. Change-Id: I283f095b36fc0a5f92bf10b06eb0ad8b6f8ff4f8 --- livestatus/src/ServiceGroupMembersColumn.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestatus/src/ServiceGroupMembersColumn.h b/livestatus/src/ServiceGroupMembersColumn.h index cc58125..561aa63 100644 --- a/livestatus/src/ServiceGroupMembersColumn.h +++ b/livestatus/src/ServiceGroupMembersColumn.h @@ -56,8 +56,6 @@ public: , _mc(mc) , _show_state(show_state) {} - ColumnType type() const override { return ColumnType::list; }; - void output(Row row, RowRenderer &r, const contact *auth_user) const override;

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017