Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4642 check_mk_agent: Added support for new storcli

by Marcel Arentz

Module: check_mk Branch: master Commit: 192827e7368bb809cffa6e9f0958c9afc905b6dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=192827e7368bb8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon May 8 17:02:06 2017 +0200 4642 check_mk_agent: Added support for new storcli In future releases the MegaCli will be replaced by storcli. Up to now the output of this new cli is fully compatible to the old one. Change-Id: I67330aec6e430f3df0eb29e904493056590bd699 --- .werks/4642 | 11 +++++++++++ agents/check_mk_agent.linux | 4 ++++ agents/check_mk_agent.openwrt | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/.werks/4642 b/.werks/4642 new file mode 100644 index 0000000..9f5d6fc --- /dev/null +++ b/.werks/4642 @@ -0,0 +1,11 @@ +Title: check_mk_agent: Added support for new storcli +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494255427 +Class: feature + +In future releases the MegaCli will be replaced by storcli. Up to now the +output of this new cli is fully compatible to the old one. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 7d1e3ea..9617379 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -493,6 +493,10 @@ elif type MegaCli64 >/dev/null ; then MegaCli_bin="MegaCli64" elif type megacli >/dev/null ; then MegaCli_bin="megacli" +elif type storcli >/dev/null ; then + MegaCli_bin="storcli" +elif type storcli64 >/dev/null ; then + MegaCli_bin="storcli64" else MegaCli_bin="unknown" fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 79edea5..ca6838d 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -453,6 +453,10 @@ elif type MegaCli64 >/dev/null ; then MegaCli_bin="MegaCli64" elif type megacli >/dev/null ; then MegaCli_bin="megacli" +elif type storcli >/dev/null ; then + MegaCli_bin="storcli" +elif type storcli64 >/dev/null ; then + MegaCli_bin="storcli64" else MegaCli_bin="unknown" fi

7 years, 4 months

Make IWYU happy again.

by Sven Panne

Module: check_mk Branch: master Commit: a42f70b737dd942dbece11e709cb6dbedd879145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a42f70b737dd94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 8 16:13:15 2017 +0200 Make IWYU happy again. Change-Id: I441b58e9bf7451e9bf987301d88985c3d917b93d --- livestatus/src/TableStateHistory.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 5a9739f..92197af 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -25,7 +25,6 @@ #include "TableStateHistory.h" #include <cstdlib> #include <cstring> -#include <ctime> #include <deque> #include <memory> #include <mutex> @@ -39,6 +38,7 @@ #include "HostServiceState.h" #include "LogEntry.h" #include "Logger.h" +#include "MonitoringCore.h" #include "OffsetDoubleColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h"

7 years, 4 months

Nuked yet another global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 4ac28dfaae043a4f15ae422417f15dadf38ba26a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ac28dfaae043a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 8 14:34:13 2017 +0200 Nuked yet another global variable. Change-Id: Iaad26b8b4c94313afe2da6cbe4c022715945b0e4 --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/TableStateHistory.cc | 4 +--- livestatus/src/module.cc | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index c950604..dd37922 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -90,6 +90,7 @@ public: virtual Encoding dataEncoding() = 0; virtual size_t maxResponseSize() = 0; virtual size_t maxCachedMessages() = 0; + virtual bool stateHistoryFilteringEnabled() = 0; virtual Logger *loggerLivestatus() = 0; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index dde51e5..5a9739f 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -84,8 +84,6 @@ constexpr unsigned classmask_statehist = (1u << static_cast<int>(LogEntry::Class::text)); } // namespace -int g_disable_statehist_filtering = 0; - #ifndef CMC namespace { string getCustomVariable(customvariablesmember *cvm, const char *name) { @@ -283,7 +281,7 @@ void TableStateHistory::answerQuery(Query *query) { // check attributes of current hosts and services deque<Filter *> object_filter; - if (g_disable_statehist_filtering == 0) { + if (core()->stateHistoryFilteringEnabled()) { for (const auto &filter : *query->filter()) { IsObjectFilter is_obj; filter->accept(is_obj); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 63715cc..1b03e2b 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -98,7 +98,7 @@ int g_num_queued_connections = 0; // current number of active connections (for statistics) int g_livestatus_active_connections = 0; size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ -extern int g_disable_statehist_filtering; +static int fl_disable_statehist_filtering; void *g_nagios_handle; int g_unix_socket = -1; @@ -655,6 +655,9 @@ public: Encoding dataEncoding() override { return fl_data_encoding; } size_t maxResponseSize() override { return fl_max_response_size; } size_t maxCachedMessages() override { return fl_max_cached_messages; } + bool stateHistoryFilteringEnabled() override { + return fl_disable_statehist_filtering == 0; + } Logger *loggerLivestatus() override { return fl_logger_livestatus; } @@ -1031,7 +1034,7 @@ void livestatus_parse_arguments(const char *args_orig) { Warning(fl_logger_nagios) << "livecheck has been removed from Livestatus, sorry."; } else if (strcmp(left, "disable_statehist_filtering") == 0) { - g_disable_statehist_filtering = atoi(right); + fl_disable_statehist_filtering = atoi(right); } else { Warning(fl_logger_nagios) << "ignoring invalid option " << left << "=" << right;

7 years, 4 months

4647 FIX websphere_mq_queues: Fixed 'list index out of range' error

by Simon Betz

Module: check_mk Branch: master Commit: 7b69078bc48b1e863bd8566b0f45e9a2a6ade10c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b69078bc48b1e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 8 15:26:23 2017 +0200 4647 FIX websphere_mq_queues: Fixed 'list index out of range' error Change-Id: I67a7d6c2299ebd118436a242427741de383a9c72 --- .werks/4647 | 13 +++++++++++++ checks/websphere_mq_queues | 3 +++ 2 files changed, 16 insertions(+) diff --git a/.werks/4647 b/.werks/4647 new file mode 100644 index 0000000..8c563ee --- /dev/null +++ b/.werks/4647 @@ -0,0 +1,13 @@ +Title: websphere_mq_queues: Fixed 'list index out of range' error +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494249613 + +In case of above error lines of the agent output may contain +incomplete data, eg. only queue name without any additional +queue information such as current queue length. diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 4c27807..de6d0b0 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -65,6 +65,9 @@ websphere_mq_queues_default_levels = { def parse_websphere_mq_queues(info): parsed = {} for line in info: + if len(line) < 2: + continue + queue_name = line[1] parsed.setdefault(queue_name, {}) parsed[queue_name].setdefault('cur_depth', int(line[0]))

7 years, 4 months

Fixed default credentials in tests

by Lars Michelsen

Module: check_mk Branch: master Commit: ac87f742b969a98da04458d8162f8d0cc88cff74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac87f742b969a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 13:20:14 2017 +0200 Fixed default credentials in tests Change-Id: I806107914b4b58a8edfc202b7936bbf2338d7230 --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c1c20a9..36aa4a2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -306,7 +306,9 @@ class Site(object): if not self.exists(): p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", "-V", self.version.version_directory(), - "create", "--apache-reload", self.id]) + "create", + "--admin-password", "cmk", + "--apache-reload", self.id]) assert p.wait() == 0 assert os.path.exists("/omd/sites/%s" % self.id) @@ -833,7 +835,7 @@ class CMKWebSession(WebSession): self.site.apache_port, path) - def login(self, username="omdadmin", password="omd"): + def login(self, username="cmkadmin", password="cmk"): login_page = self.get("", allow_redirect_to_login=True).text assert "_username" in login_page, "_username not found on login page - page broken?" assert "_password" in login_page

7 years, 4 months

Replaced omdadmin user with cmkadmin

by Lars Michelsen

Module: check_mk Branch: master Commit: 250341e1f5abfcda35a0932278744dca4fe9d36c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=250341e1f5abfc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 13:45:01 2017 +0200 Replaced omdadmin user with cmkadmin Change-Id: I91fcbd6fadd07f41c8444d951997109f6ff27908 --- tests/web/test_webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index 3ce73f0..709daa6 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -124,7 +124,7 @@ def test_delete_group(web, group_type): def test_get_all_users(web): users = {"klaus": {"alias": "mr. klaus", "pager": "99221199", "password": "1234"}, "monroe": {"alias": "mr. monroe"}} - expected_users = set(["omdadmin", "automation"] + users.keys()) + expected_users = set(["cmkadmin", "automation"] + users.keys()) try: response = web.add_htpasswd_users(users) all_users = web.get_all_users()

7 years, 4 months

Set new default GUI admin user to cmkadmin

by Lars Michelsen

Module: check_mk Branch: master Commit: e3f1448396d4e3f0df428290c069101364022005 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3f1448396d4e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 13:35:10 2017 +0200 Set new default GUI admin user to cmkadmin Change-Id: I4e357afadada3e5afdaa44c29ac369421e66fd87 --- web/plugins/config/builtin.py | 2 +- web/plugins/views/builtin.py | 44 +++++++++++++++++++++---------------------- web/plugins/views/mkeventd.py | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3f1448396…

7 years, 4 months

Unify naming in NEB and CMC a bit more.

by Sven Panne

Module: check_mk Branch: master Commit: 94311c6add1153a27158f338cc7084886b330d89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94311c6add1153… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 8 11:36:54 2017 +0200 Unify naming in NEB and CMC a bit more. Change-Id: I18b11bc9d5380d65be827ee4262e0413c99b473e --- livestatus/src/TableStatus.cc | 8 ++++---- livestatus/src/module.cc | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index 17b55d8..d3a3873 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -64,9 +64,9 @@ extern int num_cached_log_messages; extern int interval_length; extern int g_num_hosts; extern int g_num_services; -extern int g_num_clientthreads; +extern int g_livestatus_threads; extern int g_num_queued_connections; -extern int g_num_active_connections; +extern int g_livestatus_active_connections; #ifndef NAGIOS4 extern circular_buffer external_command_buffer; @@ -224,7 +224,7 @@ TableStatus::TableStatus(MonitoringCore *mc) : Table(mc) { addColumn(make_unique<IntPointerColumn>( "livestatus_active_connections", "The current number of active connections to MK Livestatus", - &g_num_active_connections)); + &g_livestatus_active_connections)); addColumn(make_unique<IntPointerColumn>( "livestatus_queued_connections", "The current number of queued connections to MK Livestatus (that wait for a free thread)", @@ -232,7 +232,7 @@ TableStatus::TableStatus(MonitoringCore *mc) : Table(mc) { addColumn(make_unique<IntPointerColumn>( "livestatus_threads", "The maximum number of connections to MK Livestatus that can be handled in parallel", - &g_num_clientthreads)); + &g_livestatus_threads)); // Special stuff for Check_MK addColumn(make_unique<StatusSpecialIntColumn>( diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index dd55075..63715cc 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -91,12 +91,12 @@ static milliseconds fl_idle_timeout = minutes(5); // maximum time for reading a query static milliseconds fl_query_timeout = seconds(10); -size_t g_num_clientthreads = - 10; /* allow 10 concurrent connections per default */ -int g_num_queued_connections = - 0; /* current number of queued connections (for statistics) */ -int g_num_active_connections = - 0; /* current number of active connections (for statistics) */ +// allow 10 concurrent connections per default +size_t g_livestatus_threads = 10; +// current number of queued connections (for statistics) +int g_num_queued_connections = 0; +// current number of active connections (for statistics) +int g_livestatus_active_connections = 0; size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ extern int g_disable_statehist_filtering; @@ -229,7 +229,7 @@ void *client_thread(void *data) { while (!fl_should_terminate) { int cc = fl_client_queue->popConnection(); g_num_queued_connections--; - g_num_active_connections++; + g_livestatus_active_connections++; if (cc >= 0) { Debug(fl_logger_livestatus) << "accepted client connection on fd " << cc; @@ -252,7 +252,7 @@ void *client_thread(void *data) { } close(cc); } - g_num_active_connections--; + g_livestatus_active_connections--; } return voidp; } @@ -309,7 +309,7 @@ void start_threads() { } Informational(fl_logger_nagios) << "starting main thread and " - << g_num_clientthreads + << g_livestatus_threads << " client threads"; pthread_atfork(livestatus_count_fork, nullptr, @@ -329,7 +329,7 @@ void start_threads() { << g_thread_stack_size; } - fl_thread_info.resize(g_num_clientthreads + 1); + fl_thread_info.resize(g_livestatus_threads + 1); for (auto &info : fl_thread_info) { ptrdiff_t idx = &info - &fl_thread_info[0]; if (idx == 0) { @@ -362,7 +362,7 @@ void terminate_threads() { } } Informational(fl_logger_nagios) << "main thread + " - << g_num_clientthreads + << g_livestatus_threads << " client threads have finished"; g_thread_running = 0; fl_should_terminate = false; @@ -937,7 +937,7 @@ void livestatus_parse_arguments(const char *args_orig) { } else { Notice(fl_logger_nagios) << "setting number of client threads to " << c; - g_num_clientthreads = c; + g_livestatus_threads = c; } } else if (strcmp(left, "query_timeout") == 0) { int c = atoi(right);

7 years, 4 months

Fixed Postfix process detection plus portability improvement.

by Sven Panne

Module: check_mk Branch: master Commit: 442e598afd9be8394e5db91ecc912775ee20254d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=442e598afd9be8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 8 12:16:40 2017 +0200 Fixed Postfix process detection plus portability improvement. * The path to the Postfix master contains an "sbin/" on Ubuntu. * The 'if [[ ... ]]' syntax is a bash-ism (from 2.02 onwards), which we should avoid in the agent. (Note that we should avoid the =~ operator in it even more, it appeared in bash 3.0 only and had several bugs.) Change-Id: I4cb920bdb3dddcf741714a4f22d26bdcf3a65047 --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5b2a580..7d1e3ea 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -691,7 +691,7 @@ if type postfix >/dev/null ; then do if [ -e "$i/pid/master.pid" ]; then postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output - if [[ $(readlink -- /proc/$postfix_pid/exe) == *"postfix/master"* ]]; then + if readlink -- "/proc/$postfix_pid/exe" | grep -q ".*postfix/$sbin/$\?master.*"; then echo "$i:the Postfix mail system is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' else echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g'

7 years, 4 months

4611 FIX check_mail_loop: Fixed exception 'module' object has no attrib ute ‘text’

by Lars Michelsen

Module: check_mk Branch: master Commit: 59baec56c32bdb5dfe5e0063573a627bdcaabd5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59baec56c32bdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 09:52:10 2017 +0200 4611 FIX check_mail_loop: Fixed exception 'module' object has no attribute ‘text’ Change-Id: I4a47c9c3e452e761c9f73bfc0e100a1759844031 --- .werks/4611 | 11 +++++++++++ active_checks/check_mail_loop | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4611 b/.werks/4611 new file mode 100644 index 0000000..4b3e322 --- /dev/null +++ b/.werks/4611 @@ -0,0 +1,11 @@ +Title: check_mail_loop: Fixed exception 'module' object has no attribute ‘text’ +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494229905 + + diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop index 5b707ee..25a57b3 100755 --- a/active_checks/check_mail_loop +++ b/active_checks/check_mail_loop @@ -27,6 +27,8 @@ import sys, getopt, os, time, random, poplib, imaplib, smtplib, email import traceback, socket, re +from email.mime.text import MIMEText + def parse_exception(e): e = str(e) if e[0] == '{': @@ -324,7 +326,7 @@ def send_mail(): now = time.time() key = random.randint(1, 1000) - mail = email.mime.text.MIMEText("") + mail = MIMEText("") mail['From'] = mail_from mail['To'] = mail_to mail['Subject'] = '%s %d %d' % (subject, now, key)

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017