Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: 84716d04a3c0dff1d99ca2e7ea95f34e2c001f5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84716d04a3c0df… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Nov 21 09:46:36 2016 +0100 added a bug --- .bugs/2509 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2509 b/.bugs/2509 new file mode 100644 index 0000000..f4a33a1 --- /dev/null +++ b/.bugs/2509 @@ -0,0 +1,8 @@ +Title: Notifications: Pending Changes after editing or creating rule +Component: notification +State: open +Date: 2016-11-21 09:41:13 +Targetversion: future +Class: bug + +If editing or creating a rule in notifications a pending changes will appear. But there are no pending changes and in consequence none can be activated. Still the pending changes are displayed.

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: fbab715bfacf688256d19a7b9df931d6e6f77660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbab715bfacf68… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 18 15:10:07 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Query.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 3b13e78..a960ef6 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -198,7 +198,7 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding) for (const auto &sc : _stats_columns) { // TODO(sp) We should really move column() from StatsColumn, it doesn't // belong there... :-P - if (sc->column()) { + if (sc->column() != nullptr) { _all_columns.insert(sc->column()); } }

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: a2ffd12f0e18f99840687d621a682ad218906ac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2ffd12f0e18f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 18 15:00:57 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/LogCache.cc | 21 ++++++++------------- livestatus/src/Query.cc | 6 +++++- livestatus/src/TableLog.cc | 4 +++- livestatus/src/TableStateHistory.cc | 4 +++- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 0d329bc..16ee255 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -67,25 +67,19 @@ void LogCache::setMaxCachedMessages(unsigned long m) { LogCache::~LogCache() { forgetLogfiles(); } bool LogCache::logCachePreChecks(MonitoringCore *core) { - // Do we have any logfiles (should always be the case, but we don't want to - // crash... - if (_logfiles.empty()) { - Informational(_logger) << "no log file found, not even " << log_file; - return false; - } - // Has Nagios rotated logfiles? => Update our file index. And delete all - // memorized log messages. - if (core->last_logfile_rotation() > _last_index_update) { - Informational(_logger) - << "core has rotated log files, rebuilding log file index"; + if (_logfiles.empty() || + core->last_logfile_rotation() > _last_index_update) { forgetLogfiles(); updateLogfileIndex(); } - return true; + if (_logfiles.empty()) { + Notice(_logger) << "no log file found, not even " << log_file; + } + return !_logfiles.empty(); } void LogCache::forgetLogfiles() { - Informational(_logger) << "flushing complete log file cache."; + Notice(_logger) << "flushing log file index"; for (auto &logfile : _logfiles) { delete logfile.second; } @@ -94,6 +88,7 @@ void LogCache::forgetLogfiles() { } void LogCache::updateLogfileIndex() { + Notice(_logger) << "updating log file index"; _last_index_update = system_clock::now(); // We need to find all relevant logfiles. This includes directory, the // current nagios.log and all files in the archive. diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 012d394..3b13e78 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -196,7 +196,11 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding) _all_columns.insert(_columns.begin(), _columns.end()); for (const auto &sc : _stats_columns) { - _all_columns.insert(sc->column()); + // TODO(sp) We should really move column() from StatsColumn, it doesn't + // belong there... :-P + if (sc->column()) { + _all_columns.insert(sc->column()); + } } ColumnCollector cc(_all_columns); diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index b1d3386..9e867fd 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -171,7 +171,9 @@ string TableLog::namePrefix() const { return "log_"; } void TableLog::answerQuery(Query *query) { lock_guard<mutex> lg(_log_cache->_lock); - _log_cache->logCachePreChecks(_core); + if (!_log_cache->logCachePreChecks(_core)) { + return; + } int since = 0; int until = time(nullptr) + 1; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 16dd2b1..262a884 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -355,7 +355,9 @@ void TableStateHistory::answerQuery(Query *query) { } lock_guard<mutex> lg(_log_cache->_lock); - _log_cache->logCachePreChecks(_core); + if (!_log_cache->logCachePreChecks(_core)) { + return; + } // This flag might be set to true by the return value of processDataset(...) _abort_query = false;

7 years, 10 months

3991 FIX BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups

by Andreas Boesl

Module: check_mk Branch: master Commit: c403aa2f0a88b409a9786670cb7b33fb53c45055 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c403aa2f0a88b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 18 14:01:10 2016 +0100 3991 FIX BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups --- .werks/3991 | 10 ++++++++++ ChangeLog | 3 +++ web/htdocs/bi.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3991 b/.werks/3991 new file mode 100644 index 0000000..aaf2cc3 --- /dev/null +++ b/.werks/3991 @@ -0,0 +1,10 @@ +Title: BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479474003 + + diff --git a/ChangeLog b/ChangeLog index 74c8146..2e755e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,9 @@ Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... + BI: + * 3991 FIX: BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups + Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 29cc55d..45d938e 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -360,7 +360,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): continue # the group has already been compiled completely if group not in cache['forest']: - cache['forest'][group] = new_entries + cache['forest'][group] = new_entries[:] else: cache['forest'][group] += new_entries

7 years, 10 months

Fixed output of mk_logwatch.aix, this never worked...

by Sven Panne

Module: check_mk Branch: master Commit: 717e82226a0cfb393ca3cf20517724cd999c1a92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717e82226a0cfb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 18 12:57:15 2016 +0100 Fixed output of mk_logwatch.aix, this never worked... --- agents/plugins/mk_logwatch.aix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/plugins/mk_logwatch.aix b/agents/plugins/mk_logwatch.aix index f0617b2..8996093 100755 --- a/agents/plugins/mk_logwatch.aix +++ b/agents/plugins/mk_logwatch.aix @@ -7,8 +7,7 @@ echo "<<<logwatch>>>" echo "[[[errorlog]]]" OUT=$(errpt | awk 'NR>1 { printf "C %s\n", $0 }') if [[ $OUT != '' ]];then - echo $OUT + echo "$OUT" errpt -a > /var/log/errpt_$(date +%s).log errclear 0 fi -

7 years, 10 months

4045 FIX Tactical Overview: do not count OK events as problems

by Mathias Kettner

Module: check_mk Branch: master Commit: ee27b39ee695530439c1f5bacbddf13d99bf748a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee27b39ee69553… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 18 10:34:14 2016 +0100 4045 FIX Tactical Overview: do not count OK events as problems --- .werks/4045 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/4045 b/.werks/4045 new file mode 100644 index 0000000..c67f6ef --- /dev/null +++ b/.werks/4045 @@ -0,0 +1,9 @@ +Title: Tactical Overview: do not count OK events as problems +Level: 2 +Component: wato +Compatible: multisite +Version: 1.4.0i3 +Date: 1479461630 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3667e80..74c8146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 3976 FIX: Fixed broken link in LDAP automatic sync help text * 3977 FIX: Fixed poping up changes button in sidebar snapin after a change * 3982 FIX: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange + * 4045 FIX: Tactical Overview: do not count OK events as problems Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 52dddac..2350bc3 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -600,9 +600,16 @@ def get_tactical_overview_data(extra_filter_headers): event_query = ( "GET eventconsoleevents\n" "Stats: event_phase != \n" + ) + + event_problems_query = ( + "GET eventconsoleevents\n" "Stats: event_phase = ack\n" "Stats: event_phase = open\n" + "Filter: event_state != 0\n" ) + # TODO: We should rather use Stats: event_state != 0\nStatsAnd: 2 here. But that + # segfaults the CMC currently ;-) try: hstdata = sites.live().query_summed_stats(host_query) @@ -616,13 +623,19 @@ def get_tactical_overview_data(extra_filter_headers): if notdata is None: notdata = [0] - event_data = sites.live().query_summed_stats(event_query) + event_data = tactical_overview_get_event_data(event_query, event_problems_query) except livestatus.MKLivestatusNotFoundError: return None, None, None, None return hstdata, svcdata, notdata, event_data + +def tactical_overview_get_event_data(event_query, event_problems_query): + return sites.live().query_summed_stats(event_query) + \ + sites.live().query_summed_stats(event_problems_query) + + def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): if extra_url_variables is None: extra_url_variables = []

7 years, 10 months

added infotext

by Simon Betz

Module: check_mk Branch: master Commit: 4be1b2ce39807c2a49f980ff7176053469cee34b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4be1b2ce39807c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 17 13:16:19 2016 +0100 added infotext --- checks/netgear_fans | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index 52ba6ab..fba0d35 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -123,7 +123,8 @@ def check_netgear_fans(item, params, parsed): reading_str = data["reading_str"] if reading_str != "Not Supported": yield check_fan(int(data["reading_str"]), params) - yield netgear_map_state_txt_to_int(data["state"], parsed["__version__"]) + state, state_readable = netgear_map_state_txt_to_int(data["state"], parsed["__version__"]) + yield state, "Status: %s" % state_readable check_info['netgear_fans'] = {

7 years, 10 months

fixed incorrect oid comment

by Andreas Boesl

Module: check_mk Branch: master Commit: 5170da07a5ad881ea40e94a755ade428b60f1dc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5170da07a5ad88… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 14 11:27:06 2016 +0100 fixed incorrect oid comment --- checks/f5_bigip_conns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index 9dfb8e7..a384912 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -71,7 +71,7 @@ check_info["f5_bigip_conns"] = { 'inventory_function' : inventory_f5_bigip_conns, 'service_description' : 'Open Connections', 'snmp_info' : ( '.1.3.6.1.4.1.3375.2.1.1.2', [ - '1.8', # F5-BIGIP-SYSTEM-MIB::sysStatServerCurConns + '1.8', # F5-BIGIP-SYSTEM-MIB::sysStatClientCurConns '9.2', # F5-BIGIP-SYSTEM-MIB::sysClientsslStatCurConns ]), 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in \

7 years, 10 months

fixed netgear_fans check

by Simon Betz

Module: check_mk Branch: master Commit: b1618a7641cb3fb9cb8e7ee04c97b9218c3f76f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1618a7641cb3f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 17 13:13:18 2016 +0100 fixed netgear_fans check --- checks/netgear_fans | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/checks/netgear_fans b/checks/netgear_fans index 170204e..52ba6ab 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -99,9 +99,10 @@ def netgear_map_state_txt_to_int(state_nr, version): def parse_netgear_fans(info): versioninfo, sensorinfo = info - parsed = { "__version__" : versioninfo[0][0] } + parsed = { "__version__" : versioninfo[0][0], + "__fans__" : {}, } for oid_end, sstate, reading_str in sensorinfo: - parsed.setdefault("%s" % oid_end.replace(".", "/"), { + parsed["__fans__"].setdefault("%s" % oid_end.replace(".", "/"), { "state" : sstate, "reading_str" : reading_str, }) @@ -109,7 +110,7 @@ def parse_netgear_fans(info): def inventory_netgear_fans(parsed): - for sensorname, sensorinfo in parsed.items(): + for sensorname, sensorinfo in parsed["__fans__"].items(): state = sensorinfo["state"] if state != "1" and not ( state == "2" and \ sensorinfo["reading_str"] in [ "0" ] ): @@ -117,8 +118,8 @@ def inventory_netgear_fans(parsed): def check_netgear_fans(item, params, parsed): - if item in parsed: - data = parsed[item] + if item in parsed["__fans__"]: + data = parsed["__fans__"][item] reading_str = data["reading_str"] if reading_str != "Not Supported": yield check_fan(int(data["reading_str"]), params)

7 years, 10 months

4044 Display host/service notification delay with d/h/m/s, not with fractions of minute

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e4781c46da7d6b423cd2b2438876c6d37a8372b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e4781c46da7d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 12:34:48 2016 +0100 4044 Display host/service notification delay with d/h/m/s, not with fractions of minute --- .werks/4044 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 26 +++++++++++++++++--------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.werks/4044 b/.werks/4044 new file mode 100644 index 0000000..9e3c3b3 --- /dev/null +++ b/.werks/4044 @@ -0,0 +1,9 @@ +Title: Display host/service notification delay with d/h/m/s, not with fractions of minute +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1479382462 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ed38bbe..3667e80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ WATO: * 3984 Permissions can now be filtered by providing a search term on the "edit role" page... + * 4044 Display host/service notification delay with d/h/m/s, not with fractions of minute * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... * 4041 FIX: Fix exception when editing global configuration settings... * 3975 FIX: Improved error handling when trying to edit not existing global setting diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index c3ca5b2..13db28f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1601,20 +1601,26 @@ register_rule(group, itemtype = "service") +def transform_float_minutes_to_age(float_minutes): + return int(float_minutes * 60) + +def transform_age_to_float_minutes(age): + return float(age) / 60.0 + register_rule(group, "extra_host_conf:first_notification_delay", Transform( - Float( - minvalue = 0.0, - default_value = 60.0, + Age( + minvalue = 0, + default_value = 300, label = _("Delay:"), - unit = _("minutes"), title = _("Delay host notifications"), help = _("This setting delays notifications about host problems by the " "specified amount of time. If the host is up again within that " "time, no notification will be sent out."), ), - forth = lambda x: float(x), + forth = transform_float_minutes_to_age, + back = transform_age_to_float_minutes, ), factory_default = 0.0, ) @@ -1622,9 +1628,9 @@ register_rule(group, register_rule(group, "extra_service_conf:first_notification_delay", Transform( - Float( - minvalue = 0.0, - default_value = 60.0, + Age( + minvalue = 0, + default_value = 300, label = _("Delay:"), unit = _("minutes"), title = _("Delay service notifications"), @@ -1632,11 +1638,13 @@ register_rule(group, "specified amount of time. If the service is OK again within that " "time, no notification will be sent out."), ), - forth = lambda x: float(x), + forth = transform_float_minutes_to_age, + back = transform_age_to_float_minutes, ), factory_default = 0.0, itemtype = "service") + register_rule(group, "extra_host_conf:notification_interval", Optional(

7 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016