Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Warning police: Fixed signed/unsigned confusion (in a slightly hacky way).

by Sven Panne

Module: check_mk Branch: master Commit: a0e521c4757eec84e60de34e59ad2abf2e15f562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e521c4757eec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 11:58:38 2015 +0100 Warning police: Fixed signed/unsigned confusion (in a slightly hacky way). --- livestatus/src/LogCache.cc | 10 +++++----- livestatus/src/LogEntry.h | 2 +- livestatus/src/waittriggers.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 4b90914..f5bb267 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -219,7 +219,7 @@ void LogCache::dumpLogfiles() */ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((__unused__)), time_t until __attribute__ ((__unused__)), unsigned logclasses) { - if ( ++num_cached_log_messages <= _max_cached_messages ) + if ( static_cast<unsigned long>(++num_cached_log_messages) <= _max_cached_messages ) return; // current message count still allowed, everything ok /* Memory checking an freeing consumes CPU ressources. We save @@ -228,7 +228,7 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((_ memory can be freed. We do this by suppressing the check when the number of messages loaded into memory has not grown by at least CHECK_MEM_CYCLE messages */ - if (num_cached_log_messages < _num_at_last_check + CHECK_MEM_CYCLE) + if (static_cast<unsigned long>(num_cached_log_messages) < _num_at_last_check + CHECK_MEM_CYCLE) return; // Do not check this time // [1] Begin by deleting old logfiles @@ -244,7 +244,7 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((_ if (log->numEntries() > 0) { num_cached_log_messages -= log->numEntries(); log->flush(); // drop all messages of that file - if (num_cached_log_messages <= _max_cached_messages) { + if (static_cast<unsigned long>(num_cached_log_messages) <= _max_cached_messages) { // remember the number of log messages in cache when // the last memory-release was done. No further // release-check shall be done until that number changes. @@ -269,7 +269,7 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((_ debug("Freeing classes 0x%02x of file %s", ~logclasses, log->path()); long freed = log->freeMessages(~logclasses); // flush only messages not needed for current query num_cached_log_messages -= freed; - if (num_cached_log_messages <= _max_cached_messages) { + if (static_cast<unsigned long>(num_cached_log_messages) <= _max_cached_messages) { _num_at_last_check = num_cached_log_messages; return; } @@ -287,7 +287,7 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((_ debug("Flush newer log, msgs %d", log->numEntries()); num_cached_log_messages -= log->numEntries(); log->flush(); - if (num_cached_log_messages <= _max_cached_messages) { + if (static_cast<unsigned long>(num_cached_log_messages) <= _max_cached_messages) { _num_at_last_check = num_cached_log_messages; return; } diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index af32237..8f2b72e 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -34,7 +34,7 @@ #define LOGCLASS_STATE 6 // initial or current states #define LOGCLASS_TEXT 7 // specific text passages. e.g "logging initial states" // TODO: This LOGCLASS sets different logclasses on match -> fix this -#define LOGCLASS_INVALID -1 // never stored +#define LOGCLASS_INVALID 0x7fffffff // never stored #define LOGCLASS_ALL 0xffff #include "nagios.h" diff --git a/livestatus/src/waittriggers.h b/livestatus/src/waittriggers.h index 8d3d389..b468a76 100644 --- a/livestatus/src/waittriggers.h +++ b/livestatus/src/waittriggers.h @@ -27,7 +27,7 @@ #include "pthread.h" -#define WT_NONE -1 +#define WT_NONE 0x7fffffff #define WT_ALL 0 #define WT_CHECK 1 #define WT_STATE 2

8 years, 8 months

Fixed undefined behavior: For base classes, the destructor should better be virtual.

by Sven Panne

Module: check_mk Branch: master Commit: abde249e7fbdebc58775aef059a56e53a0072113 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abde249e7fbdeb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 11:27:25 2015 +0100 Fixed undefined behavior: For base classes, the destructor should better be virtual. --- livestatus/src/Aggregator.h | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/Aggregator.h b/livestatus/src/Aggregator.h index e434e70..4d77cb4 100644 --- a/livestatus/src/Aggregator.h +++ b/livestatus/src/Aggregator.h @@ -36,6 +36,7 @@ protected: uint32_t _count; public: Aggregator(int o) : _operation(o), _count(0) {} + virtual ~Aggregator() {} virtual void consume(void *data, Query *) = 0; virtual void output(Query *) = 0; };

8 years, 8 months

Warning police: Added missing return values, fixing a bug in DynamicColumn on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 1a03be8fc4c0344b09f92aefacc03f72d1e96b16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a03be8fc4c034… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 11:09:27 2015 +0100 Warning police: Added missing return values, fixing a bug in DynamicColumn on the way. --- livestatus/src/DynamicColumn.cc | 2 +- livestatus/src/HostSpecialIntColumn.cc | 3 ++- livestatus/src/StatusSpecialIntColumn.cc | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index b789a17..4054daa 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -26,6 +26,6 @@ Column *DynamicColumn::createColumn(const char *arguments) { - createColumn(_indirect_offset, arguments); + return createColumn(_indirect_offset, arguments); } diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index f1dc6dd..61b9da4 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -49,5 +49,6 @@ int32_t HostSpecialIntColumn::getValue(void *data, Query *) return mk_inventory_last(hst->name); } - // never reached + // never reached, make -Wall happy + return 0; } diff --git a/livestatus/src/StatusSpecialIntColumn.cc b/livestatus/src/StatusSpecialIntColumn.cc index e0bad01..7294c5a 100644 --- a/livestatus/src/StatusSpecialIntColumn.cc +++ b/livestatus/src/StatusSpecialIntColumn.cc @@ -32,5 +32,6 @@ int32_t StatusSpecialIntColumn::getValue(void *, Query *) case SPIC_MK_INVENTORY_LAST: return mk_inventory_last_of_all(); } - // never reached + // never reached, make -Wall happy + return 0; }

8 years, 8 months

Warning police: Removed unused variables.

by Sven Panne

Module: check_mk Branch: master Commit: 1804587036908416eedb53f671760245c5109564 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18045870369084… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 11:01:01 2015 +0100 Warning police: Removed unused variables. --- livestatus/src/ServicelistStateColumn.cc | 1 - livestatus/src/TableDownComm.cc | 2 -- 2 files changed, 3 deletions(-) diff --git a/livestatus/src/ServicelistStateColumn.cc b/livestatus/src/ServicelistStateColumn.cc index dc8f599..2121955 100644 --- a/livestatus/src/ServicelistStateColumn.cc +++ b/livestatus/src/ServicelistStateColumn.cc @@ -51,7 +51,6 @@ int32_t ServicelistStateColumn::getValue(int logictype, servicesmember *mem, Que { contact *auth_user = query->authUser(); int32_t result = 0; - int lt; while (mem) { service *svc = mem->service_ptr; diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 5363034..45d8f19 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -104,7 +104,6 @@ TableDownComm::~TableDownComm() } void TableDownComm::addComment(nebstruct_comment_data *data) { - unsigned long id = data->comment_id; if (data->type == NEBTYPE_COMMENT_ADD || data->type == NEBTYPE_COMMENT_LOAD) { add(new Comment(data)); } @@ -116,7 +115,6 @@ void TableDownComm::addComment(nebstruct_comment_data *data) { void TableDownComm::addDowntime(nebstruct_downtime_data *data) { - unsigned long id = data->downtime_id; if (data->type == NEBTYPE_DOWNTIME_ADD || data->type == NEBTYPE_DOWNTIME_LOAD) { add(new Downtime(data)); }

8 years, 8 months

Warning police: Fixed initializer order.

by Sven Panne

Module: check_mk Branch: master Commit: b8ebe2e20ab9878b1db232d0a58b77fa5d37a20d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8ebe2e20ab987… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 10:58:58 2015 +0100 Warning police: Fixed initializer order. --- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/Filter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index 7845591..4a1950e 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -40,7 +40,7 @@ class DownCommColumn : public ListColumn bool _with_extra_info; // provides date and type public: DownCommColumn(string name, string description, int indirect_offset, bool is_downtime, bool is_service, bool with_info, bool with_extra_info) - : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _is_service(is_service), _with_info(with_info), _with_extra_info(with_extra_info) {} + : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info), _is_service(is_service), _with_extra_info(with_extra_info) {} int type() { return COLTYPE_LIST; } void output(void *, Query *); void *getNagiosObject(char *name); diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index bfcf3ec..5e9c3d4 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -46,7 +46,7 @@ protected: void setError(unsigned code, const char *format, ...); public: - Filter() : _query(0), _column(0) {} + Filter() : _column(0), _query(0) {} virtual ~Filter() {} virtual bool isAndingFilter() { return false; } virtual bool isNegatingFilter() { return false; }

8 years, 8 months

Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 846a34fdd4ea8f885cb04c10c2b76f2044e6ba4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=846a34fdd4ea8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 26 11:00:16 2015 +0100 Conflicts: ChangeLog modules/check_mk.py --- .werks/2692 | 10 ++++++++++ ChangeLog | 1 + checks/check_http | 4 ++-- modules/check_mk.py | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2692 b/.werks/2692 new file mode 100644 index 0000000..6e6e020 --- /dev/null +++ b/.werks/2692 @@ -0,0 +1,10 @@ +Title: check_http: Fixed broken check when using Nagios (introduced with 1.2.7i3) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445849972 + + diff --git a/ChangeLog b/ChangeLog index 30766f5..bdb8d92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 2236 FIX: cups_queues: Correct not working discovery after werk #2504... * 2668 FIX: jar_signature: Handle case correctly where certificate is already expired * 2669 FIX: mcdata_fcport: fix computation of in and out traffic... + * 2692 FIX: check_http: Fixed broken check when using Nagios (introduced with 1.2.7i3) Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/check_http b/checks/check_http index cf370d9..85b3153 100644 --- a/checks/check_http +++ b/checks/check_http @@ -50,9 +50,9 @@ def check_http_arguments(params): if address_family == "ipv6": args += " -6" - address = "$HOST_ADDRESS_6$" + address = "$_HOSTADDRESS_6$" else: - address = "$HOST_ADDRESS_4$" + address = "$_HOSTADDRESS_4$" if settings.get("ssl"): args += ' --ssl' diff --git a/modules/check_mk.py b/modules/check_mk.py index 5e3d0f8..386aa7b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1381,6 +1381,8 @@ def get_basic_host_macros_from_attributes(hostname, attrs): for macro_name, value in attrs.items(): if macro_name[0] == '_': macros["$HOST" + macro_name + "$"] = value + # Be compatible to nagios making $_HOST<VARNAME>$ out of the config _<VARNAME> configs + macros["$_HOST" + macro_name[1:] + "$"] = value return macros

8 years, 8 months

Avoid a warning by making the 2 parts of a hack explicit.

by Sven Panne

Module: check_mk Branch: master Commit: 580ce252e897a9e2835eed3d9f82d234514094ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=580ce252e897a9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 10:46:43 2015 +0100 Avoid a warning by making the 2 parts of a hack explicit. --- livestatus/src/DownCommColumn.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 0a1b0cc..70a40a3 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -28,6 +28,7 @@ #include "logger.h" #include "Query.h" #include "tables.h" +#include <stdint.h> void DownCommColumn::output(void *data, Query *query) { @@ -89,8 +90,8 @@ void DownCommColumn::output(void *data, Query *query) void *DownCommColumn::getNagiosObject(char *name) { - unsigned int id = strtoul(name, 0, 10); - return (void *)id; // Hack. Convert number into pointer. + unsigned long id = strtoul(name, 0, 10); + return reinterpret_cast<void *>(static_cast<uintptr_t>(id)); // Hack. Convert number into pointer. } bool DownCommColumn::isNagiosMember(void *data, void *member)

8 years, 8 months

Update autoreconf-generated files and config.{guess, sub}.

by Sven Panne

Module: check_mk Branch: master Commit: f38b9c857ed4879184a42d9945f2bff4ce2d654f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f38b9c857ed487… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 10:34:55 2015 +0100 Update autoreconf-generated files and config.{guess,sub}. --- livestatus/config.guess | 768 +++++++++++++++++++++-------------------------- livestatus/config.sub | 369 ++++++++++++++++------- livestatus/depcomp | 586 ++++++++++++++++++++++++------------ livestatus/install-sh | 388 ++++++++++++------------ livestatus/missing | 460 ++++++++++------------------ 5 files changed, 1338 insertions(+), 1233 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f38b9c857e…

8 years, 8 months

Make global_counters.h easily usable both from C and C++.

by Sven Panne

Module: check_mk Branch: master Commit: 14b21e22f8e6489811db863851fb16b21582427e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14b21e22f8e648… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 26 10:27:16 2015 +0100 Make global_counters.h easily usable both from C and C++. --- livestatus/src/global_counters.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/livestatus/src/global_counters.h b/livestatus/src/global_counters.h index 9f1e0b6..055f21a 100644 --- a/livestatus/src/global_counters.h +++ b/livestatus/src/global_counters.h @@ -29,6 +29,10 @@ #include <stdint.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifndef EXTERN # define EXTERN extern #endif @@ -54,5 +58,8 @@ EXTERN double g_counter_rate[NUM_COUNTERS]; void do_statistics(); -#endif // global_counters_h +#ifdef __cplusplus +} +#endif +#endif /* global_counters_h */

8 years, 8 months

Code cleanup: get rid of import struct in checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 9784cb4292615dd2ef77eaff23b691028f4ff208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9784cb4292615d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 25 18:42:33 2015 +0100 Code cleanup: get rid of import struct in checks --- checks/fc_port | 5 +++-- checks/mcdata_fcport | 10 +--------- modules/check_mk_base.py | 12 ++++++++++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index e416f4b..69e6831 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -86,14 +86,15 @@ def fc_port_getitem(num_ports, index, portname): itemname += portname.strip() return itemname + def fc_parse_counter(value): # The counters are sent via SNMP as OCTETSTR, which is converted to # a byte string by Check_MKs SNMP code. The counters seem to be # 64 bit big endian values, which are converted to integers here if len(value) == len("00 00 00 0C 8F 70 DD 74"): value = "".join(map(chr, [ eval("0x" + v) for v in value.split() ])) - import struct - return int(struct.unpack('>Q', value)[0]) + return binstring_to_int(value) + def inventory_fc_port(info): if not info: diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index 4715ca9..fbe0394 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -28,15 +28,7 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } def mcdata_bin_to_64(bin): - # McData encodes 64 bit counters as big endian HEX strings, - # e.g. Hex-STRING: 00 00 00 01 AC C2 8C EE. Check_MK converts - # such strings into binary Python strings - value = 0 - mult = 1 - for byte in bin[::-1]: - value += mult * ord(byte) - mult *= 256 - return str(value) + return str(binstring_to_int(bin)) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9986616..6d743ca 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2119,6 +2119,18 @@ def savefloat(f): except: return 0.0 +# Convert a string to an integer. This is done by consideren the string to by a +# little endian byte string. Such strings are sometimes used by SNMP to encode +# 64 bit counters without needed COUNTER64 (which is not available in SNMP v1) +def binstring_to_int(binstring): + value = 0 + mult = 1 + for byte in binstring[::-1]: + value += mult * ord(byte) + mult *= 256 + return value + + # Takes bytes as integer and returns a string which represents the bytes in a # more human readable form scaled to GB/MB/KB # The unit parameter simply changes the returned string, but does not interfere

8 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015