Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

#2812: Avaya Series 88xx / 45xx: New temperature, fan and CPU utilization checks

by Andreas Boesl

Module: check_mk Branch: master Commit: c8b08a3eb1ef81b354b5cd10dbd4cfc18fa42f57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8b08a3eb1ef81… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 14 14:01:52 2015 +0100 #2812: Avaya Series 88xx / 45xx: New temperature, fan and CPU utilization checks --- ChangeLog | 1 + checkman/avaya_45xx_cpu | 14 ++++++++ checkman/avaya_45xx_fan | 23 ++++++++++++ checkman/avaya_45xx_temp | 14 ++++++++ checkman/avaya_88xx | 14 ++++++++ checkman/avaya_88xx_cpu | 14 ++++++++ checkman/avaya_88xx_fan | 14 ++++++++ checks/avaya_45xx_cpu | 52 +++++++++++++++++++++++++++ checks/avaya_45xx_fan | 61 ++++++++++++++++++++++++++++++++ checks/avaya_45xx_temp | 52 +++++++++++++++++++++++++++ checks/avaya_88xx | 88 ++++++++++++++++++++++++++++++++++++++++++++++ checks/avaya_88xx_cpu | 51 +++++++++++++++++++++++++++ modules/catalog.py | 1 + 13 files changed, 399 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c8b08a3eb1…

8 years, 9 months

#2811 Mail notifications: Now able to add Host/Service Notes Url

by Andreas Boesl

Module: check_mk Branch: master Commit: aa18f558fd430adf059b0922f7a5f7194f3a6a6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa18f558fd430a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 14 10:52:57 2015 +0100 #2811 Mail notifications: Now able to add Host/Service Notes Url You can now configure to add the host/service notes url to the email body. --- .werks/2811 | 9 +++++++++ ChangeLog | 1 + notifications/mail | 9 ++++++++- web/plugins/wato/notifications.py | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/2811 b/.werks/2811 new file mode 100644 index 0000000..2563a5e --- /dev/null +++ b/.werks/2811 @@ -0,0 +1,9 @@ +Title: Mail notifications: Now able to add Host/Service Notes Url +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i4 +Date: 1450086609 +Class: feature + +You can now configure to add the host/service notes url to the email body. diff --git a/ChangeLog b/ChangeLog index a60cfa2..a8a6700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -206,6 +206,7 @@ * 2779 FIX: Fix moving of folders... Notifications: + * 2811 Mail notifications: Now able to add Host/Service Notes Url... * 2728 FIX: Removed debug notification script (was not executable)... * 2843 FIX: Hanging notification scripts could prevent all other notifications... diff --git a/notifications/mail b/notifications/mail index 6de3ca0..6e47b16 100755 --- a/notifications/mail +++ b/notifications/mail @@ -254,6 +254,10 @@ body_elements = [ "$LONGDATETIME$", "$LONGDATETIME$", ), + ( "notesurl", "both", False, "Custom Host Notes Url", + "$HOSTNOTESURL$", + "$HOSTNOTESURL$",), + # Elements only for host notifications ( "reltime", "host", False, "Relative Time", "$LASTHOSTSTATECHANGE_REL$", @@ -275,7 +279,6 @@ body_elements = [ "$HOSTPERFDATA$", "$HOSTPERFDATA$",), - # Elements only for service notifications ( "reltime", "service", False, "Relative Time", "$LASTSERVICESTATECHANGE_REL$", @@ -305,6 +308,10 @@ body_elements = [ "$SERVICEPERFDATA$", "$SERVICEPERFDATA$",), + ( "notesurl", "service", False, "Custom Service Notes Url", + "$SERVICENOTESURL$", + "$SERVICENOTESURL$",), + # Debugging ( "context", "both", False, "Complete variable list", "$CONTEXT_ASCII$", diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 15f6219..b6e3804 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -72,6 +72,7 @@ register_notification_parameters( ( "ack_comment", _("Acknowledgement Comment") ), ( "perfdata", _("Performance Data") ), ( "graph", _("Performance Graphs") ), + ( "notesurl", _("Custom Host/Service Notes URL") ), ( "context", _("Complete variable list (for testing)" ) ), ], default_value = [ "perfdata", "graph", "abstime", "address", "longoutput" ],

8 years, 9 months

minor code cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 14ffc6f6b329d23d7cb21158750c777e7b885283 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14ffc6f6b329d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 11 14:18:08 2015 +0100 minor code cleanups --- modules/check_mk_base.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 569f615..3eaeeb4 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1203,7 +1203,9 @@ def do_check(hostname, ipaddress, only_check_types = None): try: load_item_state(hostname) - agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress, only_check_types) + agent_version, num_success, error_sections, problems = \ + do_all_checks_on_host(hostname, ipaddress, only_check_types) + num_errors = len(error_sections) save_item_state(hostname) if problems: @@ -1361,14 +1363,15 @@ def parse_check_mk_version(v): # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to the Core. -def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): +def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_agent_version = True): global g_aggregated_service_results g_aggregated_service_results = {} global g_hostname g_hostname = hostname num_success = 0 error_sections = set([]) - check_table = get_precompiled_check_table(hostname, remove_duplicates=True, world=opt_keepalive and "active" or "config") + check_table = get_precompiled_check_table(hostname, remove_duplicates=True, + world=opt_keepalive and "active" or "config") problems = [] parsed_infos = {} # temporary cache for section infos, maybe parsed @@ -1483,19 +1486,24 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): submit_aggregated_results(hostname) - try: - if is_tcp_host(hostname): - version_info = get_info_for_check(hostname, ipaddress, 'check_mk') - agent_version = version_info[0][1] - else: - agent_version = None - except MKAgentError, e: - g_broken_agent_hosts.add(hostname) - agent_version = "(unknown)" - except: - agent_version = "(unknown)" + if fetch_agent_version: + try: + if is_tcp_host(hostname): + version_info = get_info_for_check(hostname, ipaddress, 'check_mk') + agent_version = version_info[0][1] + else: + agent_version = None + except MKAgentError, e: + g_broken_agent_hosts.add(hostname) + agent_version = "(unknown)" + except: + agent_version = "(unknown)" + else: + agent_version = None + error_sections = list(error_sections) error_sections.sort() + return agent_version, num_success, error_sections, ", ".join(problems)

8 years, 9 months

Fixed real time checks sent by linux agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 709a086390e08dd07813790e0a928db05c8a4de0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=709a086390e08d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 11 14:18:21 2015 +0100 Fixed real time checks sent by linux agent --- 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 e3a1183..c7f11e5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -166,7 +166,7 @@ function run_real_time_checks() # Be aware of maximum packet size. Maybe we need to check the size of the section # output and do some kind of nicer error handling. # 2 bytes: protocol version, 10 bytes: timestamp, rest: encrypted data - (echo -e 00 ; date +%s ; + (echo -ne 00 ; date +%s | tr -d '\n' ; export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt) >/dev/udp/$REMOTE/$RTC_PORT done

8 years, 9 months

#1317 FIX fileinfo.groups: Fixed handling of $DATE pattern

by Bastian Kuhn

Module: check_mk Branch: master Commit: 473f2fee2bae165b43d72a532f40eb1f91bef6f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473f2fee2bae16… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 11 13:37:35 2015 +0100 #1317 FIX fileinfo.groups: Fixed handling of $DATE pattern Before that fix the feature to use the current date as match criteria for fileinfo groups only worked when the filename started with the date. Now the date not longer have to be at the beginning of the filename. --- .werks/1317 | 13 +++++++++++++ ChangeLog | 1 + checks/fileinfo | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1317 b/.werks/1317 new file mode 100644 index 0000000..2e1f5a6 --- /dev/null +++ b/.werks/1317 @@ -0,0 +1,13 @@ +Title: fileinfo.groups: Fixed handling of $DATE pattern +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449837223 + +Before that fix the feature to use the current date as match criteria for fileinfo groups only worked +when the filename started with the date. Now the date not longer have to be at the beginning of the filename. + + diff --git a/ChangeLog b/ChangeLog index 4f8ba5e..a60cfa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * 2861 FIX: hivemanager_devices: Fixed configuration of states to treat as WARN * 1312 FIX: carel_uniflair_cooling: Check is now disabled... * 2868 FIX: cpu_util.include: fixed crash on some systems if per-core statistics were enabled... + * 1317 FIX: fileinfo.groups: Fixed handling of $DATE pattern... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/fileinfo b/checks/fileinfo index a1c3f2d..77f2636 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -61,7 +61,7 @@ def inventory_fileinfo(info, case): return inventory def fileinfo_process_date(pattern,reftime): - disect = re.match('(/.*/)\$DATE:((?:%\w.?){1,})\$(.*)',pattern) + disect = re.match('(/.*)\$DATE:((?:%\w.?){1,})\$(.*)',pattern) if disect: prefix = disect.group(1) datepattern = time.strftime(disect.group(2),time.localtime(reftime))

8 years, 9 months

winperf_if: fixed reliance on extra section

by Sebastian Herbord

Module: check_mk Branch: master Commit: cd5014cc98f9c3f608d62a4f82aedd8110104b84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd5014cc98f9c3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Dec 11 12:00:37 2015 +0100 winperf_if: fixed reliance on extra section --- agents/windows/plugins/mk_dhcp_enabled.bat | 4 +++- checks/winperf_if | 34 +++++++++++++++++----------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/agents/windows/plugins/mk_dhcp_enabled.bat b/agents/windows/plugins/mk_dhcp_enabled.bat index 3f56335..e9a259c 100644 --- a/agents/windows/plugins/mk_dhcp_enabled.bat +++ b/agents/windows/plugins/mk_dhcp_enabled.bat @@ -1,3 +1,5 @@ @echo off -echo ^<^<^<dhcp^>^>^> +echo ^<^<^<winperf_if^>^>^> +echo [dhcp_start] wmic path Win32_NetworkAdapterConfiguration get Description, dhcpenabled +echo [dhcp_end] diff --git a/checks/winperf_if b/checks/winperf_if index 99fd6e2..290465c 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -101,10 +101,19 @@ def convert_winperf_if(info, nic_names, nic_index): teaming_headers = [] teaming_info = {} + dhcp_lines = [] + try: while True: line = lines.next() + if line[0] == "[dhcp_start]": + line = lines.next() # skip start line + while line[0] != "[dhcp_end]": + dhcp_lines.append(line) + line = lines.next() + line = lines.next() # skip end line + # Process teaming information if line[0].startswith("[teaming_start]"): is_teaming_line = True @@ -275,14 +284,14 @@ def convert_winperf_if(info, nic_names, nic_index): mac, )) - return converted + return converted, dhcp_lines def winperf_if_get_nic_index_map(nic_names): return dict(map(lambda x: (x[1], x[0] + 1), enumerate(nic_names))) -def check_if_dhcp(item, params, info, nic_names, nic_index): +def check_if_dhcp(item, _no_params, info, nic_names, nic_index): lines = iter(info) header = lines.next() @@ -310,23 +319,23 @@ def check_if_dhcp(item, params, info, nic_names, nic_index): def inventory_winperf_if(info): - perf, dhcp = info - nic_names = map(winperf_if_canonize_nic_name, perf[1][2:]) + nic_names = map(winperf_if_canonize_nic_name, info[1][2:]) nic_index = winperf_if_get_nic_index_map(nic_names) - return inventory_if_common(convert_winperf_if(perf, nic_names, nic_index)) + perf, dhcp = convert_winperf_if(info, nic_names, nic_index) + + return inventory_if_common(perf) # dhcp info irrelevant to inventory def check_winperf_if(item, params, info): - perf, dhcp = info - nic_names = map(winperf_if_canonize_nic_name, perf[1][2:]) + nic_names = map(winperf_if_canonize_nic_name, info[1][2:]) nic_index = winperf_if_get_nic_index_map(nic_names) - yield check_if_common(item, params, convert_winperf_if(perf, nic_names, nic_index), - group_name = "Teaming") - if dhcp is not None: - yield check_if_dhcp(item, params, dhcp, nic_names, nic_index) + perf, dhcp = convert_winperf_if(info, nic_names, nic_index) + + yield check_if_common(item, params, perf, group_name = "Teaming") + yield check_if_dhcp(item, params, dhcp, nic_names, nic_index) check_info["winperf_if"] = { @@ -336,6 +345,5 @@ check_info["winperf_if"] = { 'has_perfdata': True, 'includes': [ 'if.include' ], 'group': 'if', - 'default_levels_variable': 'if_default_levels', - "extra_sections" : [ 'dhcp' ], + 'default_levels_variable': 'if_default_levels' }

8 years, 9 months

windows agent: fixed buffer breakage with very large plugin output ( i.e. inventory)

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9074b51b75a477f20f369de6b4546bf1f61c631d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9074b51b75a477… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Dec 11 12:01:34 2015 +0100 windows agent: fixed buffer breakage with very large plugin output (i.e. inventory) --- agents/windows/OutputProxy.cc | 27 ++++++++++++++++++---- agents/windows/OutputProxy.h | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 878592 -> 879104 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 878592 -> 879104 bytes agents/windows/check_mk_agent.exe | Bin 798208 -> 799744 bytes agents/windows/check_mk_agent.msi | Bin 1935872 -> 1937920 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 798208 -> 799744 bytes agents/windows/install_agent-64.exe | Bin 401627 -> 402341 bytes agents/windows/install_agent.exe | Bin 392384 -> 393176 bytes 10 files changed, 25 insertions(+), 6 deletions(-) diff --git a/agents/windows/OutputProxy.cc b/agents/windows/OutputProxy.cc index 56b23f7..a87d20e 100644 --- a/agents/windows/OutputProxy.cc +++ b/agents/windows/OutputProxy.cc @@ -73,7 +73,20 @@ void BufferedSocketProxy::output(const char *format, ...) va_list ap; va_start(ap, format); - int written_len = vsnprintf(&_buffer[0] + _length, _buffer.size() - _length, format, ap); + size_t buffer_left = _buffer.size() - _length; + + int written_len = vsnprintf(&_buffer[0] + _length, buffer_left, format, ap); + + if (written_len >= (int)buffer_left) { + size_t target_size = _length + written_len + 1; + size_t new_size = _buffer.size() * 2; + while (new_size < target_size) { + new_size *= 2; + } + _buffer.resize(new_size); + vsnprintf(&_buffer[0] + _length, _buffer.size() - _length, format, ap); + } + va_end(ap); _length += written_len; @@ -103,7 +116,9 @@ void BufferedSocketProxy::flush() int tries = 10; while ((_length > 0) && (tries > 0)) { --tries; - flushInt(); + if (!flushInt()) { + return; + } if (_length > 0) { ::Sleep(100); } @@ -114,8 +129,9 @@ void BufferedSocketProxy::flush() } -void BufferedSocketProxy::flushInt() +bool BufferedSocketProxy::flushInt() { + bool error = false; size_t offset = 0; while (!g_should_terminate) { ssize_t result = send(_socket, &_buffer[0] + offset, _length - offset, 0); @@ -129,11 +145,13 @@ void BufferedSocketProxy::flushInt() } else if (error == WSAEWOULDBLOCK) { verbose("send to socket would block"); + error = true; break; } else { verbose("send to socket failed with error code %d", error); + error = true; break; } } @@ -148,10 +166,11 @@ void BufferedSocketProxy::flushInt() break; } _length -= offset; - if (_length != 0) { + if ((_length != 0) && (offset != 0)) { // not the whole buffer has been sent, shift up the remaining data memmove(&_buffer[0], &_buffer[0] + offset, _length); } + return !error; } diff --git a/agents/windows/OutputProxy.h b/agents/windows/OutputProxy.h index e933286..47251ca 100644 --- a/agents/windows/OutputProxy.h +++ b/agents/windows/OutputProxy.h @@ -82,7 +82,7 @@ public: protected: - void flushInt(); + bool flushInt(); private: diff --git a/agents/windows/build_version b/agents/windows/build_version index acbef43..eeb072e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -982 +997 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 19ca67b..f76757a 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 7a64469..ad7560b 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b8f6218..aa1836d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index db7dfb8..a73db0b 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 42cd6a4..f762679 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8ce0750..a24c0d9 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 8e5ce50..c76021f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 9 months

Finishing iwyu changes.

by Sven Panne

Module: check_mk Branch: master Commit: c479410761d86d0acada90f531d3c23eee1ce54a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c479410761d86d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 11 11:23:29 2015 +0100 Finishing iwyu changes. livestatus is now iwyu-clean, and every header includes config.h. --- livestatus/src/DoublePointerColumn.h | 13 +++++++----- livestatus/src/FixedIntColumn.h | 12 ++++++----- livestatus/src/IntPointerColumn.h | 12 ++++++----- livestatus/src/StatusSpecialIntColumn.cc | 4 +--- livestatus/src/StatusSpecialIntColumn.h | 12 ++++++----- livestatus/src/StringPointerColumn.h | 12 ++++++----- livestatus/src/data_encoding.h | 2 ++ livestatus/src/livestatus.h | 2 ++ livestatus/src/tables.h | 33 +++++++++++++++--------------- 9 files changed, 58 insertions(+), 44 deletions(-) diff --git a/livestatus/src/DoublePointerColumn.h b/livestatus/src/DoublePointerColumn.h index e92fa70..59d7364 100644 --- a/livestatus/src/DoublePointerColumn.h +++ b/livestatus/src/DoublePointerColumn.h @@ -25,16 +25,19 @@ #ifndef DoublePointerColumn_h #define DoublePointerColumn_h +#include "config.h" // IWYU pragma: keep #include "DoubleColumn.h" -class DoublePointerColumn : public DoubleColumn -{ +class DoublePointerColumn : public DoubleColumn { double *_number; + public: - DoublePointerColumn(std::string name, std::string description, double *number) - : DoubleColumn(name, description, -1), _number(number) {} + DoublePointerColumn(std::string name, std::string description, + double *number) + : DoubleColumn(name, description, -1), _number(number) + { + } double getValue(void *) { return *_number; } }; - #endif // DoublePointerColumn_h diff --git a/livestatus/src/FixedIntColumn.h b/livestatus/src/FixedIntColumn.h index 8ddc13c..8debbb3 100644 --- a/livestatus/src/FixedIntColumn.h +++ b/livestatus/src/FixedIntColumn.h @@ -22,18 +22,20 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. - #ifndef FixedIntColumn_h #define FixedIntColumn_h +#include "config.h" // IWYU pragma: keep #include "IntColumn.h" -class FixedIntColumn : public IntColumn -{ +class FixedIntColumn : public IntColumn { int32_t _value; + public: - FixedIntColumn(std::string name, std::string description, int value) : - IntColumn(name, description, -1), _value(value) {} + FixedIntColumn(std::string name, std::string description, int value) + : IntColumn(name, description, -1), _value(value) + { + } int32_t getValue(void *, Query *) { return _value; } }; diff --git a/livestatus/src/IntPointerColumn.h b/livestatus/src/IntPointerColumn.h index 7242725..962f6aa 100644 --- a/livestatus/src/IntPointerColumn.h +++ b/livestatus/src/IntPointerColumn.h @@ -25,16 +25,18 @@ #ifndef IntPointerColumn_h #define IntPointerColumn_h +#include "config.h" // IWYU pragma: keep #include "IntColumn.h" -class IntPointerColumn : public IntColumn -{ +class IntPointerColumn : public IntColumn { int *_number; + public: - IntPointerColumn(std::string name, std::string description, int* number) - : IntColumn(name, description, -1), _number(number) {} + IntPointerColumn(std::string name, std::string description, int *number) + : IntColumn(name, description, -1), _number(number) + { + } int32_t getValue(void *, Query *) { return *_number; } }; - #endif // IntPointerColumn_h diff --git a/livestatus/src/StatusSpecialIntColumn.cc b/livestatus/src/StatusSpecialIntColumn.cc index e9fa5a6..ffa2b92 100644 --- a/livestatus/src/StatusSpecialIntColumn.cc +++ b/livestatus/src/StatusSpecialIntColumn.cc @@ -26,12 +26,10 @@ #include "mk_inventory.h" class Query; - int32_t StatusSpecialIntColumn::getValue(void *, Query *) { switch (_type) { - case SPIC_MK_INVENTORY_LAST: - return mk_inventory_last_of_all(); + case SPIC_MK_INVENTORY_LAST: return mk_inventory_last_of_all(); } // never reached, make -Wall happy return 0; diff --git a/livestatus/src/StatusSpecialIntColumn.h b/livestatus/src/StatusSpecialIntColumn.h index 1964fba..5b39c18 100644 --- a/livestatus/src/StatusSpecialIntColumn.h +++ b/livestatus/src/StatusSpecialIntColumn.h @@ -25,20 +25,22 @@ #ifndef StatusSpecialIntColumn_h #define StatusSpecialIntColumn_h -#include "IntColumn.h" +#include "config.h" // IWYU pragma: keep #include <stdint.h> #include <string> +#include "IntColumn.h" class Query; - #define SPIC_MK_INVENTORY_LAST 0 -class StatusSpecialIntColumn : public IntColumn -{ +class StatusSpecialIntColumn : public IntColumn { int _type; + public: StatusSpecialIntColumn(std::string name, std::string description, int type) - : IntColumn(name, description, -1), _type(type) {} + : IntColumn(name, description, -1), _type(type) + { + } int32_t getValue(void *, Query *); }; diff --git a/livestatus/src/StringPointerColumn.h b/livestatus/src/StringPointerColumn.h index 6431c88..9c6df46 100644 --- a/livestatus/src/StringPointerColumn.h +++ b/livestatus/src/StringPointerColumn.h @@ -25,16 +25,18 @@ #ifndef StringPointerColumn_h #define StringPointerColumn_h +#include "config.h" // IWYU pragma: keep #include "StringColumn.h" -class StringPointerColumn : public StringColumn -{ +class StringPointerColumn : public StringColumn { char *_string; + public: StringPointerColumn(std::string name, std::string description, char *string) - : StringColumn(name, description, -1), _string(string) {} - char* getValue(void* ) { return _string; } + : StringColumn(name, description, -1), _string(string) + { + } + char *getValue(void *) { return _string; } }; - #endif // StringPointerColumn_h diff --git a/livestatus/src/data_encoding.h b/livestatus/src/data_encoding.h index 351cd70..eaa6e15 100644 --- a/livestatus/src/data_encoding.h +++ b/livestatus/src/data_encoding.h @@ -25,6 +25,8 @@ #ifndef data_encoding_h #define data_encoding_h +#include "config.h" // IWYU pragma: keep + #define ENCODING_UTF8 0 #define ENCODING_LATIN1 1 #define ENCODING_MIXED 2 diff --git a/livestatus/src/livestatus.h b/livestatus/src/livestatus.h index 83d7188..b1fd6d1 100644 --- a/livestatus/src/livestatus.h +++ b/livestatus/src/livestatus.h @@ -25,6 +25,8 @@ #ifndef livestatus_h #define livestatus_h +#include "config.h" // IWYU pragma: keep + #define DEFAULT_SOCKET_PATH "/usr/local/nagios/var/rw/live" #endif // livestatus_h diff --git a/livestatus/src/tables.h b/livestatus/src/tables.h index 90d2e92..9bd05c2 100644 --- a/livestatus/src/tables.h +++ b/livestatus/src/tables.h @@ -25,40 +25,41 @@ #ifndef tables_h #define tables_h +#include "config.h" // IWYU pragma: keep + #ifndef EXTERN #define EXTERN extern #endif class TableContacts; -EXTERN TableContacts *g_table_contacts; +EXTERN TableContacts *g_table_contacts; class TableCommands; -EXTERN TableCommands *g_table_commands; +EXTERN TableCommands *g_table_commands; class TableHosts; -EXTERN TableHosts *g_table_hosts; -EXTERN TableHosts *g_table_hostsbygroup; +EXTERN TableHosts *g_table_hosts; +EXTERN TableHosts *g_table_hostsbygroup; class TableServices; -EXTERN TableServices *g_table_services; -EXTERN TableServices *g_table_servicesbygroup; -EXTERN TableServices *g_table_servicesbyhostgroup; +EXTERN TableServices *g_table_services; +EXTERN TableServices *g_table_servicesbygroup; +EXTERN TableServices *g_table_servicesbyhostgroup; class TableHostgroups; -EXTERN TableHostgroups *g_table_hostgroups; +EXTERN TableHostgroups *g_table_hostgroups; class TableServicegroups; EXTERN TableServicegroups *g_table_servicegroups; class TableDownComm; -EXTERN TableDownComm *g_table_downtimes; -EXTERN TableDownComm *g_table_comments; +EXTERN TableDownComm *g_table_downtimes; +EXTERN TableDownComm *g_table_comments; class TableTimeperiods; -EXTERN TableTimeperiods *g_table_timeperiods; +EXTERN TableTimeperiods *g_table_timeperiods; class TableContactgroups; EXTERN TableContactgroups *g_table_contactgroups; class TableStatus; -EXTERN TableStatus *g_table_status; +EXTERN TableStatus *g_table_status; class TableLog; -EXTERN TableLog *g_table_log; +EXTERN TableLog *g_table_log; class TableStateHistory; -EXTERN TableStateHistory *g_table_statehistory; +EXTERN TableStateHistory *g_table_statehistory; class TableColumns; -EXTERN TableColumns *g_table_columns; +EXTERN TableColumns *g_table_columns; #endif // tables_h -

8 years, 9 months

#2885 cisco_hsrp: now reports the HSRP state

by Simon Betz

Module: check_mk Branch: master Commit: 30cc8b9f25cd2fd73651226f294c7945f2f70966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30cc8b9f25cd2f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 11 10:52:05 2015 +0100 #2885 cisco_hsrp: now reports the HSRP state This check now reports the HSRP state in every case. The states can be 'initial', 'learn', 'listen', 'speak', 'standby' and 'active'. --- .werks/2885 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_hsrp | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/2885 b/.werks/2885 new file mode 100644 index 0000000..4c5e1d9 --- /dev/null +++ b/.werks/2885 @@ -0,0 +1,10 @@ +Title: cisco_hsrp: now reports the HSRP state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449827357 +Class: feature + +This check now reports the HSRP state in every case. The states can be +'initial', 'learn', 'listen', 'speak', 'standby' and 'active'. diff --git a/ChangeLog b/ChangeLog index 06a123e..4f8ba5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library * 1316 mysql_slave: Levels can now be configured with WATO * 2809 netscaler_vserver: now reports health_perc as performance data + * 2885 cisco_hsrp: now reports the HSRP state... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/cisco_hsrp b/checks/cisco_hsrp index 4d32331..48fb83d 100644 --- a/checks/cisco_hsrp +++ b/checks/cisco_hsrp @@ -121,11 +121,11 @@ def check_cisco_hsrp(item, params, info): # anything else must be a non-operative state already else: state = 2 - msgtxt = "Redundancy Group %s has status %s" % ( hsrp_grp, hsrp_states[hsrp_state]) + msgtxt = "Redundancy Group %s" % hsrp_grp - return (state, msgtxt) + return state, "%s, Status: %s" % (msgtxt, hsrp_states.get(hsrp_state, "unknown")) - return (3, "HSRP Group not found in Agent output" ) + return 3, "HSRP Group not found in Agent output"

8 years, 9 months

Added Check_MK mode for real time checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c959c1c8d7e328e0e3e915a91a87d9925d58950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c959c1c8d7e32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 11 09:56:20 2015 +0100 Added Check_MK mode for real time checks --- modules/check_mk.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0c5007f..6e76794 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3729,12 +3729,12 @@ def usage(): cmk --scan-parents [HOST1 HOST2...] autoscan parents, create conf.d/parents.mk cmk -P, --package COMMAND do package operations cmk --localize COMMAND do localization operations - cmk --handle-alerts used to handle alerts from core cmk --notify used to send notifications from core cmk --create-rrd [--keepalive|SPEC] create round robin database (only CEE) cmk --convert-rrds [--split] [H...] convert exiting RRD to new format (only CEE) cmk --compress-history FILES... optimize monitoring history files for CMC cmk --handle-alerts alert handling, always in keepalive mode (only CEE) + cmk --real-time-checks process real time check results (only CEE) cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) @@ -4753,10 +4753,10 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", - "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap" ] + "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', - '--handle-alerts', '--notify', + '--handle-alerts', '--notify', '--real-time-checks', '--man', '-V', '--version' ,'-h', '--help', '--automation', '--create-rrd', '--convert-rrds', '--compress-history', '--keepalive', '--cap' ] @@ -4967,12 +4967,21 @@ try: load_module("inventory") do_inv_check(a) done = True + elif o == '--handle-alerts': read_config_files(with_conf_d=True, validate_hosts=False) sys.exit(do_handle_alerts(args)) + elif o == '--notify': read_config_files(with_conf_d=True, validate_hosts=False) sys.exit(do_notify(args)) + + elif o == '--real-time-checks': + load_module("keepalive") + load_module("real_time_checks") + do_real_time_checks(args) + sys.exit(0) + elif o == '--create-rrd': read_config_files(with_conf_d=True, validate_hosts=False) load_module("rrd")

8 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015