Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

3559 WATO API: now able to bake agents with the new action "bake_agents"

by Andreas Boesl

Module: check_mk Branch: master Commit: 2373496ec5622ef938ce2ba91913eb23b17f32be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2373496ec5622e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 9 10:32:52 2016 +0200 3559 WATO API: now able to bake agents with the new action "bake_agents" --- .werks/3559 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/3559 b/.werks/3559 new file mode 100644 index 0000000..4132687 --- /dev/null +++ b/.werks/3559 @@ -0,0 +1,9 @@ +Title: WATO API: now able to bake agents with the new action "bake_agents" +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1470731511 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 24fa2fc..05ceab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -446,6 +446,7 @@ * 3667 Search expressions in host search can now be given as regexes... * 3724 Password input fields: Added note about plain text storing (if done so) * 3728 Automatically creating automation user for Check_MK internal use with WATO default config... + * 3559 WATO API: now able to bake agents with the new action "bake_agents" * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery...

8 years, 1 month

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: fa87ed9ff3d7eb6448f31ec899debbff2ce6b66f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa87ed9ff3d7eb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 10:15:24 2016 +0200 Removed dead code. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index f69d1ad..4602aa1 100644 --- a/Makefile +++ b/Makefile @@ -164,9 +164,6 @@ mk-livestatus: $(addprefix livestatus/,$(LIVESTATUS_AUTO)) rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) cd livestatus ; tar cf - $(LIVESTATUS_SOURCES) | tar xf - -C ../mk-livestatus-$(VERSION) - if [ -f livestatus/compile ]; then \ - cp -p livestatus/compile mk-livestatus-$(VERSION)/ ; \ - fi mkdir -p mk-livestatus-$(VERSION)/nagios cp livestatus/nagios/*.h mk-livestatus-$(VERSION)/nagios/ mkdir -p mk-livestatus-$(VERSION)/nagios4

8 years, 1 month

Improved ignorance.

by Sven Panne

Module: check_mk Branch: master Commit: 5d410b8c82784a84854be33f96a276e43bd932b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d410b8c82784a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 09:49:00 2016 +0200 Improved ignorance. --- livestatus/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/.gitignore b/livestatus/.gitignore index 4d7a84c..bea5068 100644 --- a/livestatus/.gitignore +++ b/livestatus/.gitignore @@ -1,4 +1,5 @@ aclocal.m4 +ar-lib autom4te.cache/ compile config.h @@ -9,13 +10,16 @@ configure .cproject cscope.files Debug +depcomp GPATH GRTAGS GSYMS GTAGS ID +install-sh Makefile Makefile.in +missing .project stamp-h1 tags

8 years, 1 month

Added missing dependency.

by Sven Panne

Module: check_mk Branch: master Commit: 4ee14992165d1eb00fb18253d37b09f891dffaa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ee14992165d1e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 09:47:39 2016 +0200 Added missing dependency. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 204b8f7..f69d1ad 100644 --- a/Makefile +++ b/Makefile @@ -269,7 +269,7 @@ setup: $(addprefix %/,$(LIVESTATUS_AUTO)): $(addprefix %/,configure.ac m4/* Makefile.am src/Makefile.am) cd livestatus && autoreconf --install --include=m4 -livestatus/config.h: livestatus/config.h.in +livestatus/config.h: livestatus/configure livestatus/config.h.in cd livestatus && ./configure CXXFLAGS="$(CXX_FLAGS)" GTAGS: livestatus/config.h

8 years, 1 month

Added a few missing dependencies to the toplevel Makefile. Nuked generated files.

by Sven Panne

Module: check_mk Branch: master Commit: c82c5cd64d43b91f969fce6cc75bf2453c6bafa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c82c5cd64d43b9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 9 09:30:14 2016 +0200 Added a few missing dependencies to the toplevel Makefile. Nuked generated files. --- Makefile | 32 +- livestatus/.f12 | 17 +- livestatus/ar-lib | 270 ----------------- livestatus/depcomp | 791 ------------------------------------------------- livestatus/install-sh | 501 ------------------------------- livestatus/missing | 215 -------------- 6 files changed, 13 insertions(+), 1813 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c82c5cd64d…

8 years, 1 month

clang-formatted.

by Sven Panne

Module: check_mk Branch: master Commit: e030a0cec5ea949a940712e3bff76fb6c179e1c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e030a0cec5ea94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 8 16:38:54 2016 +0200 clang-formatted. --- livestatus/src/TableStateHistory.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 3b30245..4a5cf4e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -88,7 +88,8 @@ TableStateHistory::TableStateHistory(LogCache *log_cache, #ifdef CMC const Notes &downtimes_holder, const Notes &comments_holder, - std::recursive_mutex &holder_lock, Core *core + std::recursive_mutex &holder_lock, + Core *core #else const DowntimesOrComments &downtimes_holder,

8 years, 1 month

Various C => C++ tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: 7a59718589d6cc67fc29a91d732bcefdac3d5b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a59718589d6cc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 8 16:38:16 2016 +0200 Various C => C++ tweaks. --- Makefile | 8 ++++---- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/auth.h | 2 -- livestatus/src/store_c.h | 10 +--------- livestatus/src/strutil.h | 11 ----------- livestatus/src/waittriggers.h | 29 +++++++++-------------------- 6 files changed, 15 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index a511880..fa6b683 100644 --- a/Makefile +++ b/Makefile @@ -47,12 +47,12 @@ BEAR := bear 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 m4/* nagios4/*.h \ - src/*.{h,c,cc} src/Makefile.{in,am} \ + src/*.{h,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/* # Files that are checked for trailing spaces HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*.{cc,c,h} \ + $$(find -name Makefile) livestatus/src/*.{cc,h} \ agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ @@ -66,8 +66,8 @@ HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.c *.h)) \ - $(wildcard $(addprefix livestatus/api/c++/,*.cc *.c *.h)) \ - $(wildcard $(addprefix livestatus/src/,*.cc *.c *.h)) \ + $(wildcard $(addprefix livestatus/api/c++/,*.cc *.h)) \ + $(wildcard $(addprefix livestatus/src/,*.cc *.h)) \ $(wildcard $(addprefix bin/,*.cc *.c *.h)) .PHONY: all analyze check check-binaries check-permissions check-spaces \ diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 03ed5f8..3b30245 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -88,7 +88,7 @@ TableStateHistory::TableStateHistory(LogCache *log_cache, #ifdef CMC const Notes &downtimes_holder, const Notes &comments_holder, - recursive_mutex &holder_lock, Core *core + std::recursive_mutex &holder_lock, Core *core #else const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 4070d94..5481086 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -37,8 +37,6 @@ extern int g_service_authorization; extern int g_group_authorization; -#ifdef __cplusplus bool is_authorized_for(contact *ctc, host *hst, service *svc); -#endif #endif // auth_h diff --git a/livestatus/src/store_c.h b/livestatus/src/store_c.h index ed2e24e..14709fe 100644 --- a/livestatus/src/store_c.h +++ b/livestatus/src/store_c.h @@ -29,10 +29,6 @@ #include <time.h> #include "nagios.h" -#ifdef __cplusplus -extern "C" { -#endif - void store_init(); void store_deinit(); void store_register_comment(nebstruct_comment_data *); @@ -50,8 +46,4 @@ void update_timeperiods_cache(time_t); void log_timeperiods_cache(); host *getHostByDesignation(const char *designation); -#ifdef __cplusplus -} -#endif - -#endif /* store_c_h */ +#endif // store_c_h diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index 2a0b70f..a65ea7d 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -26,13 +26,6 @@ #define strutil_h #include "config.h" // IWYU pragma: keep -#ifndef __cplusplus -#include <stdbool.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif char *rstrip(char *); char *lstrip(char *); @@ -41,8 +34,4 @@ char *next_token(char **c, char delim); const char *safe_next_token(char **c, char delim); char *next_field(char **c); -#ifdef __cplusplus -} -#endif - #endif // strutil_h diff --git a/livestatus/src/waittriggers.h b/livestatus/src/waittriggers.h index f6f0adb..83f2171 100644 --- a/livestatus/src/waittriggers.h +++ b/livestatus/src/waittriggers.h @@ -27,27 +27,20 @@ #include "config.h" // IWYU pragma: keep -#ifdef __cplusplus -extern "C" { -#endif - -struct timespec; - // This is basically a C++ class for triggers done the "C way" via an opaque // struct, explicit passing of 'this' and using a prefix for names. - struct trigger; -struct trigger *trigger_all(); -struct trigger *trigger_check(); -struct trigger *trigger_state(); -struct trigger *trigger_log(); -struct trigger *trigger_downtime(); -struct trigger *trigger_comment(); -struct trigger *trigger_command(); -struct trigger *trigger_program(); +trigger *trigger_all(); +trigger *trigger_check(); +trigger *trigger_state(); +trigger *trigger_log(); +trigger *trigger_downtime(); +trigger *trigger_comment(); +trigger *trigger_command(); +trigger *trigger_program(); -struct trigger *trigger_find(const char *name); +trigger *trigger_find(const char *name); const char *trigger_all_names(); void trigger_notify_all(struct trigger *which); @@ -55,8 +48,4 @@ void trigger_notify_all(struct trigger *which); void trigger_wait(struct trigger *which); int trigger_wait_for(struct trigger *which, unsigned ms); -#ifdef __cplusplus -} -#endif - #endif // waittriggers_h

8 years, 1 month

clang-tidy-3.9 cleanups.

by Sven Panne

Module: check_mk Branch: master Commit: 8d66d704f41fb1fdd37e425a7532b6410b5f41f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d66d704f41fb1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 8 15:36:43 2016 +0200 clang-tidy-3.9 cleanups. --- Makefile | 2 +- agents/windows/Configurable.h | 5 +++-- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/Store.cc | 5 +---- livestatus/src/Store.h | 2 +- livestatus/src/TableServices.cc | 4 ++-- livestatus/src/TableServices.h | 4 ++-- livestatus/src/TableStateHistory.cc | 1 - livestatus/src/logger.cc | 10 +++++----- livestatus/src/module.cc | 12 ++++++------ livestatus/src/unixcat.cc | 12 ++++++------ 11 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index a34081b..a511880 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 C_CXX_FLAGS := -g -O3 -Wall -Wextra -CLANG_VERSION := 3.8 +CLANG_VERSION := 3.9 CLANG_FORMAT := clang-format-$(CLANG_VERSION) CLANG_TIDY := clang-tidy-$(CLANG_VERSION) SCAN_BUILD := scan-build-$(CLANG_VERSION) diff --git a/agents/windows/Configurable.h b/agents/windows/Configurable.h index f31cd87..0e84337 100644 --- a/agents/windows/Configurable.h +++ b/agents/windows/Configurable.h @@ -105,8 +105,9 @@ public: // only valid with a grouping adder. it's important to understand that // for template-instantiations where they aren't used so even though // they wouldn't compile with non-grouping adders, this is not a // problem. (google SFINAE) - void setGroupFunction(typename AddMode::PriorityAppendGrouped< - ContainerT>::GroupFunction function) { + void setGroupFunction( + typename AddMode::PriorityAppendGrouped<ContainerT>::GroupFunction + function) { _add_mode.setGroupFunction(function); } diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index 92ce5e4..fe565fa 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -42,7 +42,7 @@ string OffsetStringMacroColumn::valueAsString(void *row, service *svc = getService(row); // search for macro names, beginning with $ - string result = ""; + string result; const char *scan = raw.c_str(); while (*scan != 0) { diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 5e52130..b944181 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -45,11 +45,8 @@ using std::chrono::microseconds; using std::chrono::system_clock; using std::list; using std::lock_guard; -using std::make_pair; using std::mutex; -using std::pair; using std::string; -using std::to_string; Store::Store() : _log_cache(_commands_holder, g_max_cached_messages) @@ -93,7 +90,7 @@ void Store::addTable(Table *table) { _table_columns.addTable(table); } -Table *Store::findTable(string name) { +Table *Store::findTable(const string &name) { auto it = _tables.find(name); if (it == _tables.end()) { return nullptr; diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index fec255f..1d6f7d6 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -98,7 +98,7 @@ private: std::mutex _command_mutex; void addTable(Table *table); - Table *findTable(std::string name); + Table *findTable(const std::string &name); void answerGetRequest(const std::list<std::string> &lines, OutputBuffer *, const char *); void answerCommandRequest(const char *); diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 3c514b1..4e4df23 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -62,8 +62,8 @@ string TableServices::name() const { return "services"; } string TableServices::namePrefix() const { return "service_"; } // static -void TableServices::addColumns(Table *table, string prefix, int indirect_offset, - bool add_hosts, +void TableServices::addColumns(Table *table, const string &prefix, + int indirect_offset, bool add_hosts, const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder) { // Es fehlen noch: double-Spalten, unsigned long spalten, etliche weniger diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h index d0752f1..94db97b 100644 --- a/livestatus/src/TableServices.h +++ b/livestatus/src/TableServices.h @@ -51,8 +51,8 @@ public: #else TableServices(const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder); - static void addColumns(Table *, std::string prefix, int indirect_offset, - bool add_hosts, + static void addColumns(Table *, const std::string &prefix, + int indirect_offset, bool add_hosts, const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder); #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index f44a4f1..03ed5f8 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -67,7 +67,6 @@ using std::lock_guard; using std::make_pair; using std::map; using std::mutex; -using std::recursive_mutex; using std::set; using std::string; diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index d987885..5e4f5be 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -26,12 +26,12 @@ #define _XOPEN_SOURCE 500 #include "logger.h" -#include <errno.h> #include <pthread.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <time.h> +#include <cerrno> +#include <cstdarg> +#include <cstdio> +#include <cstring> +#include <ctime> #include "nagios.h" extern char g_logfile_path[]; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 7815747..3e2fd24 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -27,22 +27,22 @@ // IWYU pragma: no_include <bits/socket_type.h> #include "config.h" -#include <errno.h> #include <fcntl.h> #include <pthread.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/select.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> // IWYU pragma: keep #include <sys/un.h> -#include <time.h> #include <unistd.h> +#include <cerrno> +#include <cstddef> #include <cstdint> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #include "auth.h" #include "data_encoding.h" #include "global_counters.h" diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index f60842d..2ec7701 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -23,13 +23,7 @@ // Boston, MA 02110-1301 USA. // IWYU pragma: no_include <bits/socket_type.h> -#include <errno.h> #include <pthread.h> -#include <signal.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/select.h> #include <sys/socket.h> #include <sys/stat.h> @@ -37,7 +31,13 @@ #include <sys/types.h> // IWYU pragma: keep #include <sys/un.h> #include <unistd.h> +#include <cerrno> #include <cinttypes> +#include <csignal> +#include <cstdint> +#include <cstdio> +#include <cstdlib> +#include <cstring> int copy_data(int from, int to); void *voidp;

8 years, 1 month

Modernize C++ stuff.

by Sven Panne

Module: check_mk Branch: master Commit: 4ba51d6b96449613b4bd8e007a1c2f5669eca487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ba51d6b964496… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 8 14:49:27 2016 +0200 Modernize C++ stuff. --- livestatus/src/global_counters.cc | 7 +- livestatus/src/logger.cc | 14 +-- livestatus/src/module.cc | 172 +++++++++++++++++++------------------ livestatus/src/unixcat.cc | 25 +++--- 4 files changed, 112 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4ba51d6b96…

8 years, 1 month

IWYU.

by Sven Panne

Module: check_mk Branch: master Commit: 91a94f0eb76dd578d2e900b4d1fc2e4d62093c5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a94f0eb76dd5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 8 14:18:50 2016 +0200 IWYU. --- livestatus/src/GlobalCountersColumn.cc | 1 + livestatus/src/module.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/livestatus/src/GlobalCountersColumn.cc b/livestatus/src/GlobalCountersColumn.cc index cf13985..bd6118b 100644 --- a/livestatus/src/GlobalCountersColumn.cc +++ b/livestatus/src/GlobalCountersColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "GlobalCountersColumn.h" +#include <cstdint> #include "Renderer.h" #include "global_counters.h" diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index bfed2d4..7fef5cc 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -42,6 +42,7 @@ #include <sys/un.h> #include <time.h> #include <unistd.h> +#include <cstdint> #include "auth.h" #include "data_encoding.h" #include "global_counters.h"

8 years, 1 month

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016