Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

4626 f5_bigip_conns: Support setting levels on HTTP request rate

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0fc464e5909eeea2d1d3853f6f7b82ca920f5360 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc464e5909eee… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 14 12:27:50 2017 +0200 4626 f5_bigip_conns: Support setting levels on HTTP request rate Change-Id: I4231f542b24fff8c272e079967cf76b1bfde1802 --- .werks/4626 | 10 ++++++++++ checks/f5_bigip_conns | 7 ++++++- web/plugins/wato/check_parameters.py | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/4626 b/.werks/4626 new file mode 100644 index 0000000..0c4bef5 --- /dev/null +++ b/.werks/4626 @@ -0,0 +1,10 @@ +Title: f5_bigip_conns: Support setting levels on HTTP request rate +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492165640 +Class: feature + + diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index 2bc4054..f9dc011 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -28,6 +28,7 @@ factory_settings["f5_bigip_conns_default_levels"] = { "conns" : (25000, 30000), "ssl_conns" : (25000, 30000), + "http_req_rate" : (500, 1000), } @@ -47,6 +48,8 @@ def check_f5_bigip_conns(item, params, info): compat_conn_rate = get_rate("compat", now, int(line[3])) total_native_compat_rate += native_conn_rate + compat_conn_rate + stat_http_req_rate = get_rate("stathttpreqs", now, int(line[4])) + if line[0] != "": conns_dict.setdefault("total", 0) conns_dict["total"] += int(line[0]) @@ -62,7 +65,8 @@ def check_f5_bigip_conns(item, params, info): for val, dsname, params_values, perfkey, title in [ (conns_dict.get("total", None), "conns", params.get("conns"), "connections", "Connections"), (conns_dict.get("total_ssl", None), "ssl_conns", params.get("ssl_conns"), "connections_ssl", "SSL connections"), - (total_native_compat_rate, "connections_rate", conn_rate_params, "connections_rate", "Connections/s") + (total_native_compat_rate, "connections_rate", conn_rate_params, "connections_rate", "Connections/s"), + (stat_http_req_rate, "http_req_rate", params.get("http_req_rate"), "requests_per_second", "HTTP requests/s"), ]: state = 0 @@ -95,6 +99,7 @@ check_info["f5_bigip_conns"] = { '9.2', # F5-BIGIP-SYSTEM-MIB::sysClientsslStatCurConns '9.6', # F5-BIGIP-SYSTEM-MIB::sysClientSslStatTotNativeConns '9.9', # F5-BIGIP-SYSTEM-MIB::sysClientSslStatTotCompatConns + '1.56', # F5-BIGIP-SYSTEM-MIB::sysStatHttpRequests ]), 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in \ oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in \ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 85597ea..36cd999 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -9626,6 +9626,13 @@ register_check_parameters( default_value = None, ) ), + ( "http_req_rate", + Levels( + title = _("HTTP requests per second"), + default_value = None, + default_levels = (500, 1000) + ) + ), ]), None, "dict"

7 years, 4 months

make dist: Is now correctly creating vanilla agent rpm/ deb packages before packing cmk tar.gz

by Lars Michelsen

Module: check_mk Branch: master Commit: fe8bc8261b3913bc4bb828e59c13f1ed0dda43ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe8bc8261b3913… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 10:01:06 2017 +0200 make dist: Is now correctly creating vanilla agent rpm/deb packages before packing cmk tar.gz Change-Id: I1edb3748cc25129be24c388fd74513d2299cc65c --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 707ba99..4903e0e 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ check-version: dist: $(DISTNAME).tar.gz -$(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MINI) ChangeLog +$(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MINI) ChangeLog packages @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME)

7 years, 4 months

4597 FIX Vanilla agents (RPM/DEB) of latest releases did not contain recent changes

by Lars Michelsen

Module: check_mk Branch: master Commit: b3313cc88ec95c5edf6e160b758d0fc0a341ca82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3313cc88ec95c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 10:03:37 2017 +0200 4597 FIX Vanilla agents (RPM/DEB) of latest releases did not contain recent changes The prepacked vanilla agent which is found below ~/share/check_mk/agents as .deb or .rpm files did only contain the changes shipped with the previous version. The fixes added to the agents in the meantime between the versions were not included. The packaging has now been fixed. Change-Id: Ia3d8a01b1c1853f7788c726d3c3c5f9b6b9082cc --- .werks/4597 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/4597 b/.werks/4597 new file mode 100644 index 0000000..2ae072a --- /dev/null +++ b/.werks/4597 @@ -0,0 +1,15 @@ +Title: Vanilla agents (RPM/DEB) of latest releases did not contain recent changes +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1492761725 + +The prepacked vanilla agent which is found below ~/share/check_mk/agents as .deb or +.rpm files did only contain the changes shipped with the previous version. The fixes +added to the agents in the meantime between the versions were not included. + +The packaging has now been fixed.

7 years, 4 months

Do not add vanilla agent rpm/deb anymore to git

by Lars Michelsen

Module: check_mk Branch: master Commit: 93f28105c00ddad7ec75aa7f46132782a0c4a845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93f28105c00dda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 10:06:41 2017 +0200 Do not add vanilla agent rpm/deb anymore to git Change-Id: I4cb4491ed5c19bcc178ea070e16f447d826cd0c8 --- agents/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index e4ac6fa..b094217 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -53,9 +53,6 @@ waitmax: waitmax.c @echo "Fine. Typing 'make install' as root now will install into /usr/bin" setversion: - if [ -d ../.git ]; then \ - git rm -f *.rpm *.deb || true ; \ - fi sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ @@ -64,9 +61,6 @@ setversion: fi ; \ done ; \ $(MAKE) packages - if [ -d ../.git ]; then \ - git add *.rpm *.deb ; \ - fi $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion packages: rpm deb

7 years, 4 months

Added built agent packages to gitignore

by Lars Michelsen

Module: check_mk Branch: master Commit: ba1a9c809dfec9242d878b28da6bfcfaee1b3e48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba1a9c809dfec9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 10:10:03 2017 +0200 Added built agent packages to gitignore Change-Id: I26cecdff0b276d272fe873bd0647e84a1069c94d --- agents/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/.gitignore b/agents/.gitignore index 5b1195b..f704dc3 100644 --- a/agents/.gitignore +++ b/agents/.gitignore @@ -1,2 +1,4 @@ .rpm.* winbuild +check-mk-agent-*.noarch.rpm +check-mk-agent_*_all.deb

7 years, 4 months

Removed prepacked deb/rpm agent packages

by Lars Michelsen

Module: check_mk Branch: master Commit: de5e88ea1c0b36406c2ed2ea0f2c579ae5fde551 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de5e88ea1c0b36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 10:07:49 2017 +0200 Removed prepacked deb/rpm agent packages Change-Id: I49f827965015bd2188e61548564a96a2490b8f0b --- agents/check-mk-agent-1.5.0i1-1.noarch.rpm | Bin 26329 -> 0 bytes agents/check-mk-agent_1.5.0i1-1_all.deb | Bin 24084 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/check-mk-agent-1.5.0i1-1.noarch.rpm b/agents/check-mk-agent-1.5.0i1-1.noarch.rpm deleted file mode 100644 index 3da6b29..0000000 Binary files a/agents/check-mk-agent-1.5.0i1-1.noarch.rpm and /dev/null differ diff --git a/agents/check-mk-agent_1.5.0i1-1_all.deb b/agents/check-mk-agent_1.5.0i1-1_all.deb deleted file mode 100644 index 6406e7f..0000000 Binary files a/agents/check-mk-agent_1.5.0i1-1_all.deb and /dev/null differ

7 years, 4 months

Minor cleanup: wato.py global vars are now declared in global scope

by Lars Michelsen

Module: check_mk Branch: master Commit: d55166f2bc3871d53c9f06f686dda70a3aed71fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d55166f2bc3871… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 08:47:05 2017 +0200 Minor cleanup: wato.py global vars are now declared in global scope Change-Id: If5797e00390697a4f3fb8a1c8ecef07fa600115d --- web/htdocs/wato.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d156cac..c83b7c2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17172,6 +17172,8 @@ modes = { "read_only" : (["set_read_only"], ModeManageReadOnly), } +extra_buttons = [] +modules = [] builtin_host_attribute_names = [] loaded_with_language = False @@ -17188,9 +17190,8 @@ def load_plugins(force): return # Reset global vars - global extra_buttons, modules - extra_buttons = [] - modules = [] + del extra_buttons[:] + del modules[:] initialize_host_attribute_structures() undeclare_all_host_attributes()

7 years, 4 months

4435 FIX Fixed pending_flex_downtime column in host/service-related tables

by Sven Panne

Module: check_mk Branch: master Commit: ef355aeea55dff6cec0da9432ad8ab00b03bf6ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef355aeea55dff… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 20 16:38:00 2017 +0200 4435 FIX Fixed pending_flex_downtime column in host/service-related tables In the NEB plugin, the pending_flex_downtime column has always been an integer, although the column comment claimed it was a boolean. The Livestatus interface of the Check_MK Micro Core was inconsistent and returned a boolean. Furthermore, the calculation of the value was not totally correct. Now pending_flex_downtime is always returned as an integer, and the column comment has been fixed to reflect that. Change-Id: I9ae8a13e651492a3421ad89d814c0d72fb92e690 --- .werks/4435 | 17 +++++++++++++++++ livestatus/src/TableHosts.cc | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/4435 b/.werks/4435 new file mode 100644 index 0000000..4a389e0 --- /dev/null +++ b/.werks/4435 @@ -0,0 +1,17 @@ +Title: Fixed pending_flex_downtime column in host/service-related tables +Level: 1 +Component: livestatus +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1492698749 +Class: fix + +In the NEB plugin, the pending_flex_downtime column has always been an +integer, although the column comment claimed it was a boolean. The +Livestatus interface of the Check_MK Micro Core was inconsistent and +returned a boolean. Furthermore, the calculation of the value was not +totally correct. + +Now pending_flex_downtime is always returned as an integer, and the column +comment has been fixed to reflect that. diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 2d2c3e4..408f6aa 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -295,7 +295,7 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, extra_offset, -1)); table->addColumn(make_unique<OffsetIntColumn>( prefix + "pending_flex_downtime", - "Whether a flex downtime is pending (0/1)", + "Number of pending flexible downtimes", DANGEROUS_OFFSETOF(host, pending_flex_downtime), indirect_offset, extra_offset, -1)); table->addColumn(make_unique<OffsetIntColumn>(

7 years, 4 months

Remove three global variables.

by Sven Panne

Module: check_mk Branch: master Commit: b4372ed8ee2c6ed68fd658458d22f02320109781 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4372ed8ee2c6e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 5 14:20:34 2017 +0200 Remove three global variables. Change-Id: Ib105361adb7b6cf36840e630a8909ebce35d7937 --- livestatus/src/InputBuffer.cc | 21 ++++++++++----------- livestatus/src/InputBuffer.h | 7 ++++++- livestatus/src/module.cc | 11 ++++++----- livestatus/src/waittriggers.cc | 6 +++--- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index bc31eaf..d76c94d 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -26,7 +26,6 @@ #include <sys/select.h> #include <unistd.h> #include <cctype> -#include <chrono> #include <cstring> #include <ostream> #include <ratio> @@ -37,9 +36,6 @@ using std::chrono::milliseconds; using std::chrono::system_clock; using std::string; -extern milliseconds g_query_timeout; -extern milliseconds g_idle_timeout; - namespace { const size_t initial_buffer_size = 4096; // TODO(sp): Make this configurable? @@ -52,9 +48,12 @@ bool timeout_reached(const system_clock::time_point &start, } } // namespace -InputBuffer::InputBuffer(int fd, const bool &termination_flag, Logger *logger) +InputBuffer::InputBuffer(int fd, const bool &termination_flag, Logger *logger, + milliseconds query_timeout, milliseconds idle_timeout) : _fd(fd) , _termination_flag(termination_flag) + , _query_timeout(query_timeout) + , _idle_timeout(idle_timeout) , _readahead_buffer(initial_buffer_size) , _logger(logger) { _read_index = 0; // points to data not yet processed @@ -98,14 +97,14 @@ InputBuffer::Result InputBuffer::readRequest() { if (rd == Result::timeout) { if (query_started) { Informational(_logger) - << "Timeout of " << g_query_timeout.count() + << "Timeout of " << _query_timeout.count() << " ms exceeded while reading query"; return Result::timeout; } // Check if we exceeded the maximum time between two queries - if (timeout_reached(start_of_idle, g_idle_timeout)) { + if (timeout_reached(start_of_idle, _idle_timeout)) { Informational(_logger) - << "Idle timeout of " << g_idle_timeout.count() + << "Idle timeout of " << _idle_timeout.count() << " ms exceeded. Going to close connection."; return Result::timeout; } @@ -197,12 +196,12 @@ InputBuffer::Result InputBuffer::readRequest() { } } -// read at least *some* data. Return IB_TIMEOUT if that -// lasts more than g_query_timeout_msec msecs. +// read at least *some* data. Return IB_TIMEOUT if that lasts more than +// _query_timeout msecs. InputBuffer::Result InputBuffer::readData() { auto start = system_clock::now(); while (!_termination_flag) { - if (timeout_reached(start, g_query_timeout)) { + if (timeout_reached(start, _query_timeout)) { return Result::timeout; } diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index ec05783..2579fb8 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -26,6 +26,7 @@ #define InputBuffer_h #include "config.h" // IWYU pragma: keep +#include <chrono> #include <cstddef> #include <list> #include <string> @@ -45,7 +46,9 @@ public: timeout }; - InputBuffer(int fd, const bool &termination_flag, Logger *logger); + InputBuffer(int fd, const bool &termination_flag, Logger *logger, + std::chrono::milliseconds query_timeout, + std::chrono::milliseconds idle_timeout); Result readRequest(); bool empty() const; std::string nextLine(); @@ -53,6 +56,8 @@ public: private: int _fd; const bool &_termination_flag; + std::chrono::milliseconds _query_timeout; + std::chrono::milliseconds _idle_timeout; std::vector<char> _readahead_buffer; size_t _read_index; size_t _write_index; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 46a8003..2b62e45 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -86,10 +86,10 @@ extern int enable_environment_macros; extern char *log_file; // maximum idle time for connection in keep alive state -milliseconds g_idle_timeout = minutes(5); +static milliseconds fl_idle_timeout = minutes(5); // maximum time for reading a query -milliseconds g_query_timeout = seconds(10); +static milliseconds fl_query_timeout = seconds(10); size_t g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ @@ -234,7 +234,8 @@ void *client_thread(void *data) { Debug(fl_logger_livestatus) << "accepted client connection on fd " << cc; InputBuffer input_buffer(cc, fl_should_terminate, - fl_logger_livestatus); + fl_logger_livestatus, fl_query_timeout, + fl_idle_timeout); bool keepalive = true; unsigned requestnr = 0; while (keepalive) { @@ -940,7 +941,7 @@ void livestatus_parse_arguments(const char *args_orig) { if (c < 0) { Warning(fl_logger_nagios) << "query_timeout must be >= 0"; } else { - g_query_timeout = milliseconds(c); + fl_query_timeout = milliseconds(c); if (c == 0) { Notice(fl_logger_nagios) << "disabled query timeout!"; } else { @@ -954,7 +955,7 @@ void livestatus_parse_arguments(const char *args_orig) { if (c < 0) { Warning(fl_logger_nagios) << "idle_timeout must be >= 0"; } else { - g_idle_timeout = milliseconds(c); + fl_idle_timeout = milliseconds(c); if (c == 0) { Notice(fl_logger_nagios) << "disabled idle timeout!"; } else { diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index 0a196d3..56a9a97 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -45,7 +45,7 @@ condition_variable *from_trigger(struct trigger *c) { return reinterpret_cast<condition_variable *>(c); } -mutex g_wait_mutex; +mutex wait_mutex; condition_variable cond_all; condition_variable cond_check; @@ -127,12 +127,12 @@ void trigger_notify_all(struct trigger *which) { } void trigger_wait(struct trigger *which) { - unique_lock<mutex> ul(g_wait_mutex); + unique_lock<mutex> ul(wait_mutex); from_trigger(which)->wait(ul); } int trigger_wait_for(struct trigger *which, unsigned ms) { - unique_lock<mutex> ul(g_wait_mutex); + unique_lock<mutex> ul(wait_mutex); return static_cast<int>(from_trigger(which)->wait_for( ul, milliseconds(ms)) == cv_status::no_timeout); }

7 years, 4 months

4434 FIX Fixed group-related 'contains' filters

by Sven Panne

Module: check_mk Branch: master Commit: b390c0626fc39dff66d2285fbbecf932fc3c1da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b390c0626fc39d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 20 15:25:47 2017 +0200 4434 FIX Fixed group-related 'contains' filters Using a filter expression with '>=' (i.e. 'contains') on the column 'group' or 'contact_group' in host/service-related tables could lead to a crash of the Check_MK Monitoring Core. This has been fixed. Change-Id: I1a26aff908c6419945390f145d0d0a2f1666b9b7 --- .werks/4434 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4434 b/.werks/4434 new file mode 100644 index 0000000..c15b7be --- /dev/null +++ b/.werks/4434 @@ -0,0 +1,12 @@ +Title: Fixed group-related 'contains' filters +Level: 1 +Component: livestatus +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1492694507 +Class: fix + +Using a filter expression with '>=' (i.e. 'contains') on the column 'group' +or 'contact_group' in host/service-related tables could lead to a crash of +the Check_MK Monitoring Core. This has been fixed. \ No newline at end of file

7 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017