Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4123 FIX active check check_sql: changed handling of query results and fixed hostname parameter

by Marcel Schulte

Module: check_mk Branch: master Commit: 42d941fd67f382a306a3e1f82accd14fe61573ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d941fd67f382… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Feb 2 15:16:48 2017 +0100 4123 FIX active check check_sql: changed handling of query results and fixed hostname parameter If the used SQL query results in only one column its value is shown in check output now. Otherwise the second column of the result is used for check output. Also, the hostname parameter has been fixed to prevent erros like this: Error while connecting to database: [2005] Unknown MySQL server host "10.11.12.13" Change-Id: Icb8f3cd8b3c568150b4d8d358892edfc545189ac --- .werks/4123 | 13 +++++++++++++ ChangeLog | 1 + active_checks/check_sql | 7 ++++++- checks/check_sql | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/4123 b/.werks/4123 new file mode 100644 index 0000000..4059b9a --- /dev/null +++ b/.werks/4123 @@ -0,0 +1,13 @@ +Title: active check check_sql: changed handling of query results and fixed hostname parameter +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486044551 +Class: fix + +If the used SQL query results in only one column its value is shown in check output now. Otherwise the second column of the result is used for check output. + +Also, the hostname parameter has been fixed to prevent erros like this: + +Error while connecting to database: [2005] Unknown MySQL server host "10.11.12.13" diff --git a/ChangeLog b/ChangeLog index a999094..86d940d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ NOTE: Please refer to the migration notes! * 4335 FIX: perle check and inventory plugins: some updates and improvements... NOTE: Please refer to the migration notes! + * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/active_checks/check_sql b/active_checks/check_sql index f93a14f..e98e7bd 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -255,7 +255,12 @@ try: sys.exit(3) number = float(result[0]) - text = "%s %s" % (number, str(result[1])) + + # handle case where sql query only results in one column + if len(result) == 1: + text = "%s" % result[0] + else: + text = "%s" % result[1] try: perf = " | performance_data=%s" % str(result[2]) diff --git a/checks/check_sql b/checks/check_sql index b7d2cff..d674672 100644 --- a/checks/check_sql +++ b/checks/check_sql @@ -36,7 +36,7 @@ def check_sql_arguments(params): args = [] - args += [ "--hostname='$HOSTADDRESS$'" ] + args += [ "--hostname=$HOSTADDRESS$" ] args += [ "--dbms=%s" % params["dbms"] ] args += [ "--name=%s" % params["name"] ] args += [ "--user=%s" % params["user"] ]

7 years, 7 months

Fix line wrapping in cmk --help

by Mathias Kettner

Module: check_mk Branch: master Commit: cf5f5783734f26669a3b27d3e23d9e2a5974d769 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5f5783734f26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 2 15:05:52 2017 +0100 Fix line wrapping in cmk --help Change-Id: I838a60cb1f99294a2a3740353e4e92fd738179d3 --- modules/check_mk.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3e165ad..a4bb0cd 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3552,7 +3552,8 @@ NOTES: of hosts. In that case the configuration is generated only for that hosts (useful for debugging). - -U redirects both the output of -S and -H to the file %s + -U redirects both the output of -S and -H to the file + %s and also calls check_mk -C. -D, --dump dumps out the complete configuration and information @@ -3613,14 +3614,16 @@ NOTES: --snmpwalk does a complete snmpwalk for the specified hosts both on the standard MIB and the enterprises MIB and stores the - result in the directory %s. Use the option --oid one or several + result in the directory %s. + Use the option --oid one or several times in order to specify alternative OIDs to walk. You need to specify numeric OIDs. If you want to keep the two standard OIDS .1.3.6.1.2.1 and .1.3.6.1.4.1 then use --extraoid for just adding additional OIDs to walk. --snmptranslate does not contact the host again, but reuses the hosts - walk from the directory %s. You can add further MIBs to the directory + walk from the directory %s. + You can add further MIBs to the directory %s. --scan-parents uses traceroute in order to automatically detect

7 years, 7 months

Merge duplicate TableDowntimes.h

by Sven Panne

Module: check_mk Branch: master Commit: 2b99c6bb22da159e671d5a939c9ac1639f891f20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b99c6bb22da15… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 14:47:32 2017 +0100 Merge duplicate TableDowntimes.h Change-Id: I5d5354a2cb2f6750ec651ec43a61de3121a6ae18 --- livestatus/src/TableDowntimes.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/livestatus/src/TableDowntimes.h b/livestatus/src/TableDowntimes.h index e768cd5..415ae62 100644 --- a/livestatus/src/TableDowntimes.h +++ b/livestatus/src/TableDowntimes.h @@ -28,16 +28,29 @@ #include "config.h" // IWYU pragma: keep #include <string> #include "Table.h" +class Query; + +#ifdef CMC +#include <mutex> +#include "Notes.h" +class Core; +#else #include "nagios.h" class DowntimesOrComments; class MonitoringCore; -class Query; +#endif class TableDowntimes : public Table { public: +#ifdef CMC + TableDowntimes(const Downtimes &downtimes_holder, + const Comments &comments_holder, + std::recursive_mutex &holder_lock, Core *core); +#else TableDowntimes(const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder, MonitoringCore *core); +#endif std::string name() const override; std::string namePrefix() const override; @@ -45,7 +58,12 @@ public: bool isAuthorized(contact *ctc, void *data) override; private: +#ifdef CMC + const Downtimes &_holder; + std::recursive_mutex &_holder_lock; +#else const DowntimesOrComments &_holder; +#endif }; #endif // TableDowntimes_h

7 years, 7 months

Order tables.

by Sven Panne

Module: check_mk Branch: master Commit: 85fa3a06d178320c75391fde50ad265895ac5576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85fa3a06d17832… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 14:01:07 2017 +0100 Order tables. Change-Id: Ia63f67b7ad1bd441fd2d89fbe17f17d02f6ba158 --- livestatus/src/Store.cc | 26 +++++++++++++------------- livestatus/src/Store.h | 27 ++++++++++++++------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 59abfc0..61528e1 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -56,28 +56,28 @@ Store::Store(MonitoringCore *core) : _core(core) , _logger(core->loggerLivestatus()) , _log_cache(_logger, _commands_holder, g_max_cached_messages) - , _table_contacts(_logger) + , _table_columns(_logger) , _table_commands(_commands_holder, _logger) + , _table_comments(_downtimes, _comments, core) + , _table_contactgroups(_core) + , _table_contacts(_logger) + , _table_downtimes(_downtimes, _comments, core) + , _table_eventconsoleevents(core, _downtimes, _comments) + , _table_eventconsolehistory(core, _downtimes, _comments) + , _table_eventconsolereplication(core) + , _table_eventconsolerules(core) + , _table_eventconsolestatus(core) , _table_hostgroups(_logger) , _table_hosts(_downtimes, _comments, core) , _table_hostsbygroup(_downtimes, _comments, core) + , _table_log(&_log_cache, _downtimes, _comments, core) , _table_servicegroups(_logger) , _table_services(_downtimes, _comments, core) , _table_servicesbygroup(_downtimes, _comments, core) , _table_servicesbyhostgroup(_downtimes, _comments, core) - , _table_timeperiods(_logger) - , _table_contactgroups(_core) - , _table_downtimes(_downtimes, _comments, core) - , _table_comments(_downtimes, _comments, core) - , _table_status(_logger) - , _table_log(&_log_cache, _downtimes, _comments, core) , _table_statehistory(&_log_cache, _downtimes, _comments, core) - , _table_columns(_logger) - , _table_eventconsoleevents(core, _downtimes, _comments) - , _table_eventconsolehistory(core, _downtimes, _comments) - , _table_eventconsolestatus(core) - , _table_eventconsolereplication(core) - , _table_eventconsolerules(core) { + , _table_status(_logger) + , _table_timeperiods(_logger) { addTable(&_table_columns); addTable(&_table_commands); addTable(&_table_comments); diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 5e4e2df..1da5e9a 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -77,28 +77,29 @@ private: DowntimesOrComments _downtimes; DowntimesOrComments _comments; LogCache _log_cache; - TableContacts _table_contacts; + + TableColumns _table_columns; TableCommands _table_commands; + TableComments _table_comments; + TableContactGroups _table_contactgroups; + TableContacts _table_contacts; + TableDowntimes _table_downtimes; + TableEventConsoleEvents _table_eventconsoleevents; + TableEventConsoleHistory _table_eventconsolehistory; + TableEventConsoleReplication _table_eventconsolereplication; + TableEventConsoleRules _table_eventconsolerules; + TableEventConsoleStatus _table_eventconsolestatus; TableHostGroups _table_hostgroups; TableHosts _table_hosts; TableHostsByGroup _table_hostsbygroup; + TableLog _table_log; TableServiceGroups _table_servicegroups; TableServices _table_services; TableServicesByGroup _table_servicesbygroup; TableServicesByHostGroup _table_servicesbyhostgroup; - TableTimeperiods _table_timeperiods; - TableContactGroups _table_contactgroups; - TableDowntimes _table_downtimes; - TableComments _table_comments; - TableStatus _table_status; - TableLog _table_log; TableStateHistory _table_statehistory; - TableColumns _table_columns; - TableEventConsoleEvents _table_eventconsoleevents; - TableEventConsoleHistory _table_eventconsolehistory; - TableEventConsoleStatus _table_eventconsolestatus; - TableEventConsoleReplication _table_eventconsolereplication; - TableEventConsoleRules _table_eventconsolerules; + TableStatus _table_status; + TableTimeperiods _table_timeperiods; std::map<std::string, Table *> _tables;

7 years, 7 months

Merge duplicate Store.h

by Sven Panne

Module: check_mk Branch: master Commit: 25990e60aef01d025935f421f04c757e092cad3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25990e60aef01d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 14:09:34 2017 +0100 Merge duplicate Store.h Change-Id: Icd5170d8f67259e54abdd13c430c579a32de4162 --- livestatus/src/Store.h | 54 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 1da5e9a..9f90bec 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -28,10 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <list> #include <map> -#include <mutex> #include <string> -#include "CommandsHolderNagios.h" -#include "DowntimesOrComments.h" #include "LogCache.h" #include "TableColumns.h" #include "TableCommands.h" @@ -55,29 +52,69 @@ #include "TableStateHistory.h" #include "TableStatus.h" #include "TableTimeperiods.h" -#include "nagios.h" -class Logger; class InputBuffer; +class Logger; class MonitoringCore; class OutputBuffer; class Table; +#ifdef CMC +#include <cstdint> +#include "TableCachedStatehist.h" +class Config; +class Core; +class Object; +#else +#include <mutex> +#include "CommandsHolderNagios.h" +#include "DowntimesOrComments.h" +#include "nagios.h" +#endif + class Store { public: +#ifdef CMC + Store(MonitoringCore *mc, Core *core); + LogCache *logCache() { return &_log_cache; }; + bool answerRequest(InputBuffer *, OutputBuffer *); + bool answerGetRequest(const std::list<std::string> &lines, + OutputBuffer &output, const std::string &tablename); + void answerCommandRequest(const char *command, Logger *logger); + void setMaxCachedMessages(unsigned long m); + void switchStatehistTable(); + void buildStatehistCache(); + void flushStatehistCache(); + void tryFinishStatehistCache(); + bool addObjectHistcache(Object *); + void addAlertToStatehistCache(Object *, int state, const char *output); + void addDowntimeToStatehistCache(Object *, bool started); + void addFlappingToStatehistCache(Object *, bool started); + Logger *logger() const { return _logger; } +#else explicit Store(MonitoringCore *core); bool answerRequest(InputBuffer &input, OutputBuffer &output); void registerDowntime(nebstruct_downtime_data *); void registerComment(nebstruct_comment_data *); +#endif private: +#ifdef CMC + Core *_core; +#else MonitoringCore *_core; +#endif Logger *const _logger; +#ifndef CMC CommandsHolderNagios _commands_holder; DowntimesOrComments _downtimes; DowntimesOrComments _comments; +#endif LogCache _log_cache; +#ifdef CMC + TableCachedStatehist _table_cached_statehist; +#endif TableColumns _table_columns; TableCommands _table_commands; TableComments _table_comments; @@ -103,16 +140,23 @@ private: std::map<std::string, Table *> _tables; +#ifndef CMC std::mutex _command_mutex; +#endif void addTable(Table *table); Table *findTable(const std::string &name); +#ifdef CMC + Config *config() const; + uint32_t horizon() const; +#else void logRequest(const std::string &line, const std::list<std::string> &lines); bool answerGetRequest(const std::list<std::string> &lines, OutputBuffer &output, const std::string &tablename); void answerCommandRequest(const char *); bool handleCommand(const std::string &command); +#endif }; #endif // Store_h

7 years, 7 months

Merge duplicate TableComments.h

by Sven Panne

Module: check_mk Branch: master Commit: b503f300c7acf5831c413a74b6c9d113f90d818c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b503f300c7acf5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 14:39:51 2017 +0100 Merge duplicate TableComments.h Change-Id: I32dd2c903631bbecaacce13ac7e8af10c8d46887 --- livestatus/src/TableComments.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/livestatus/src/TableComments.h b/livestatus/src/TableComments.h index 3a5f5bb..b4c8b1f 100644 --- a/livestatus/src/TableComments.h +++ b/livestatus/src/TableComments.h @@ -28,16 +28,29 @@ #include "config.h" // IWYU pragma: keep #include <string> #include "Table.h" +class Query; + +#ifdef CMC +#include <mutex> +#include "Notes.h" +class Core; +#else #include "nagios.h" class DowntimesOrComments; class MonitoringCore; -class Query; +#endif class TableComments : public Table { public: +#ifdef CMC + TableComments(const Downtimes &downtimes_holder, + const Comments &comments_holder, + std::recursive_mutex &holder_lock, Core *core); +#else TableComments(const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder, MonitoringCore *core); +#endif std::string name() const override; std::string namePrefix() const override; @@ -45,7 +58,12 @@ public: bool isAuthorized(contact *ctc, void *data) override; private: +#ifdef CMC + const Comments &_holder; + std::recursive_mutex &_holder_lock; +#else const DowntimesOrComments &_holder; +#endif }; #endif // TableComments_h

7 years, 7 months

Merge duplicate ServiceListStateColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: 0b74ee22347fcaf1eb9842ae6edb196d368cea50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b74ee22347fca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 13:37:40 2017 +0100 Merge duplicate ServiceListStateColumn.h Change-Id: I2acd96bca8e1ed5a8f6550c60128a1d066d4f575 --- livestatus/src/ServiceListStateColumn.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index b8cf3ca..2685e67 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -29,7 +29,14 @@ #include <cstdint> #include <string> #include "IntColumn.h" + +#ifdef CMC +#include <unordered_set> +class Service; +typedef std::unordered_set<Service *> servicelist_t; +#else #include "nagios.h" +#endif class ServiceListStateColumn : public IntColumn { public: @@ -58,13 +65,18 @@ public: , _offset(offset) , _logictype(logictype) {} int32_t getValue(void *row, contact *auth_user) override; - servicesmember *getMembers(void *data); +#ifdef CMC + static int32_t getValue(Type logictype, servicelist_t *mem, + contact *auth_user); +#else static int32_t getValue(Type logictype, servicesmember *mem, contact *auth_user); + servicesmember *getMembers(void *data); +#endif static bool svcStateIsWorse(int32_t state1, int32_t state2); private: - int _offset; + const int _offset; const Type _logictype; };

7 years, 7 months

4335 FIX perle check and inventory plugins: some updates and improvements

by Simon Betz

Module: check_mk Branch: master Commit: cfb312b25a7e6b1125e1c2debe0f1a2d10415431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfb312b25a7e6b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 2 14:06:41 2017 +0100 4335 FIX perle check and inventory plugins: some updates and improvements Concerns check plugins perle_chassis, perle_chassis.temp, perle_chassis_slots, perle_modules_cm1000, perle_modules_cm1110, perle_modules_mgt, perle_psmu and perle_psmu.fan, and inventory plugins perle_chassis_slots, perle_modules_mgt and perle_psmu. These updates include: - changed items for check plugins, - inventory plugin perle_modules_mgt has been removed. Change-Id: Ib2ec9126544927c808b020b3da9154d8ed7c5375 --- .werks/4335 | 17 +++++++++ ChangeLog | 2 + checks/perle.include | 87 ++++++++++++++++++------------------------ checks/perle_chassis | 9 ++--- checks/perle_chassis_slots | 29 +++++++------- checks/perle_modules_cm1000 | 2 +- checks/perle_modules_cm1110 | 2 +- checks/perle_modules_mgt | 24 +++++++----- checks/perle_psmu | 22 +++++------ inventory/perle_chassis_slots | 13 ++++--- inventory/perle_modules_mgt | 55 -------------------------- inventory/perle_psmu | 13 +++---- web/plugins/views/inventory.py | 6 ++- 13 files changed, 123 insertions(+), 158 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfb312b25a…

7 years, 7 months

Merge duplicate HostListStateColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: 7d612c5f72234ae3d8639c4ba838bc16ba99e982 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d612c5f72234a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 13:21:25 2017 +0100 Merge duplicate HostListStateColumn.h Change-Id: I187490597ddbdbc1fca3f7d1578433912a9c174e --- livestatus/src/HostListStateColumn.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/livestatus/src/HostListStateColumn.h b/livestatus/src/HostListStateColumn.h index b6eb797..8f8d50b 100644 --- a/livestatus/src/HostListStateColumn.h +++ b/livestatus/src/HostListStateColumn.h @@ -30,7 +30,13 @@ #include <string> #include "IntColumn.h" #include "ServiceListStateColumn.h" + +#ifdef CMC +#include <unordered_set> +class Host; +#else #include "nagios.h" +#endif class HostListStateColumn : public IntColumn { public: @@ -72,10 +78,14 @@ public: , _offset(offset) , _logictype(logictype) {} int32_t getValue(void *row, contact *auth_user) override; +#ifdef CMC + std::unordered_set<Host *> *getMembers(void *data); +#else hostsmember *getMembers(void *data); +#endif private: - int _offset; + const int _offset; const Type _logictype; };

7 years, 7 months

Merge duplicate ServiceListColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: eaa85cd9b37950bb1d15a6d0abfcfcb24dd95b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa85cd9b37950… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 13:26:55 2017 +0100 Merge duplicate ServiceListColumn.h Change-Id: I692d5056fce2eeb671fd8ae5e35525a584d0bf58 --- livestatus/src/ServiceListColumn.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index 1c80a5c..f52bb99 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -29,11 +29,17 @@ #include <memory> #include <string> #include "Column.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include <unordered_set> +class Service; +#else +#include "nagios.h" +#endif + class ServiceListColumn : public Column { public: ServiceListColumn(const std::string &name, const std::string &description, @@ -50,7 +56,11 @@ public: void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; +#ifdef CMC + std::unordered_set<Service *> *getMembers(void *data); +#else servicesmember *getMembers(void *data); +#endif private: bool _hostname_required; @@ -58,7 +68,9 @@ private: bool _show_host; int _info_depth; +#ifndef CMC int inCustomTimeperiod(service *svc, const char *varname); +#endif }; #endif // ServiceListColumn_h

7 years, 7 months

← Newer
1
...
36
37
38
39
40
41
42
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017