Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 71f665b6894010c0b1a2d1068f91488c279dccf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f665b6894010… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 27 14:58:07 2016 +0200 Updated werk text --- .werks/3656 | 2 +- bin/mkeventd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3656 b/.werks/3656 index 0e81a87..f2f03e7 100644 --- a/.werks/3656 +++ b/.werks/3656 @@ -9,7 +9,7 @@ Class: feature The EC can now parse and process syslog messages produced by Aristana devices. These devices produce a strange syslog message format: -2016 May 26 15:41:47 IST STOD-DH1-H26-CO-B Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.CO-A.Et45), changed state to up +2016 May 26 15:41:47 IST XYZHOST1 Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.XYZ.Et45), changed state to up To break it down year month day hh:mm:ss timezone HOSTNAME KeyAgent: diff --git a/bin/mkeventd b/bin/mkeventd index 67751fa..5e23175 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2424,7 +2424,7 @@ class EventServer: # <134>1 2016-06-02T12:49:05.181+02:00 chrissw7 ChrisApp - TestID - coming from java code # Variant 10: - # 2016 May 26 15:41:47 IST STOD-DH1-H26-CO-B Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.CO-A.Et45), changed state to up + # 2016 May 26 15:41:47 IST XYZ Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.ASAD.Et45), changed state to up # year month day hh:mm:ss timezone HOSTNAME KeyAgent: # FIXME: Would be better to parse the syslog messages in another way:

8 years, 3 months

Updated bug entries #2496

by Mathias Kettner

Module: check_mk Branch: master Commit: eb3f53972e7d0920384ca7e8932f326c748f5cab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb3f53972e7d09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 27 11:56:07 2016 +0200 Updated bug entries #2496 --- .bugs/2496 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2496 b/.bugs/2496 new file mode 100644 index 0000000..6e1fd3b --- /dev/null +++ b/.bugs/2496 @@ -0,0 +1,11 @@ +Title: Folders snaping -> some subfolder -> dashboards -> Globestatistik -> Link in number wrong +Component: multisite +State: open +Date: 2016-06-27 11:53:50 +Targetversion: 1.2.8 +Class: bug + +On a dashboards that shows just a subfolder of WATO the statistics in the +globes print the correct numbers. But a click on such a number seems to +drop the WATO folder filter so the resulting view is global - not for +the selected folder.

8 years, 3 months

3656 Added support for syslog messages produced by Aristana devices

by Lars Michelsen

Module: check_mk Branch: master Commit: b22b47b7ca8858e1fe3b6cf53fbe0ce5d0a4b41f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b22b47b7ca8858… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 27 09:46:24 2016 +0200 3656 Added support for syslog messages produced by Aristana devices The EC can now parse and process syslog messages produced by Aristana devices. These devices produce a strange syslog message format: 2016 May 26 15:41:47 IST STOD-DH1-H26-CO-B Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.CO-A.Et45), changed state to up To break it down year month day hh:mm:ss timezone HOSTNAME KeyAgent: Some more documentation: http://www.arista.com/docs/Manuals/QuickStart-Managing7100Series.pdf --- .werks/3656 | 17 +++++++++++++++++ ChangeLog | 1 + bin/mkeventd | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/.werks/3656 b/.werks/3656 new file mode 100644 index 0000000..0e81a87 --- /dev/null +++ b/.werks/3656 @@ -0,0 +1,17 @@ +Title: Added support for syslog messages produced by Aristana devices +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i1 +Date: 1467013515 +Class: feature + +The EC can now parse and process syslog messages produced by Aristana devices. +These devices produce a strange syslog message format: + +2016 May 26 15:41:47 IST STOD-DH1-H26-CO-B Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.CO-A.Et45), changed state to up + +To break it down +year month day hh:mm:ss timezone HOSTNAME KeyAgent: + +Some more documentation: http://www.arista.com/docs/Manuals/QuickStart-Managing7100Series.pdf diff --git a/ChangeLog b/ChangeLog index 10e26bd..5ba0426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -498,6 +498,7 @@ * 3388 Event Console can now process SNMPv3 traps... * 3390 Events can now be cancelled by the syslog application... * 3539 Event console: The EC notifications are now also controlled through the master control snapin... + * 3656 Added support for syslog messages produced by Aristana devices... * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded * 3335 FIX: Improved error handling when requested rule pack does not exist diff --git a/bin/mkeventd b/bin/mkeventd index a0413e9..67751fa 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2423,6 +2423,10 @@ class EventServer: # Variant 9: syslog message (RFC 5424) # <134>1 2016-06-02T12:49:05.181+02:00 chrissw7 ChrisApp - TestID - coming from java code + # Variant 10: + # 2016 May 26 15:41:47 IST STOD-DH1-H26-CO-B Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.CO-A.Et45), changed state to up + # year month day hh:mm:ss timezone HOSTNAME KeyAgent: + # FIXME: Would be better to parse the syslog messages in another way: # Split the message by the first ":", then split the syslog header part # and detect which information are present. Take a look at the syslog RFCs @@ -2484,6 +2488,14 @@ class EventServer: if address and type(address) == tuple: event["host"] = address[0] + # Variant 10 + elif line[4] == " " and line[:4].isdigit(): + time_part = line[:20] # ignoring tz info + event["host"], application, line = line[25:].split(" ", 2) + event["application"] = application.rstrip(":") + event["text"] = line + event['time'] = time.mktime(time.strptime(time_part, '%Y %b %d %H:%M:%S')) + # Variant 1,2,4 else: month_name, day, timeofday, host, rest = line.split(None, 4)

8 years, 3 months

IWYU.

by Sven Panne

Module: check_mk Branch: master Commit: ed3811c97f90b12b6d784d760642041e02a88a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed3811c97f90b1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 27 09:17:56 2016 +0200 IWYU. --- livestatus/src/LogEntry.cc | 2 +- livestatus/src/LogEntry.h | 1 + livestatus/src/strutil.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 59cb3ba..08c620d 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -25,8 +25,8 @@ #include "LogEntry.h" #include <stdlib.h> #include <string.h> +#include <algorithm> #include "strutil.h" -#include "logger.h" LogEntry::LogEntry(const CommandsHolder &commands_holder, unsigned lineno, char *line) diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 77fbbad..9f49122 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <time.h> +#include <vector> #include "CommandsHolder.h" #include "nagios.h" diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index ddad0b8..6115a0b 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -26,7 +26,9 @@ #define strutil_h #include "config.h" // IWYU pragma: keep +#ifndef __cplusplus #include <stdbool.h> +#endif #ifdef __cplusplus extern "C" {

8 years, 3 months

clang-formatted. Removed a spurious marker.

by Sven Panne

Module: check_mk Branch: master Commit: 051b1aba4e467d3a8b0e612ffd2e1cd0fd45156d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=051b1aba4e467d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 27 09:20:20 2016 +0200 clang-formatted. Removed a spurious marker. --- livestatus/src/IntColumnFilter.cc | 3 ++- livestatus/src/LogEntry.cc | 1 - livestatus/src/StringColumnFilter.cc | 1 - livestatus/src/TableColumns.cc | 2 +- livestatus/src/strutil.cc | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index d51db2b..335e9ad 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -133,7 +133,8 @@ void IntColumnFilter::findIntLimits(const string &column_name, int *lower, } } -bool IntColumnFilter::optimizeBitmask(const string &column_name, uint32_t *mask) { +bool IntColumnFilter::optimizeBitmask(const string &column_name, + uint32_t *mask) { int32_t ref_value = convertRefValue(); if (column_name != _column->name()) { diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 08c620d..6b6852b 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -288,7 +288,6 @@ void LogEntry::applyWorkarounds() { } } - bool LogEntry::handleTextEntry() { if (strncmp(_text, "LOG VERSION: 2.0", 16) == 0) { _logclass = LOGCLASS_PROGRAM; diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index 441a66e..7f364b0 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -79,7 +79,6 @@ StringColumnFilter::~StringColumnFilter() { } } - bool StringColumnFilter::accepts(void *data) { string act_string = _column->getValue(data); switch (_relOp) { diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index cf72a99..e7a061c 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -51,7 +51,7 @@ void TableColumns::answerQuery(Query *query) { } } -const char *TableColumns::getValue(Column *column, int colcol) { // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +const char *TableColumns::getValue(Column *column, int colcol) { static const char *typenames[8] = {"int", "float", "string", "list", "time", "dict", "blob", "null"}; diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index f5c1de5..3fd8b55 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -116,4 +116,3 @@ bool starts_with(const char *lhs, const char *rhs) { // difference found before end of prefix return false; } -

8 years, 3 months

Bumped the checked configuration limit for cppcheck.

by Sven Panne

Module: check_mk Branch: master Commit: 44b5685b665dbb29557c18d8a6934aeb3c5d6590 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44b5685b665dbb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 27 09:17:41 2016 +0200 Bumped the checked configuration limit for cppcheck. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bded7d5..2b49828 100644 --- a/Makefile +++ b/Makefile @@ -305,13 +305,13 @@ analyze: livestatus/config.h cppcheck: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc + $(CPPCHECK) --max-configs=16 -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc # XML output into file intended for machine processing. cppcheck-xml: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml + $(CPPCHECK) --max-configs=16 -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 3 months

brocade_mlx_power: Added OID names

by Lars Michelsen

Module: check_mk Branch: master Commit: bc75eec85ef869b98de971aaee6e16a73ac572f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc75eec85ef869… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 23 15:23:56 2016 +0200 brocade_mlx_power: Added OID names --- checks/brocade_mlx_power | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index 82e8b94..3ca6ee2 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -54,7 +54,11 @@ check_info["brocade_mlx_power"] = { "check_function" : check_brocade_mlx_power, "inventory_function" : inventory_brocade_mlx_power, "service_description" : "Power supply %s", - "snmp_info" : ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ 1, 2, 3 ]), # power supplies (id, descr, state) + "snmp_info" : ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ + 1, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyIndex + 2, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyDescription + 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus + ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), "has_perfdata" : False, }

8 years, 3 months

3655 FIX if64adm: Can now be used with OID range limits

by Lars Michelsen

Module: check_mk Branch: master Commit: 453e3428446aaaada21b9be6673caf6e04811882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453e3428446aaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 24 09:15:59 2016 +0200 3655 FIX if64adm: Can now be used with OID range limits --- .werks/3655 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3655 b/.werks/3655 new file mode 100644 index 0000000..67d990b --- /dev/null +++ b/.werks/3655 @@ -0,0 +1,10 @@ +Title: if64adm: Can now be used with OID range limits +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466752555 + + diff --git a/ChangeLog b/ChangeLog index d6e3e3d..10e26bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -283,6 +283,7 @@ * 3145 FIX: solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory... * 3147 FIX: windows agent: fixed bug where all placeholders in messages were replaced with the same parameter * 3654 FIX: apc_symmetra: Improved output in case of unknown battery state / calibration result + * 3655 FIX: if64adm: Can now be used with OID range limits Multisite: * 3187 notification view: new filter for log command via regex

8 years, 3 months

Notification config: Fixed minor styling issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 18717889b9a930b486d0218150e5ca1ca45d8613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18717889b9a930… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 24 13:05:24 2016 +0200 Notification config: Fixed minor styling issue --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1d5d739..cd1b5d0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7931,7 +7931,7 @@ def mode_notifications(phase): for nr, context in enumerate(backlog): convert_context_to_unicode(context) table.row() - table.cell(css="buttons") + table.cell(" ", css="buttons") analyse_url = html.makeuri([("analyse", str(nr))]) tooltip = "".join(("%s: %s\n" % e) for e in sorted(context.items()))

8 years, 3 months

3654 FIX apc_symmetra: Improved output in case of unknown battery state / calibration result

by Lars Michelsen

Module: check_mk Branch: master Commit: 43d632d412fc6166ebb02690686d48f99cdaa705 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43d632d412fc61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 23 14:12:16 2016 +0200 3654 FIX apc_symmetra: Improved output in case of unknown battery state / calibration result --- .werks/3654 | 10 ++++++++++ ChangeLog | 1 + checks/apc_symmetra | 11 +++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/3654 b/.werks/3654 new file mode 100644 index 0000000..d903c79 --- /dev/null +++ b/.werks/3654 @@ -0,0 +1,10 @@ +Title: apc_symmetra: Improved output in case of unknown battery state / calibration result +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466683905 + + diff --git a/ChangeLog b/ChangeLog index da35207..d6e3e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -282,6 +282,7 @@ * 3549 FIX: netapp_api_snapshots: now correctly processes offline volumes... * 3145 FIX: solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory... * 3147 FIX: windows agent: fixed bug where all placeholders in messages were replaced with the same parameter + * 3654 FIX: apc_symmetra: Improved output in case of unknown battery state / calibration result Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/apc_symmetra b/checks/apc_symmetra index bbe3e23..cb40b4c 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -111,9 +111,16 @@ def check_apc(item, params, info): 12:"on smart trim" } calib_text = { 1:"", 2:" (calibration invalid)", 3:" (calibration in progress)" } stest_text = self_test_in_progress and " (self-test running)" or "" - infotxt = "output status: %s%s%s" % (status_text.get(output_status), calib_text.get(calib_result), stest_text) + + infotxt = "output status: %s%s%s" % \ + (status_text.get(output_status, "unknown (%d)" % output_status), + calib_text.get(calib_result, " (calibration unknown: %d)" % calib_result), + stest_text) + # during calibration test is OK - if output_status not in [2, 4, 12] and calib_result != 3 and not self_test_in_progress: + if output_status not in status_text: + state = 3 + elif output_status not in [2, 4, 12] and calib_result != 3 and not self_test_in_progress: state = 2 else: state = 0

8 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016