Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

WinAgent: Reuse livestatus logger implementation

by Jukka Aro

Module: check_mk Branch: master Commit: 8f4a78097b1472cccdc8f94ff7e2db7cbb9ec162 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4a78097b1472… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Sep 7 10:48:56 2017 +0200 WinAgent: Reuse livestatus logger implementation Reuse the logger implementation from livestatus monitoring core. By default, log into logfile <logdir>\agent.log. In debug mode, use stderr instead. Also reorganize global and internal linkage stuff at check_mk_agent.cc. TODO: * Handle log file rotation. Change-Id: I81b5b39281dd0e467028a29cef73ab274387d1de --- agents/windows/ChronoUtils.h | 1 + agents/windows/Configuration.cc | 1 + agents/windows/CrashHandler.cc | 45 +++--- agents/windows/CrashHandler.h | 7 +- agents/windows/Environment.cc | 10 +- agents/windows/Environment.h | 7 +- agents/windows/EventLog.cc | 27 ++-- agents/windows/EventLog.h | 10 +- agents/windows/EventLogVista.cc | 3 +- agents/windows/EventLogVista.h | 2 +- agents/windows/ExternalCmd.cc | 8 +- agents/windows/ExternalCmd.h | 8 +- agents/windows/IEventLog.cc | 9 +- agents/windows/IEventLog.h | 7 +- agents/windows/ListenSocket.cc | 8 +- agents/windows/ListenSocket.h | 7 +- agents/windows/Logger.cc | 1 + agents/windows/Logger.h | 1 + agents/windows/Makefile | 6 +- agents/windows/OHMMonitor.cc | 16 +-- agents/windows/OHMMonitor.h | 6 +- agents/windows/OutputProxy.cc | 15 +- agents/windows/OutputProxy.h | 9 +- agents/windows/Section.cc | 8 +- agents/windows/Section.h | 6 +- agents/windows/SectionManager.cc | 3 +- agents/windows/SectionManager.h | 12 +- agents/windows/Thread.cc | 6 +- agents/windows/Thread.h | 4 +- agents/windows/check_mk_agent.cc | 189 ++++++++++++++++---------- agents/windows/config.h | 0 agents/windows/sections/SectionCheckMK.cc | 18 +-- agents/windows/sections/SectionCheckMK.h | 2 +- agents/windows/sections/SectionCrashDebug.cc | 5 +- agents/windows/sections/SectionCrashDebug.h | 2 +- agents/windows/sections/SectionDF.cc | 2 +- agents/windows/sections/SectionDF.h | 2 +- agents/windows/sections/SectionEventlog.cc | 29 ++-- agents/windows/sections/SectionEventlog.h | 4 +- agents/windows/sections/SectionFileinfo.cc | 4 +- agents/windows/sections/SectionFileinfo.h | 2 +- agents/windows/sections/SectionGroup.cc | 2 +- agents/windows/sections/SectionGroup.h | 4 +- agents/windows/sections/SectionLogwatch.cc | 40 +++--- agents/windows/sections/SectionLogwatch.h | 2 +- agents/windows/sections/SectionMRPE.cc | 26 ++-- agents/windows/sections/SectionMRPE.h | 2 +- agents/windows/sections/SectionMem.cc | 2 +- agents/windows/sections/SectionMem.h | 2 +- agents/windows/sections/SectionOHM.cc | 9 +- agents/windows/sections/SectionOHM.h | 2 +- agents/windows/sections/SectionPS.cc | 19 ++- agents/windows/sections/SectionPS.h | 2 +- agents/windows/sections/SectionPerfcounter.cc | 15 +- agents/windows/sections/SectionPerfcounter.h | 4 +- agents/windows/sections/SectionPluginGroup.cc | 33 +++-- agents/windows/sections/SectionPluginGroup.h | 7 +- agents/windows/sections/SectionServices.cc | 8 +- agents/windows/sections/SectionServices.h | 2 +- agents/windows/sections/SectionSkype.cc | 2 +- agents/windows/sections/SectionSkype.h | 2 +- agents/windows/sections/SectionSpool.cc | 18 +-- agents/windows/sections/SectionSpool.h | 2 +- agents/windows/sections/SectionSystemtime.cc | 3 +- agents/windows/sections/SectionSystemtime.h | 2 +- agents/windows/sections/SectionUptime.cc | 8 +- agents/windows/sections/SectionUptime.h | 2 +- agents/windows/sections/SectionWMI.cc | 8 +- agents/windows/sections/SectionWMI.h | 2 +- agents/windows/sections/SectionWinperf.cc | 9 +- agents/windows/sections/SectionWinperf.h | 4 +- agents/windows/stringutil.cc | 7 + agents/windows/stringutil.h | 13 +- agents/windows/wmiHelper.cc | 2 +- 74 files changed, 409 insertions(+), 368 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8f4a78097b…

6 years, 9 months

Rotate windows agent logs

by Jukka Aro

Module: check_mk Branch: master Commit: 6e04d47e4aaf76f5a492b568f92bf887728ac1da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e04d47e4aaf76… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 11 11:26:46 2017 +0200 Rotate windows agent logs Use hard-coded maxBytes = 8 MB and backupCount = 5 in first version. TODO: make these rotation parameters configurable. Change-Id: I5d602754f5004b7c5d5a8f4d4e6271d0cada477c --- agents/windows/Makefile | 6 +- agents/windows/RotatingFileHandler.cc | 131 ++++++++++++++++++++++++++++++++++ agents/windows/RotatingFileHandler.h | 64 +++++++++++++++++ agents/windows/check_mk_agent.cc | 40 +++++------ 4 files changed, 216 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e04d47e4a…

6 years, 9 months

Make -Wconversion a bit happier. Improved naming.

by Sven Panne

Module: check_mk Branch: master Commit: 9ee593f7af2591e41321135046bfe6b78eb83d88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee593f7af2591… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 15 14:49:09 2017 +0200 Make -Wconversion a bit happier. Improved naming. Change-Id: I109c422b5c00ee16e95732961e8ed7c6042afd6e --- livestatus/src/HostSpecialIntColumn.cc | 4 ++-- livestatus/src/LogCache.cc | 12 ++++++------ livestatus/src/Logfile.h | 2 +- livestatus/src/Poller.h | 19 +++++++++++++------ livestatus/src/StatusSpecialIntColumn.cc | 3 ++- livestatus/src/mk_inventory.cc | 2 +- livestatus/src/mk_inventory.h | 3 ++- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index fbac0a0..96df548 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -49,8 +49,8 @@ int32_t HostSpecialIntColumn::getValue(Row row, dummy_service_description()); case Type::mk_inventory_last: { - return mk_inventory_last(_mc->mkInventoryPath() + "/" + - hst->name); + return static_cast<int32_t>(mk_inventory_last( + _mc->mkInventoryPath() + "/" + hst->name)); } } } diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index e12d8f7..11a72e6 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -148,8 +148,8 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, // Do not touch the logfile the Query is currently accessing break; } - if (it->second->numEntries() > 0) { - num_cached_log_messages -= it->second->numEntries(); + if (it->second->size() > 0) { + num_cached_log_messages -= it->second->size(); it->second->flush(); // drop all messages of that file if (static_cast<unsigned long>(num_cached_log_messages) <= _max_cached_messages) { @@ -170,7 +170,7 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, // Starting from the current logfile (wo broke out of the // previous loop just when 'it' pointed to that) for (; it != _logfiles.end(); ++it) { - if (it->second->numEntries() > 0 && + if (it->second->size() > 0 && (it->second->classesRead() & ~logclasses) != 0) { Debug(logger()) << "freeing classes " << ~logclasses << " of file " << it->second->path(); @@ -190,10 +190,10 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, // flushing logfiles from the oldest to the newest starting // at the file just after (i.e. newer than) the current logfile for (it = ++queryit; it != _logfiles.end(); ++it) { - if (it->second->numEntries() > 0) { - Debug(logger()) << "flush newer log, " << it->second->numEntries() + if (it->second->size() > 0) { + Debug(logger()) << "flush newer log, " << it->second->size() << " number of entries"; - num_cached_log_messages -= it->second->numEntries(); + num_cached_log_messages -= it->second->size(); it->second->flush(); if (static_cast<unsigned long>(num_cached_log_messages) <= _max_cached_messages) { diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 54c7413..dd39c8e 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -75,7 +75,7 @@ public: void flush(); time_t since() { return _since; } unsigned classesRead() { return _logclasses_read; } - long numEntries() { return _entries.size(); } + size_t size() { return _entries.size(); } logfile_entries_t *getEntriesFromQuery(const Query *query, LogCache *logcache, time_t since, time_t until, unsigned); diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index 55aeb89..abebfe3 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -28,6 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <poll.h> #include <cerrno> +#include <chrono> #include <string> #include <unordered_map> #include <vector> @@ -46,10 +47,13 @@ public: // encapsulated in e.g. glibc's TEMP_FAILURE_RETRY macro, see: // https://www.gnu.org/software/libc/manual/html_node/Interrupted-Primitives.h… do { - retval = ::poll( - &_pollfds[0], _pollfds.size(), - std::chrono::duration_cast<std::chrono::milliseconds>(timeout) - .count()); + auto millis = + std::chrono::duration_cast<std::chrono::milliseconds>(timeout); + // The cast below is OK because int has at least 32 bits on all + // platforms we care about: The timeout is then limited to 24.85 + // days, which should be more than enough for our needs. + retval = ::poll(&_pollfds[0], _pollfds.size(), + static_cast<int>(millis.count())); } while (retval == -1 && errno == EINTR); return retval; } @@ -70,8 +74,11 @@ private: std::unordered_map<int, size_t> _fd_to_pollfd; static short toMask(PollEvents e) { - return (is_empty_bit_mask(e & PollEvents::in) ? 0 : POLLIN) | - (is_empty_bit_mask(e & PollEvents::out) ? 0 : POLLOUT); + // The cast below is OK because all POLLFOO values are within the + // guaranteed short value range. + return static_cast<short>( + (is_empty_bit_mask(e & PollEvents::in) ? 0 : POLLIN) | + (is_empty_bit_mask(e & PollEvents::out) ? 0 : POLLOUT)); } }; diff --git a/livestatus/src/StatusSpecialIntColumn.cc b/livestatus/src/StatusSpecialIntColumn.cc index e6bc82f..bbb155b 100644 --- a/livestatus/src/StatusSpecialIntColumn.cc +++ b/livestatus/src/StatusSpecialIntColumn.cc @@ -34,7 +34,8 @@ int32_t StatusSpecialIntColumn::getValue(Row /* row */, switch (_type) { case Type::mk_inventory_last: // Check_MK Inventory touches the file ".last" after each inventory - return mk_inventory_last(_mc->mkInventoryPath() + "/.last"); + return static_cast<int32_t>( + mk_inventory_last(_mc->mkInventoryPath() + "/.last")); } // never reached, make -Wall happy return 0; diff --git a/livestatus/src/mk_inventory.cc b/livestatus/src/mk_inventory.cc index d6dd045..fd6ef91 100644 --- a/livestatus/src/mk_inventory.cc +++ b/livestatus/src/mk_inventory.cc @@ -27,7 +27,7 @@ using std::string; -int mk_inventory_last(const string &path) { +time_t mk_inventory_last(const string &path) { struct stat st; return stat(path.c_str(), &st) != 0 ? 0 : st.st_mtime; } diff --git a/livestatus/src/mk_inventory.h b/livestatus/src/mk_inventory.h index 021a11a..da162fb 100644 --- a/livestatus/src/mk_inventory.h +++ b/livestatus/src/mk_inventory.h @@ -26,8 +26,9 @@ #define mk_inventory_h #include "config.h" // IWYU pragma: keep +#include <ctime> #include <string> -int mk_inventory_last(const std::string &path); +time_t mk_inventory_last(const std::string &path); #endif // mk_inventory_h

6 years, 9 months

Added comment

by Simon Betz

Module: check_mk Branch: master Commit: 018a83a7f1d5e11e4df497e39b797d030ea7a97e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018a83a7f1d5e1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 12:33:33 2017 +0200 Added comment Change-Id: I9518beebca23d845ee1e855528950e86fd26dd33 --- agents/windows/plugins/ad_replication.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/windows/plugins/ad_replication.bat b/agents/windows/plugins/ad_replication.bat index acc8a73..f53df46 100644 --- a/agents/windows/plugins/ad_replication.bat +++ b/agents/windows/plugins/ad_replication.bat @@ -1,6 +1,8 @@ @echo off REM *** +REM * Following information concerns only Windows Server <2012R2 +REM * REM * To be able to run this check you need appropriate credentials REM * in the target domain. REM *

6 years, 9 months

5283 FIX megaraid_ldisks: Fixed error during discovery: UnboundLocalError: local variable 'item' referenced before assignment

by Simon Betz

Module: check_mk Branch: master Commit: 915ef10ae6f2bf482c0034f6a16155391eedb213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=915ef10ae6f2bf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 12:07:44 2017 +0200 5283 FIX megaraid_ldisks: Fixed error during discovery: UnboundLocalError: local variable 'item' referenced before assignment Change-Id: I7b5973901a587032aa19f513a6e2f49b807e7bd0 --- .werks/5283 | 11 +++++++++++ checks/megaraid_ldisks | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5283 b/.werks/5283 new file mode 100644 index 0000000..6de5102 --- /dev/null +++ b/.werks/5283 @@ -0,0 +1,11 @@ +Title: megaraid_ldisks: Fixed error during discovery: UnboundLocalError: local variable 'item' referenced before assignment +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505469977 + + diff --git a/checks/megaraid_ldisks b/checks/megaraid_ldisks index 27f2ef3..797b791 100644 --- a/checks/megaraid_ldisks +++ b/checks/megaraid_ldisks @@ -42,6 +42,7 @@ def parse_megaraid_ldisks(info): parsed = {} adapter = None disk = None + item = None for line in info: l = " ".join(line) if line[0] == "Adapter" and not l.endswith('No Virtual Drive Configured.'): @@ -51,7 +52,7 @@ def parse_megaraid_ldisks(info): item = "%d/%d" % (adapter, disk) parsed[item] = {} - elif item in parsed.keys(): + elif item is not None and item in parsed.keys(): if line[0].startswith("State"): parsed[item]["state"] = l.split(":")[1].strip()

6 years, 9 months

5282 FIX hpux_tunables: Fixed discovering kernel tunables on HPUX 11.23

by Simon Betz

Module: check_mk Branch: master Commit: c01d9e26466118b33340dc602e799c51b1e0a7b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c01d9e26466118… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 12:02:24 2017 +0200 5282 FIX hpux_tunables: Fixed discovering kernel tunables on HPUX 11.23 Change-Id: I74f446311706932dc9a2434e5e65c1d1d3636079 --- .werks/5282 | 11 +++++++++++ checks/hpux_tunables | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5282 b/.werks/5282 new file mode 100644 index 0000000..a6d9e6a --- /dev/null +++ b/.werks/5282 @@ -0,0 +1,11 @@ +Title: hpux_tunables: Fixed discovering kernel tunables on HPUX 11.23 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505469533 + + diff --git a/checks/hpux_tunables b/checks/hpux_tunables index baf9a30..d31e3f4 100644 --- a/checks/hpux_tunables +++ b/checks/hpux_tunables @@ -67,8 +67,8 @@ hpux_tunables_nkthread_default_levels = (80.0, 85.0) def parse_hpux_tunables(info): parsed = {} for line in info: - if "Tunable" in line[0]: - key = line[1] + if "Tunable" in line[0] or "Parameter" in line[0]: + key = line[1].strip() elif "Usage" in line[0]: usage = int(line[1]) elif "Setting" in line[0]:

6 years, 9 months

5281 FIX apache_status: Fixed ignoring invalid lines

by Simon Betz

Module: check_mk Branch: master Commit: 63f38a52f4c2708932b1e7e54f1ee905e6532272 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63f38a52f4c270… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 11:49:38 2017 +0200 5281 FIX apache_status: Fixed ignoring invalid lines Change-Id: I84cb003c353a83883a845078884098f3260c1656 --- .werks/5281 | 11 +++++++++++ checks/apache_status | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5281 b/.werks/5281 new file mode 100644 index 0000000..3bc3d22 --- /dev/null +++ b/.werks/5281 @@ -0,0 +1,11 @@ +Title: apache_status: Fixed ignoring invalid lines +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505468862 + + diff --git a/checks/apache_status b/checks/apache_status index 03c661f..2e58f12 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -89,13 +89,13 @@ _apache_status_stats = { def apache_status_parse(info): data = {} for line in info: - address, port = line[:2] if len(line) != 4 and not (len(line) == 5 and line[2] == 'Total'): continue # Skip unexpected lines label = (' '.join(line[2:-1])).rstrip(':') if label not in _apache_status_fields: continue + address, port = line[:2] value = _apache_status_fields[label][1](line[-1]) if port == "None": item = address

6 years, 9 months

5280 FIX rds_licenss: Fixed missing includes

by Simon Betz

Module: check_mk Branch: master Commit: 33f5ce4c3c546ca620bb90a2807817751e13d58e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33f5ce4c3c546c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 10:34:49 2017 +0200 5280 FIX rds_licenss: Fixed missing includes Change-Id: I1a7ad5b9f8f315072319d93dcf9d7f6af7207b68 --- .werks/5280 | 11 +++++++++++ checks/rds_licenses | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/5280 b/.werks/5280 new file mode 100644 index 0000000..63d0ba5 --- /dev/null +++ b/.werks/5280 @@ -0,0 +1,11 @@ +Title: rds_licenss: Fixed missing includes +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505464460 + + diff --git a/checks/rds_licenses b/checks/rds_licenses index a2506ec..7492bac 100644 --- a/checks/rds_licenses +++ b/checks/rds_licenses @@ -86,4 +86,5 @@ check_info['rds_licenses'] = { 'service_description' : "RDS Licenses %s", 'group' : "rds_licenses", 'has_perfdata' : True, + 'includes' : ['license.include'], }

6 years, 9 months

5279 FIX qnap_disks: Just discover slots that are not empty

by Simon Betz

Module: check_mk Branch: master Commit: 9b1f23cf6767553a0267b0a48bb1754917d2751c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b1f23cf676755… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 10:29:28 2017 +0200 5279 FIX qnap_disks: Just discover slots that are not empty Change-Id: Ie9ff602c97255ed4a0fb3a04e2b791a6545d9a38 --- .werks/5279 | 11 +++++++++++ checks/qnap_disks | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5279 b/.werks/5279 new file mode 100644 index 0000000..6d2ca7b --- /dev/null +++ b/.werks/5279 @@ -0,0 +1,11 @@ +Title: qnap_disks: Just discover slots that are not empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505464015 + + diff --git a/checks/qnap_disks b/checks/qnap_disks index c6cc8c0..79bc311 100644 --- a/checks/qnap_disks +++ b/checks/qnap_disks @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def inventory_qnap_disks(info): - return [ (x[0], None) for x in info ] + return [ (x[0], None) for x in info if x[2] != "-5"] def check_qnap_disks(item, _no_params, info): for desc, temp, status, model, size, cond in info:

6 years, 9 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 7791e5898205d30974e5a7cbff97bbf9fdde5109 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7791e5898205d3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 15 09:48:45 2017 +0200 Reserved 20 Werk IDS Change-Id: Icd1808abf74c9d3cf3ebec22349618e6eb83cc65 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8d3ce56..4bb9d50 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5278 +5298

6 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017