Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 35dc0c98e1891cd6a909e12f46aad46d77bb98d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35dc0c98e1891c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 4 10:41:52 2016 +0200 Ship m4 macros, too. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6ecd9a..cbea246 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ BEAR := bear-fixed # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ configure.ac ltmain.sh Makefile.{in,am} missing ar-lib \ - nagios/README nagios/*.h nagios4/README nagios4/*.h \ + nagios/README nagios/*.h nagios4/README m4/* nagios4/*.h \ src/*.{h,c,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/*

8 years, 2 months

3432 oracle_tablespaces: now autoextend can be ignored

by Simon Betz

Module: check_mk Branch: master Commit: e7d027929b63cdd2deaab3468c18e832f0e94796 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7d027929b63cd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 4 10:32:34 2016 +0200 3432 oracle_tablespaces: now autoextend can be ignored --- .werks/3432 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3432 b/.werks/3432 new file mode 100644 index 0000000..853b3b3 --- /dev/null +++ b/.werks/3432 @@ -0,0 +1,9 @@ +Title: oracle_tablespaces: now autoextend can be ignored +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1462350642 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0ee62cc..cd39cc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 3446 mssql_version: Outputs info about cluster state and cluster name * 3128 mem.win: graphs now display the available memory * 3431 netextreme_cpu_util: new check which monitors the CPU utilization of a Extreme Networks Switch which supports the EXTREME-MIB + * 3432 oracle_tablespaces: now autoextend can be ignored * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 06001e7..bf61c59 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5843,8 +5843,9 @@ register_check_parameters( DropdownChoice( title = _("Expected autoextend setting"), choices = [ - ( True, _("Autoextend is expected to be ON")), + ( True, _("Autoextend is expected to be ON")), ( False, _("Autoextend is expected to be OFF")), + ( None, _("Autoextend will be ignored")), ] )), ( "autoextend_severity",

8 years, 2 months

Fix for automake < 1.13.

by Sven Panne

Module: check_mk Branch: master Commit: c9e11d12ef0c16ab068d5c121d9962d8110a8779 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9e11d12ef0c16… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 4 09:54:25 2016 +0200 Fix for automake < 1.13. --- Makefile | 2 +- livestatus/.f12 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2afca01..e6ecd9a 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,7 @@ mk-livestatus: cd livestatus ; \ for i in aclocal.m4 ar-lib compile config.h.in configure depcomp install-sh Makefile.in missing; do \ if test ! -f $$i; then \ - autoreconf --install ; \ + autoreconf --install --include=m4; \ break ; \ fi \ done diff --git a/livestatus/.f12 b/livestatus/.f12 index 54c9ce8..7031e70 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -7,7 +7,7 @@ set -e for i in aclocal.m4 ar-lib compile config.h.in configure depcomp install-sh Makefile.in missing; do if test ! -f $i; then - autoreconf --install + autoreconf --install --include=m4 break fi done

8 years, 2 months

gitbug 2408

by Sebastian Herbord

Module: check_mk Branch: master Commit: c373bfbed6fb57e41d20e1fa86e0a07b1d14c822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c373bfbed6fb57… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed May 4 09:29:58 2016 +0200 gitbug 2408 --- .bugs/2408 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2408 b/.bugs/2408 new file mode 100644 index 0000000..8d328ab --- /dev/null +++ b/.bugs/2408 @@ -0,0 +1,10 @@ +Title: linux agent: make MK_CONFDIR available to outside tools +Component: checks +State: open +Date: 2016-05-04 09:24:02 +Targetversion: 1.2.9 +Class: bug + +Currently, the user can set the MK_CONFDIR through the agent bakery, but this will only affect the agent itself and the plugins started by it. +Other tools that require this path, i.e. the cmk_update-agent when run directly (for registration) will use the fallback path. We need to provide a way for such scripts to use the correct MK_CONFDIR value. +One solution could be to change the agent in such a way that it can be "source"d without executing any of its logic. This way a script can source the agent to get all the parameters as used by the agent. Alternatively the agent could accept a parameter "--variables" that make it output such variables and then quit. Tools would then have to parse that output, but it would be easier to use in non-bash languages.

8 years, 2 months

gitbug 2407

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1d32a8f1487d239e06706d4210478e977d11c047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d32a8f1487d23… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed May 4 09:15:10 2016 +0200 gitbug 2407 --- .bugs/2407 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2407 b/.bugs/2407 new file mode 100644 index 0000000..9947be2 --- /dev/null +++ b/.bugs/2407 @@ -0,0 +1,9 @@ +Title: Windows Agent: When overwriting a file (esp. state files) use an intermediate file to prevent data loss +Component: checks +State: open +Date: 2016-05-04 09:08:21 +Targetversion: 1.2.9 +Class: nastiness + +Currently, while the agent writes to file, that file is in an inconsistent state and should the agent be killed or crashes in just that moment, or if the data being written is broken/incomplete, we have data loss. +Instead, we should write to an intermediate file first and only after a successful write, exchange the two filesmoving the old file away, moving the new file in and only then delete the old file.

8 years, 2 months

Added autoconf magic for C99/C++14/libc++ detection.

by Sven Panne

Module: check_mk Branch: master Commit: b503b3b2dd489459a7029f14cc958554a83de5da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b503b3b2dd4894… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 3 16:05:44 2016 +0200 Added autoconf magic for C99/C++14/libc++ detection. --- Makefile | 6 +- livestatus/configure.ac | 29 +- livestatus/m4/ax_cxx_compile_stdcxx.m4 | 562 ++++++++++++++++++++++++++++++++ livestatus/src/Makefile.am | 5 +- 4 files changed, 594 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b503b3b2dd…

8 years, 2 months

3129 new view and datasource containing the results of the last periodic discovery check

by Sebastian Herbord

Module: check_mk Branch: master Commit: f5ae5b38b9013b723a4e32e3cf51edb20b4eaa90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5ae5b38b9013b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 3 14:09:45 2016 +0200 3129 new view and datasource containing the results of the last periodic discovery check With this change, the results of the "Check_MK Discovery"-check can now be presented in their own searchable, sortable and filterable view. In addition the check was extended to also include information about services disabled through a rule. This gives users with no access to wato the chance to see that those checks were intentionally suppressed. --- .werks/3129 | 13 +++++++++ ChangeLog | 1 + modules/discovery.py | 4 +++ web/plugins/views/builtin.py | 37 +++++++++++++++++++++++++ web/plugins/views/datasources.py | 57 ++++++++++++++++++++++++++++++++++++++ web/plugins/views/painters.py | 33 ++++++++++++++++++++++ web/plugins/visuals/filters.py | 29 +++++++++++++++++++ web/plugins/visuals/infos.py | 14 ++++++++++ 8 files changed, 188 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f5ae5b38b9…

8 years, 2 months

3462 FIX Fixed ineffective localizations on werk page after language change

by Lars Michelsen

Module: check_mk Branch: master Commit: 47672d9c8a8fdf51172e4d456e602e31a392f789 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47672d9c8a8fdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 3 12:11:14 2016 +0200 3462 FIX Fixed ineffective localizations on werk page after language change --- .werks/3462 | 10 ++ ChangeLog | 1 + web/htdocs/werks.py | 319 ++++++++++++++++++++++++++------------------------- 3 files changed, 175 insertions(+), 155 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47672d9c8a…

8 years, 2 months

C++-ified some code.

by Sven Panne

Module: check_mk Branch: master Commit: d495ae0f4003ead144cc537197999ffac5bf198a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d495ae0f4003ea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 3 11:08:02 2016 +0200 C++-ified some code. * Use C++ strings instead of C strings, removing the need for arbitrary length restrictions and APIs from the 70s. * Use vectors instead of hand-rolled naked arrays. Ask Scott M. for a rationale... ;-) * Compilers don't read comments, and neither do programmers, at least most of the time. So make the ownership of dynamically allocated buffers explicit in their signature. --- livestatus/src/BlobColumn.cc | 12 +++++----- livestatus/src/BlobColumn.h | 4 +++- livestatus/src/HostFileColumn.cc | 45 ++++++++++++++++---------------------- livestatus/src/HostFileColumn.h | 5 +++-- livestatus/src/Query.cc | 10 ++++----- livestatus/src/Query.h | 2 +- 6 files changed, 36 insertions(+), 42 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index d064dcd..1bd0b7e 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -23,14 +23,12 @@ // Boston, MA 02110-1301 USA. #include "BlobColumn.h" -#include <stdlib.h> #include "Query.h" +using std::unique_ptr; +using std::vector; + void BlobColumn::output(void *data, Query *query) { - int size; - char *buffer = getBlob(data, &size); - query->outputBlob(buffer, size); - if (buffer != nullptr) { - free(buffer); - } + unique_ptr<vector<char>> blob = getBlob(data); + query->outputBlob(blob.get()); } diff --git a/livestatus/src/BlobColumn.h b/livestatus/src/BlobColumn.h index 3d9d74e..6a14f1a 100644 --- a/livestatus/src/BlobColumn.h +++ b/livestatus/src/BlobColumn.h @@ -26,7 +26,9 @@ #define BlobColumn_h #include "config.h" // IWYU pragma: keep +#include <memory> #include <string> +#include <vector> #include "Column.h" class Query; @@ -35,7 +37,7 @@ public: BlobColumn(std::string name, std::string description, int indirect_offset, int extra_offset) : Column(name, description, indirect_offset, extra_offset) {} - virtual char *getBlob(void *data, int *size) = 0; + virtual std::unique_ptr<std::vector<char>> getBlob(void *data) = 0; void output(void *, Query *) override; int type() override { return COLTYPE_BLOB; } }; diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index 6aaf547..ff92349 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -23,9 +23,9 @@ // Boston, MA 02110-1301 USA. #include "HostFileColumn.h" +#include <errno.h> #include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> +#include <string.h> #include <unistd.h> #include "logger.h" @@ -35,7 +35,10 @@ #include "nagios.h" #endif +using std::make_unique; using std::string; +using std::unique_ptr; +using std::vector; HostFileColumn::HostFileColumn(string name, string description, const char *base_dir, const char *suffix, @@ -44,10 +47,7 @@ HostFileColumn::HostFileColumn(string name, string description, , _base_dir(base_dir) , _suffix(suffix) {} -// returns a buffer to be freed afterwards!! Return 0 -// in size of a missing file -char *HostFileColumn::getBlob(void *data, int *size) { - *size = 0; +unique_ptr<vector<char>> HostFileColumn::getBlob(void *data) { if (_base_dir[0] == 0) { return nullptr; // Path is not configured } @@ -63,37 +63,30 @@ char *HostFileColumn::getBlob(void *data, int *size) { const char *host_name = static_cast<host *>(data)->name; #endif - char path[4096]; - snprintf(path, sizeof(path), "%s/%s%s", _base_dir.c_str(), host_name, - _suffix.c_str()); - int fd = open(path, O_RDONLY); + string path = _base_dir + "/" + host_name + _suffix; + int fd = open(path.c_str(), O_RDONLY); if (fd < 0) { - logger(LG_WARN, "Requested file %s not existing", path); + logger(LG_WARN, "Cannot open %s: %s", path.c_str(), strerror(errno)); return nullptr; } - *size = lseek(fd, 0, SEEK_END); - if (*size < 0) { + off_t size = lseek(fd, 0, SEEK_END); + if (size < 0) { close(fd); - *size = 0; - logger(LG_WARN, "Cannot seek to end of file %s", path); + logger(LG_WARN, "Cannot seek to end of %s: %s", path.c_str(), + strerror(errno)); return nullptr; } lseek(fd, 0, SEEK_SET); - char *buffer = static_cast<char *>(malloc(*size)); - if (buffer == nullptr) { - close(fd); - return nullptr; - } - - ssize_t read_bytes = read(fd, buffer, *size); + unique_ptr<vector<char>> result = make_unique<vector<char>>(size); + ssize_t read_bytes = read(fd, &(*result)[0], size); close(fd); - if (read_bytes != *size) { - logger(LG_WARN, "Cannot read %d from %s", *size, path); - free(buffer); + if (read_bytes != size) { + logger(LG_WARN, "Cannot read %ld bytes from %s: %s", long(size), + path.c_str(), strerror(errno)); return nullptr; } - return buffer; + return result; } diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index e500e02..9c9910a 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -26,7 +26,9 @@ #define HostFileColumn_h #include "config.h" // IWYU pragma: keep +#include <memory> #include <string> +#include <vector> #include "BlobColumn.h" class HostFileColumn : public BlobColumn { @@ -38,8 +40,7 @@ public: const char *base_dir, const char *suffix, int indirect_offset, int extra_offset = -1); - // returns a buffer to be freed afterwards!! - char *getBlob(void *data, int *size) override; + std::unique_ptr<std::vector<char>> getBlob(void *data) override; }; #endif // HostFileColumn_h diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 8010c29..5ef1847 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1077,16 +1077,16 @@ void Query::outputUnicodeEscape(unsigned value) { _output->addBuffer(buf, 6); } -void Query::outputBlob(const char *buffer, int size) { +void Query::outputBlob(const vector<char> *blob) { if (_output_format != OUTPUT_FORMAT_CSV) { - if (buffer != nullptr) { - outputString(buffer, size); + if (blob != nullptr) { + outputString(&(*blob)[0], blob->size()); } else { outputNull(); } } else { - if (buffer != nullptr) { - _output->addBuffer(buffer, size); + if (blob != nullptr) { + _output->addBuffer(&(*blob)[0], blob->size()); } } } diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index bc17901..2fe2074 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -112,7 +112,7 @@ public: void outputAsciiEscape(char value); void outputUnicodeEscape(unsigned value); void outputString(const char *, int len = -1); - void outputBlob(const char *buffer, int size); + void outputBlob(const std::vector<char> *blob); void outputBeginList(); void outputListSeparator(); void outputEndList();

8 years, 2 months

3527 FIX WATO service discovery: fixed warning with locked hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: 422854522f49f64496235f1d50ffbaf965386a3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=422854522f49f6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 3 10:54:31 2016 +0200 3527 FIX WATO service discovery: fixed warning with locked hosts Starting a single or a bulk discovery on locked hosts no longer raises a warning when WATO tries to modify an attribute concerning a failed service discovery. --- .werks/3527 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 11 ++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/3527 b/.werks/3527 new file mode 100644 index 0000000..d40a00f --- /dev/null +++ b/.werks/3527 @@ -0,0 +1,11 @@ +Title: WATO service discovery: fixed warning with locked hosts +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462265466 + +Starting a single or a bulk discovery on locked hosts no longer raises a warning +when WATO tries to modify an attribute concerning a failed service discovery. diff --git a/ChangeLog b/ChangeLog index d2d405b..589af70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -341,6 +341,7 @@ * 3458 FIX: Bulk edit: Fixed broken unchecking of attributes after complain * 3459 FIX: Bulk edit: Fixed mixup of attributes during consecutive bulk edits * 3461 FIX: Fixed exception in case manpage for non existant check is accessed + * 3527 FIX: WATO service discovery: fixed warning with locked hosts... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3759d12..c0ce104 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2659,8 +2659,13 @@ def mode_inventory(phase, firsttime): if html.var("_refresh"): counts, failed_hosts = check_mk_automation(host.site_id(), "inventory", [ "@scan", "refresh", hostname ]) count_added, count_removed, count_kept, count_new = counts[hostname] + message = _("Refreshed check configuration of host [%s] with %d services") % \ (hostname, count_added) + + if not host.locked(): + host.clear_discovery_failed() + log_pending(LOCALRESTART, hostname, "refresh-autochecks", message) else: @@ -2682,9 +2687,13 @@ def mode_inventory(phase, firsttime): active_checks[(ct, item)] = paramstring check_mk_automation(host.site_id(), "set-autochecks", [hostname], active_checks) - host.clear_discovery_failed() + message = _("Saved check configuration of host [%s] with %d services") % \ (hostname, len(active_checks)) + + if not host.locked(): + host.clear_discovery_failed() + log_pending(LOCALRESTART, hostname, "set-autochecks", message) host.mark_dirty(need_sync=False)

8 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016