Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#2976 eltek_battery, eltek_battery.temp, eltek_battery.supply, eltek_fans, eltek_outdoor_temp, eltek_systemstatus: new checks for a Eltek Valere USV

by Simon Betz

Module: check_mk Branch: master Commit: b598151bdc26a9055328af11920a292d6e1a2ee3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b598151bdc26a9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 5 10:49:00 2016 +0100 #2976 eltek_battery, eltek_battery.temp, eltek_battery.supply, eltek_fans, eltek_outdoor_temp, eltek_systemstatus: new checks for a Eltek Valere USV --- .werks/2976 | 9 +++ ChangeLog | 1 + checkman/eltek_battery | 17 +++++ checkman/eltek_battery.supply | 18 +++++ checkman/eltek_battery.temp | 18 +++++ checkman/eltek_fans | 18 +++++ checkman/eltek_outdoor_temp | 18 +++++ checkman/eltek_systemstatus | 22 ++++++ checks/eltek_battery | 154 +++++++++++++++++++++++++++++++++++++++++ checks/eltek_fans | 128 ++++++++++++++++++++++++++++++++++ checks/eltek_outdoor_temp | 108 +++++++++++++++++++++++++++++ checks/eltek_systemstatus | 52 ++++++++++++++ 12 files changed, 563 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b598151bdc…

8 years, 7 months

Fixed misspelled name.

by Sven Panne

Module: check_mk Branch: master Commit: cabd720f3fb5b864c67d1e5ef23f56685e67e406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cabd720f3fb5b8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 5 08:11:32 2016 +0100 Fixed misspelled name. --- livestatus/src/LogEntry.cc | 12 ++++++------ livestatus/src/strutil.cc | 2 +- livestatus/src/strutil.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index aaf5b4d..f889d38 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -124,9 +124,9 @@ bool LogEntry::handleStatusEntry() { scan++; _host_name = next_token(&scan, ';'); - _state = hostStateToInt(save_next_token(&scan, ';')); + _state = hostStateToInt(safe_next_token(&scan, ';')); _state_type = next_token(&scan, ';'); - _attempt = atoi(save_next_token(&scan, ';')); + _attempt = atoi(safe_next_token(&scan, ';')); _check_output = next_token(&scan, ';'); return true; } @@ -188,9 +188,9 @@ bool LogEntry::handleStatusEntry() { _host_name = next_token(&scan, ';'); _svc_desc = next_token(&scan, ';'); - _state = serviceStateToInt(save_next_token(&scan, ';')); + _state = serviceStateToInt(safe_next_token(&scan, ';')); _state_type = next_token(&scan, ';'); - _attempt = atoi(save_next_token(&scan, ';')); + _attempt = atoi(safe_next_token(&scan, ';')); _check_output = next_token(&scan, ';'); return true; } @@ -270,7 +270,7 @@ bool LogEntry::handleNotificationEntry() { _svc_desc = next_token(&scan, ';'); } - _state_type = save_next_token(&scan, ';'); + _state_type = safe_next_token(&scan, ';'); _command_name = next_token(&scan, ';'); if (svc) { @@ -312,7 +312,7 @@ bool LogEntry::handlePassiveCheckEntry() { if (svc) { _svc_desc = next_token(&scan, ';'); } - _state = atoi(save_next_token(&scan, ';')); + _state = atoi(safe_next_token(&scan, ';')); _check_output = next_token(&scan, ';'); return true; } diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index 9ca1c2e..60a2a0e 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -90,7 +90,7 @@ char *next_token(char **c, char delim) { /* same as next_token() but returns "" instead of 0 if no tokens has been found */ -const char *save_next_token(char **c, char delim) { +const char *safe_next_token(char **c, char delim) { if (*c == nullptr) { return ""; } diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index c68e7f2..0abcc75 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -35,7 +35,7 @@ char *rstrip(char *); char *lstrip(char *); int ends_with(const char *a, const char *b); char *next_token(char **c, char delim); -const char *save_next_token(char **c, char delim); +const char *safe_next_token(char **c, char delim); char *next_field(char **c); #ifdef __cplusplus

8 years, 7 months

Nitpick: Make Makefile target names more consistent.

by Sven Panne

Module: check_mk Branch: master Commit: a7107e85e817d3e383020e792affc9c2f3f20ec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7107e85e817d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 5 07:59:34 2016 +0100 Nitpick: Make Makefile target names more consistent. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f35e1a5..cb9d6f3 100644 --- a/Makefile +++ b/Makefile @@ -70,10 +70,10 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix livestatus/src/mk,*.cc *.c *.h)) \ $(wildcard $(addprefix mkeventd/src/,*.cc *.c *.h)) -.PHONY: all check-binaries check check-permissions check-spaces check-version \ - clang-analyzer clang-tidy clean cppcheck dist documentation format \ - headers healspaces help iwyu minify-js mk-eventd mk-livestatus \ - mrproper optimize-images packages setup setversion version +.PHONY: all analyze check check-binaries check-permissions check-spaces \ + check-version clean cppcheck dist documentation format headers \ + healspaces help iwyu minify-js mk-eventd mk-livestatus mrproper \ + optimize-images packages setup setversion tidy version all: dist packages @@ -263,7 +263,7 @@ compile_commands.json: $(FILES_TO_FORMAT) $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 -clang-tidy: compile_commands.json +tidy: compile_commands.json ./compiled_sources | xargs $(CLANG_TIDY) # Not really perfect rules, but better than nothing @@ -272,7 +272,7 @@ iwyu: $(MAKE) -C livestatus CC=$(IWYU) CXX=$(IWYU) -k # Not really perfect rules, but better than nothing -clang-analyzer: +analyze: $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE)

8 years, 7 months

More range-based for loops.

by Sven Panne

Module: check_mk Branch: master Commit: 05f7075cc30b3b21aa9278488bf08a1e621df7b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05f7075cc30b3b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 5 09:23:56 2016 +0100 More range-based for loops. --- livestatus/src/DownCommColumn.cc | 14 ++++---- livestatus/src/PerfdataAggregator.cc | 27 +++++++------- livestatus/src/Query.cc | 16 +++++---- livestatus/src/TableDownComm.cc | 5 ++- livestatus/src/TableDownComm.h | 4 +-- livestatus/src/TableStateHistory.cc | 65 ++++++++++++---------------------- 6 files changed, 57 insertions(+), 74 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=05f7075cc3…

8 years, 7 months

#2975 mk_jolokia: now supports HTTPS

by Simon Betz

Module: check_mk Branch: master Commit: 03c4b97901efb4ddd52d9522360ea40ae0941ee0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03c4b97901efb4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 5 09:08:51 2016 +0100 #2975 mk_jolokia: now supports HTTPS --- .werks/2975 | 9 +++++ ChangeLog | 1 + agents/cfg_examples/jolokia.cfg | 2 + agents/plugins/mk_jolokia | 84 ++++++++++++++++++++------------------- 4 files changed, 55 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=03c4b97901…

8 years, 7 months

Updated bug entries #0857

by Mathias Kettner

Module: check_mk Branch: master Commit: c7d86e2ea1d45bfac94baf8c292f8dc5f17f50b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7d86e2ea1d45b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 08:51:30 2016 +0100 Updated bug entries #0857 --- .bugs/857 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/857 b/.bugs/857 index f2b24d6..c062bbd 100644 --- a/.bugs/857 +++ b/.bugs/857 @@ -2,7 +2,7 @@ Title: Clusterservices stay pending until cmk -R Component: core State: open Date: 2016-02-05 08:45:11 -Targetversion: 1.2.7 +Targetversion: 1.2.8 Class: bug Hallo, nur zur INFO

8 years, 7 months

#2930 FIX juniper_cpu_util: Better detection, find more devices

by Mathias Kettner

Module: check_mk Branch: master Commit: 527232d4b27be1764b526ab366e24a90532f344e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527232d4b27be1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 08:44:06 2016 +0100 #2930 FIX juniper_cpu_util: Better detection, find more devices We now look for <tt>Routing Enginge</tt> not only at the beginning, but also in the middle of the text. --- .werks/2930 | 10 ++++++++++ ChangeLog | 1 + checks/juniper_cpu_util | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2930 b/.werks/2930 new file mode 100644 index 0000000..b121feb --- /dev/null +++ b/.werks/2930 @@ -0,0 +1,10 @@ +Title: juniper_cpu_util: Better detection, find more devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454658210 +Class: fix + +We now look for <tt>Routing Enginge</tt> not only at the beginning, but also +in the middle of the text. diff --git a/ChangeLog b/ChangeLog index 7b4abbf..1d67a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -248,6 +248,7 @@ * 3066 FIX: windows agent: 32-bit performance counters were not returned correctly * 3068 FIX: ps: added performance graphs for process handle count (windows only) * 3069 FIX: unitrend_backup: fixed broken plugin output + * 2930 FIX: juniper_cpu_util: Better detection, find more devices... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index 8f43e5e..32b1a52 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -32,9 +32,10 @@ factory_settings['juniper_cpu_util_default_levels'] = { def inventory_juniper_cpu_util(info): for line in info: - if line[0].startswith("Routing Engine"): + if "Routing Engine" in line[0]: yield line[0], {} + def check_juniper_cpu_util(item, params, info): for name, util in info: if name == item:

8 years, 7 months

Updated bug entries #0857

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4a7e9136aa67c93facb8bc19779df822491679f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a7e9136aa67c9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Feb 5 08:46:11 2016 +0100 Updated bug entries #0857 --- .bugs/857 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/857 b/.bugs/857 new file mode 100644 index 0000000..f2b24d6 --- /dev/null +++ b/.bugs/857 @@ -0,0 +1,16 @@ +Title: Clusterservices stay pending until cmk -R +Component: core +State: open +Date: 2016-02-05 08:45:11 +Targetversion: 1.2.7 +Class: bug + +Hallo, nur zur INFO + +bei Version 2016.02.02 werden Clusterservices mit „Activate Changes“ oder/und „Restart“ von WATO aus nicht aktiv, + +bleiben immer in Pending Status, + +ein cmk –R auf der Commandline behebt das Problem allerdings + +Gruß H.

8 years, 7 months

Some clang-tidy aftermath for cmc.

by Sven Panne

Module: check_mk Branch: master Commit: 7175f07842bb933b644b3506d740eb2cb6ed0e0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7175f07842bb93… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 4 16:18:23 2016 +0100 Some clang-tidy aftermath for cmc. There are lots of code paths in check_mk which are only visible in cmc. We should really change to git submodules plus subclassing... :-/ --- livestatus/src/AttributelistColumn.cc | 4 +++- livestatus/src/DownCommColumn.cc | 5 ++--- livestatus/src/Logfile.cc | 13 ++++++------- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableStateHistory.cc | 7 ++++--- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/livestatus/src/AttributelistColumn.cc b/livestatus/src/AttributelistColumn.cc index 7fa403b..2d060f1 100644 --- a/livestatus/src/AttributelistColumn.cc +++ b/livestatus/src/AttributelistColumn.cc @@ -67,8 +67,10 @@ unsigned long AttributelistColumn::getValue(void *data) { return 0; } +// TODO(sp) Why on earth do we have different types here? #ifdef CMC - return *(uint16_t *)((char *)data + _offset); + return *reinterpret_cast<uint16_t *>(reinterpret_cast<char *>(data) + + _offset); #else return *reinterpret_cast<unsigned long *>(reinterpret_cast<char *>(data) + _offset); diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index c13e637..11a1146 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -93,9 +93,8 @@ void DownCommColumn::output(void *data, Query *query) { } void *DownCommColumn::getNagiosObject(char *name) { - unsigned long id = strtoul(name, nullptr, 10); - return reinterpret_cast<void *>( - static_cast<uintptr_t>(id)); // Hack. Convert number into pointer. + // Hack. Convert number into pointer. + return static_cast<char *>(nullptr) + strtoul(name, nullptr, 10); } bool DownCommColumn::isNagiosMember(void *data, void *member) { diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 31bf813..51ea0b4 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -47,9 +47,8 @@ using std::make_pair; extern unsigned long g_max_lines_per_logfile; // TODO(sp): We need the suppression pragma below because _readpos and -// _linebuffer -// is not initialized in the constructor. Just replace all this manual fiddling -// with pointers, offsets, etc. with vector. +// _linebuffer is not initialized in the constructor. Just replace all this +// manual fiddling with pointers, offsets, etc. with vector. // cppcheck-suppress uninitMemberVar Logfile::Logfile(const char *path, bool watch) @@ -58,7 +57,7 @@ Logfile::Logfile(const char *path, bool watch) , _watch(watch) , _lineno(0) #ifdef CMC - , _world(0) + , _world(nullptr) #endif , _logclasses_read(0) { int fd = open(path, O_RDONLY); @@ -277,9 +276,9 @@ void Logfile::updateReferences() { // active configuration world, then update all references if (_world != g_live_world) { unsigned num = 0; - for (logfile_entries_t::iterator it = _entries.begin(); - it != _entries.end(); ++it) - num += it->second->updateReferences(); + for (auto &entry : _entries) { + num += entry.second->updateReferences(); + } logger(LOG_NOTICE, "Updated %u log cache references of %s to new world.", num, _path); diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 7547fbe..5124a39 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -228,7 +228,7 @@ bool TableLog::isAuthorized(contact *ctc, void *data) { host *hst = entry->_host; if ((hst != nullptr) || (svc != nullptr)) { - return is_authorized_for(ctc, hst, svc) != 0; + return static_cast<int>(is_authorized_for(ctc, hst, svc)) != 0; // suppress entries for messages that belong to // hosts that do not exist anymore. } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 2984171..f8cf455 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -476,8 +476,9 @@ void TableStateHistory::answerQuery(Query *query) { state->_service = entry->_service; #ifdef CMC state->_host_name = entry->_host->_name; - state->_service_description = - entry->_service != 0 ? entry->_service->_name : ""; + state->_service_description = entry->_service != nullptr + ? entry->_service->_name + : ""; #else state->_host_name = entry->_host->name; state->_service_description = @@ -993,7 +994,7 @@ bool TableStateHistory::isAuthorized(contact *ctc, void *data) { host *hst = entry->_host; if ((hst != nullptr) || (svc != nullptr)) { - return is_authorized_for(ctc, hst, svc) != 0; + return static_cast<int>(is_authorized_for(ctc, hst, svc)) != 0; } return false; }

8 years, 7 months

windows agent: fixed typo in mk_inventory.ps1 script

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8db536cd23afb9add87b9e51bb70312ed1426a64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db536cd23afb9… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 4 13:59:49 2016 +0100 windows agent: fixed typo in mk_inventory.ps1 script --- agents/windows/plugins/deprecated/mk_inventory.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/deprecated/mk_inventory.ps1 b/agents/windows/plugins/deprecated/mk_inventory.ps1 index c14e6d5..a1d5fdb 100644 --- a/agents/windows/plugins/deprecated/mk_inventory.ps1 +++ b/agents/windows/plugins/deprecated/mk_inventory.ps1 @@ -94,7 +94,7 @@ foreach ($item in $exe_paths) { if ((Test-Path $item -pathType container)) { - Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length, $_.VersionInfo.FileDescription, $_.VersionInfo.ProduktVersion, $_.VersionInfo.ProduktName } + Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length, $_.VersionInfo.FileDescription, $_.VersionInfo.ProductVersion, $_.VersionInfo.ProductName } } }

8 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016