Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

Don't send error messages as a reply, this breaks the protocol.

by Sven Panne

Module: check_mk Branch: master Commit: 5dbd6dc78ddf379f47238793b907ab43b265bc84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dbd6dc78ddf37… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 11:28:15 2016 +0200 Don't send error messages as a reply, this breaks the protocol. --- bin/mkeventd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index e8c09fb..09e7ca3 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2705,11 +2705,6 @@ class StatusServer: except Exception, e: log("Error handling client %s: %s" % (addr_info, e)) if client_socket: - try: - client_socket.sendall("ERROR: %s\n" % e) - except: - pass # avoid next exception because of broken pipe! - client_socket.close() client_socket = None if opt_debug:

8 years, 1 month

3634 check_sql: upload/content field for longer queries is now available

by Simon Betz

Module: check_mk Branch: master Commit: 08059383e8e5adeb2c31bb77c70cb172e7dced7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08059383e8e5ad… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 6 11:07:10 2016 +0200 3634 check_sql: upload/content field for longer queries is now available --- .werks/3634 | 9 +++ ChangeLog | 1 + checks/check_sql | 15 ++++- web/plugins/wato/active_checks.py | 130 +++++++++++++++++++++++-------------- 4 files changed, 104 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08059383e8…

8 years, 1 month

3540 FIX Fixed exception on reading cachefiles

by Andreas Boesl

Module: check_mk Branch: master Commit: fac913e82b3c10ad21c4e9935d649395d2e4b35d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fac913e82b3c10… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 6 11:06:24 2016 +0200 3540 FIX Fixed exception on reading cachefiles This fixes the Check_MK agent error <i>%d format: a number is required, not NoneType</i> which was introduced in the last version. --- .werks/3540 | 12 ++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3540 b/.werks/3540 new file mode 100644 index 0000000..3b51078 --- /dev/null +++ b/.werks/3540 @@ -0,0 +1,12 @@ +Title: Fixed exception on reading cachefiles +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465203854 + + +This fixes the Check_MK agent error <i>%d format: a number is required, not NoneType</i> +which was introduced in the last version. diff --git a/ChangeLog b/ChangeLog index fcbe92e..56a5788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -258,6 +258,7 @@ * 3619 FIX: esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit * 2238 FIX: postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues... * 3633 FIX: check_sql: minor cleanup in active check_sql, fixed performance data handling + * 3540 FIX: Fixed exception on reading cachefiles... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 312f2dd..f64246f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -680,7 +680,7 @@ def read_cache_file(relpath, max_cache_age): return result else: vverbose("Skipping cache file %s: Too old " - "(age is %d sec, allowed is %d sec)\n" % + "(age is %d sec, allowed is %s sec)\n" % (cachefile, cachefile_age(cachefile), max_cache_age)) if simulation_mode and not opt_no_cache:

8 years, 1 month

3633 FIX check_sql: minor cleanup in active check_sql, fixed performance data handling

by Simon Betz

Module: check_mk Branch: master Commit: 44cf6b282ca90d16e9095de8e4d615d6c5b4651f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44cf6b282ca90d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 6 11:02:42 2016 +0200 3633 FIX check_sql: minor cleanup in active check_sql, fixed performance data handling --- .werks/3633 | 10 +++++ ChangeLog | 1 + doc/treasures/active_checks/check_sql | 68 ++++++++++++++++----------------- 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/.werks/3633 b/.werks/3633 new file mode 100644 index 0000000..aeed227 --- /dev/null +++ b/.werks/3633 @@ -0,0 +1,10 @@ +Title: check_sql: minor cleanup in active check_sql, fixed performance data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465203726 + + diff --git a/ChangeLog b/ChangeLog index e501858..fcbe92e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -257,6 +257,7 @@ * 3587 FIX: SNMP: Fixed possible random IO issues when using classic SNMP... * 3619 FIX: esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit * 2238 FIX: postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues... + * 3633 FIX: check_sql: minor cleanup in active check_sql, fixed performance data handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 450f6e6..499988e 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -29,8 +29,10 @@ # as well as the ibm_db2 Python DBI driver for DB2: # https://pypi.python.org/pypi/ibm_db + import sys, getopt + def usage(): sys.stderr.write("""Check_MK SQL Test @@ -65,28 +67,28 @@ OPTIONS: """) + def saverfloat(f): if f == "": return None else: return float(f) -# -# defining and collection input parameters -# + short_options = 'hou:i:p:d:n:H:P:w:c:v' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', - 'port=', 'debug', 'verbose', 'procedure', 'inputvars=' -] + 'port=', 'debug', 'verbose', 'procedure', 'inputvars='] + try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, e: - print "UNKOWN - Error in command options: %s" % e + sys.stderr.write("UNKOWN - Error in command options: %s\n" % e) sys.exit(3) + opt_debug = False opt_verbose = False opt_dbms = "postgres" @@ -101,6 +103,7 @@ opt_procedure = False warn = [ None, None ] crit = [ None, None ] + try: for o,a in opts: if o in [ '--debug' ]: @@ -135,21 +138,17 @@ try: opt_sql_tmp = ' '.join(map(str,args)) opt_sql = opt_sql_tmp.replace(r"\n", "\n").replace('\;', ";") else: - print "UNKNOWN - no SQL statement/procedure name given" + sys.stderr.write("UNKNOWN - no query or SQL statement/procedure name given\n") sys.exit(3) except Exception, e: if opt_debug: raise - print "UNKNOWN - Error while processing input: %s" % e + sys.stderr.write("UNKNOWN - Error while processing input: %s\n" % e) sys.exit(3) -# -# database connection -# try: - if opt_dbms == "postgres": import psycopg2 # postgres driver db = psycopg2 @@ -197,21 +196,19 @@ try: db_connection = ibm_db_dbi.Connection(ibm_db_conn) else: - print "UNKNOWN - dbms not found" + sys.stderr.write("UNKNOWN - dbms not found\n") sys.exit(3) cursor = db_connection.cursor() except Exception, e: if len(e.args) > 1: - print "UNKNOWN - Error while connecting to database: [%d] %s" % (e.args[0], e.args[1]) + sys.stderr.write("UNKNOWN - Error while connecting to database: [%d] %s\n" % (e.args[0], e.args[1])) else: - print "UNKNOWN - Error while connecting to database: %s" % e + sys.stderr.write("UNKNOWN - Error while connecting to database: %s\n" % e) sys.exit(3) -# -# excecuting the sql statement -# + try: if opt_verbose: if opt_procedure: @@ -238,37 +235,36 @@ except Exception, e: if opt_debug: raise if len(e.args) > 1: - print "UNKNOWN - Error while executing SQL statement/procedure: [%d] %s" % (e.args[0], e.args[1]) + sys.stderr.write("UNKNOWN - Error while executing SQL statement/procedure: [%d] %s\n" % (e.args[0], e.args[1])) else: - print "UNKNOWN - Error while executing SQL statement/procedure: %s" % e + sys.stderr.write("UNKNOWN - Error while executing SQL statement/procedure: %s\n" % e) sys.exit(3) + if opt_verbose: - sys.stderr.write("\nSQL Result:\n %s\n\n" % result) + sys.stderr.write("SQL Result:\n %s\n" % " ".join(result)) + -# -# processing of result -# try: #if len(result) > 1: - # print "UNKNOWN - SQL statement/procedure returned more than one line" + # sys.stderr.write("UNKNOWN - SQL statement/procedure returned more than one line\n") # sys.exit(3) if result == None or len(result) == 0: - print "UNKNOWN - SQL statement/procedure returned no data" + sys.stderr.write("UNKNOWN - SQL statement/procedure returned no data\n") sys.exit(3) number = float(result[0]) - text = str(result[1]) + text = str(result[1]) try: - perf = "|"+str(result[2]) + perf = " | performance_data=%s" % str(result[2]) except IndexError: if opt_debug: raise - perf = "" # no perf data + perf = "" state = 0 - if warn != [ None, None] or crit != [ None, None ]: + if warn != [ None, None ] or crit != [ None, None ]: if (warn[0] != None and warn[0] > number) or \ (warn[1] != None and warn[1] < number): state = 1 @@ -276,19 +272,19 @@ try: (crit[1] != None and crit[1] < number): state = 2 else: - if number in [ 0 ,1 ,2 ,3 ]: + if number in [ 0, 1, 2, 3 ]: state = int(number) else: - print "UNKNOWN - <%s> is not a state, and no levels given" % str(number) + sys.stderr.write("UNKNOWN - <%s> is not a state, and no levels given\n" % str(number)) sys.exit(3) except Exception, e: if opt_debug: raise - print "UNKNOWN - Error while processing result of SQL statement: %s" % e + sys.stderr.write("UNKNOWN - Error while processing result of SQL statement: %s\n" % e) sys.exit(3) -result = ["OK", "WARN", "CRIT", "UNKNOWN" ][state] -print "%s - %s %s %s" % (result, number, text, perf) -sys.exit(state) +state_readable = ["OK", "WARN", "CRIT", "UNKNOWN" ][state] +sys.stdout.write("%s - %s%s\n" % (state_readable, text, perf)) +sys.exit(state)

8 years, 1 month

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 912704ddafe629d693f262d7d7532c2f9ab9fff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=912704ddafe629… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 6 11:01:27 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 00987dc..6372ab1 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3633 +3643

8 years, 1 month

fixed empty info handling

by Simon Betz

Module: check_mk Branch: master Commit: d7056e09ad698a4f88d01614abeb6b6545783078 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7056e09ad698a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 6 09:29:07 2016 +0200 fixed empty info handling --- checks/cisco_fru_powerusage | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/checks/cisco_fru_powerusage b/checks/cisco_fru_powerusage index 96118d5..bec4e47 100644 --- a/checks/cisco_fru_powerusage +++ b/checks/cisco_fru_powerusage @@ -46,33 +46,34 @@ def parse_cisco_fru_powerusage(info): - powerunit, powervals = info - oidend, powerunit_str = powerunit[0] - factor_str, voltage_str = powerunit_str.lower().split("amps") + parsed = {} + powerunit, powervals = info + if powerunit and powervals: + oidend, powerunit_str = powerunit[0] + factor_str, voltage_str = powerunit_str.lower().split("amps") - if "milli" in factor_str.lower(): - factor = 0.001 - elif "centi" in factor_str.lower(): - factor = 0.01 - else: - factor = 1.0 + if "milli" in factor_str.lower(): + factor = 0.001 + elif "centi" in factor_str.lower(): + factor = 0.01 + else: + factor = 1.0 - voltage = float(voltage_str.lower().replace("at", "").\ - replace("@", "").replace("v", "").strip()) + voltage = float(voltage_str.lower().replace("at", "").\ + replace("@", "").replace("v", "").strip()) - parsed = {} - if oidend == powervals[0][0]: - system_total, system_drawn, inline_total, inline_drawn = map(float, powervals[0][1:]) - for what, val in [ - ("system total", system_total), # Gesamtstrom - ("system drawn", system_drawn), # aufgenommene Gesamtstromstaerke - ("inline total", inline_total), - ("inline drawn", inline_drawn)]: - parsed.setdefault(what, { - "power" : factor * val * voltage, - "current" : factor * val, - "voltage" : voltage, - }) + if oidend == powervals[0][0]: + system_total, system_drawn, inline_total, inline_drawn = map(float, powervals[0][1:]) + for what, val in [ + ("system total", system_total), # Gesamtstrom + ("system drawn", system_drawn), # aufgenommene Gesamtstromstaerke + ("inline total", inline_total), + ("inline drawn", inline_drawn)]: + parsed.setdefault(what, { + "power" : factor * val * voltage, + "current" : factor * val, + "voltage" : voltage, + }) return parsed

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b3adee1c911ef7d61e8d920525d321ebe6feba42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3adee1c911ef7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 09:16:18 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/DynamicColumn.cc | 13 +++++++--- livestatus/src/DynamicColumn.h | 26 ++++++++------------ .../src/DynamicEventConsoleReplicationColumn.cc | 2 +- .../src/DynamicEventConsoleReplicationColumn.h | 3 +-- livestatus/src/DynamicLogwatchFileColumn.cc | 18 +++++++------- livestatus/src/DynamicLogwatchFileColumn.h | 3 +-- livestatus/src/TableEventConsoleReplication.h | 1 + 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index fd49957..c17c86d 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -24,8 +24,15 @@ #include "DynamicColumn.h" +using std::string; + +DynamicColumn::DynamicColumn(const string& name, const string& description, + int indirect_offset, int extra_offset) + : _name(name) + , _description(description) + , _indirect_offset(indirect_offset) + , _extra_offset(extra_offset) {} + DynamicColumn::~DynamicColumn() = default; -Column *DynamicColumn::createColumn(const char *arguments) { - return createColumn(_indirect_offset, _extra_offset, arguments); -} +string DynamicColumn::name() const { return _name; } diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index b5d21d5..aa5ef65 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -30,24 +30,18 @@ class Column; class DynamicColumn { - std::string _name; - std::string _description; - int _indirect_offset; - int _extra_offset; - public: - DynamicColumn(std::string name, std::string description, - int indirect_offset, int extra_offset) - : _name(name) - , _description(description) - , _indirect_offset(indirect_offset) - , _extra_offset(extra_offset) {} + DynamicColumn(const std::string &name, const std::string &description, + int indirect_offset, int extra_offset); virtual ~DynamicColumn(); - const char *name() const { return _name.c_str(); } - const char *description() const { return _description.c_str(); } - Column *createColumn(const char *arguments); - virtual Column *createColumn(int indirect_offset, int extra_offset, - const char *arguments) = 0; + std::string name() const; + virtual Column *createColumn(const std::string &arguments) = 0; + +protected: + const std::string _name; + const std::string _description; // Note: Currently unused! + const int _indirect_offset; + const int _extra_offset; }; #endif // DynamicColumn_h diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index c1af0ea..7f3d22d 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -30,6 +30,6 @@ DynamicEventConsoleReplicationColumn::DynamicEventConsoleReplicationColumn( : DynamicColumn(name, description, indirect_offset, extra_offset) {} Column *DynamicEventConsoleReplicationColumn::createColumn( - int indirect_offset, int extra_offset, const char *arguments) { + const std::string &arguments) { return nullptr; } diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.h b/livestatus/src/DynamicEventConsoleReplicationColumn.h index 360d0ac..804463b 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.h +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.h @@ -35,8 +35,7 @@ public: DynamicEventConsoleReplicationColumn(std::string name, std::string description, int indirect_offset, int extra_offset); - Column *createColumn(int indirect_offset, int extra_offset, - const char *arguments) override; + Column *createColumn(const std::string &arguments) override; }; #endif // DynamicEventConsoleReplicationColumn_h diff --git a/livestatus/src/DynamicLogwatchFileColumn.cc b/livestatus/src/DynamicLogwatchFileColumn.cc index 197b50c..49c844f 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.cc +++ b/livestatus/src/DynamicLogwatchFileColumn.cc @@ -55,23 +55,22 @@ string unescape_filename(string filename) { return filename_native; } -Column *DynamicLogwatchFileColumn::createColumn(int indirect_offset, - int extra_offset, - const char *arguments) { +Column *DynamicLogwatchFileColumn::createColumn(const std::string &arguments) { // We expect: // COLNAME:FILENAME // Example: // file_contents:var\log\messages - vector<char> args(arguments, arguments + strlen(arguments) + 1); + vector<char> args(arguments.begin(), arguments.end()); + args.push_back('\0'); char *scan = &args[0]; char *colname = next_token(&scan, ':'); if ((colname == nullptr) || (colname[0] == 0)) { logger(LOG_WARNING, "Invalid arguments for column %s: missing result column name", - name()); + _name.c_str()); return nullptr; } @@ -79,14 +78,15 @@ Column *DynamicLogwatchFileColumn::createColumn(int indirect_offset, char *filename = scan; if ((filename == nullptr) || (filename[0] == 0)) { logger(LOG_WARNING, - "Invalid arguments for column %s: missing file name", name()); + "Invalid arguments for column %s: missing file name", + _name.c_str()); return nullptr; } if (nullptr != strchr(filename, '/')) { logger(LOG_WARNING, "Invalid arguments for column %s: file name '%s' contains slash", - name(), filename); + _name.c_str(), filename); return nullptr; } @@ -96,6 +96,6 @@ Column *DynamicLogwatchFileColumn::createColumn(int indirect_offset, suffix += filename_native; return new HostFileColumn(colname, "Contents of logwatch file", - MK_LOGWATCH_PATH, suffix.c_str(), indirect_offset, - extra_offset); + MK_LOGWATCH_PATH, suffix.c_str(), + _indirect_offset, _extra_offset); } diff --git a/livestatus/src/DynamicLogwatchFileColumn.h b/livestatus/src/DynamicLogwatchFileColumn.h index aa49248..a60cf22 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.h +++ b/livestatus/src/DynamicLogwatchFileColumn.h @@ -36,8 +36,7 @@ public: int indirect_offset, int extra_offset = -1) : DynamicColumn(name, description, indirect_offset, extra_offset) {} ~DynamicLogwatchFileColumn() {} - Column *createColumn(int indirect_offset, int extra_offset, - const char *arguments) override; + Column *createColumn(const std::string &arguments) override; }; #endif // DynamicLogwatchFileColumn_h diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h index 76f6d42..c19a553 100644 --- a/livestatus/src/TableEventConsoleReplication.h +++ b/livestatus/src/TableEventConsoleReplication.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include "Table.h" +class Query; class TableEventConsoleReplication : public Table { public:

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 79338f203d47b2af91270a9a3c0a067a2eca2c9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79338f203d47b2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 08:21:00 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/PerfdataAggregator.cc | 1 + livestatus/src/Query.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index b318e79..54adbba 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -40,6 +40,7 @@ using std::vector; void PerfdataAggregator::consume(void *data, Query * /*unused*/) { string perf_data = _column->getValue(data); vector<char> perf_data_vec(perf_data.begin(), perf_data.end()); + perf_data_vec.push_back('\0'); char *scan = &perf_data_vec[0]; char *entry; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 154fc64..b1a1ed7 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -93,7 +93,7 @@ Query::Query(const list<string> &lines, OutputBuffer *output, Table *table) , _timezone_offset(0) { for (auto &line : lines) { vector<char> line_copy(line.begin(), line.end()); - line_copy.push_back(0); + line_copy.push_back('\0'); char *buffer = &line_copy[0]; rstrip(buffer); if (g_debug_level > 0) {

8 years, 1 month

Updated werk 2238

by Sven Rueß

Module: check_mk Branch: master Commit: ee9d00b1104d455bd38b478a6f67676fc731a768 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee9d00b1104d45… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Jun 3 16:54:50 2016 +0200 Updated werk 2238 --- .werks/2238 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2238 b/.werks/2238 index 5881b07..a0d9bd4 100644 --- a/.werks/2238 +++ b/.werks/2238 @@ -19,10 +19,10 @@ Those files are stored at following locations: </ul> You can delete those files with those commands: -<code> +C+: find ~/var/check_mk/rrd -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; find ~/var/pnp4nagios/perfdata -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; -</code> +C-: If you have set up a new monitoring site with version 1.2.8, there are multi RRDs in use. If you want to clean up those files, please contact us with via your support address.

8 years, 1 month

2238 FIX postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues

by Sven Rueß

Module: check_mk Branch: master Commit: 89d3fad17dfce6b63e82e3d86d144a33dedf078c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89d3fad17dfce6… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Jun 3 16:33:05 2016 +0200 2238 FIX postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues Postfix mail queue check creates incorrect rrd data sources. This results in a lot of unnecessary rrd files. You can delete those files to save hard disc space. But keep in mind, that you will loose the historic data. Graphs can have areas with missing data. Those files are stored at following locations: <ul> <li>~/var/check_mk/rrd</li> <li>~/var/pnp4nagios/perfdata</li> </ul> You can delete those files with those commands: <code> find ~/var/check_mk/rrd -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; find ~/var/pnp4nagios/perfdata -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; </code> If you have set up a new monitoring site with version 1.2.8, there are multi RRDs in use. If you want to clean up those files, please contact us with via your support address. The graphs of size and length of the queues have been adapted to correct this mistake. All several performance data is collected in one graph. --- .werks/2238 | 31 +++++++++++++++++++++++++++ ChangeLog | 1 + checks/postfix_mailq | 2 +- web/plugins/metrics/check_mk.py | 45 ++++++++++++++++++++++++++++----------- 4 files changed, 66 insertions(+), 13 deletions(-) diff --git a/.werks/2238 b/.werks/2238 new file mode 100644 index 0000000..5881b07 --- /dev/null +++ b/.werks/2238 @@ -0,0 +1,31 @@ +Title: postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464959618 + +Postfix mail queue check creates incorrect rrd data sources. This results in a lot of unnecessary rrd files. + +You can delete those files to save hard disc space. But keep in mind, that you will loose the historic +data. Graphs can have areas with missing data. + +Those files are stored at following locations: +<ul> + <li>~/var/check_mk/rrd</li> + <li>~/var/pnp4nagios/perfdata</li> +</ul> + +You can delete those files with those commands: +<code> + find ~/var/check_mk/rrd -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; + find ~/var/pnp4nagios/perfdata -type f -iname "postfix_mail_queue_*_size*" -exec rm '{}' \; +</code> + +If you have set up a new monitoring site with version 1.2.8, there are multi RRDs in use. +If you want to clean up those files, please contact us with via your support address. + +The graphs of size and length of the queues have been adapted to correct this mistake. +All several performance data is collected in one graph. diff --git a/ChangeLog b/ChangeLog index 304012e..e501858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -256,6 +256,7 @@ * 3584 FIX: check_mkevents: Fixed "failed to parse perfdata" errors in web.log caused by "Events" checks... * 3587 FIX: SNMP: Fixed possible random IO issues when using classic SNMP... * 3619 FIX: esx_vsphere_vm.mem_usage: add missing declaration for metrics, use correct unit + * 2238 FIX: postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/postfix_mailq b/checks/postfix_mailq index 619427d..19addc4 100644 --- a/checks/postfix_mailq +++ b/checks/postfix_mailq @@ -110,7 +110,7 @@ def check_postfix_mailq(_no_item, params, info): size_var = "size" else: length_var = "mail_queue_%s_length" % queue - size_var = "mail_queue_%s_size" % size + size_var = "mail_queue_%s_size" % queue if queue in params: warn, crit = params[queue] if length >= crit: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d7c0be8..170aac6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2262,28 +2262,34 @@ metric_info["call_legs"] = { "color" : "#60bbbb", } +metric_info["mails_received_time"] = { + "title" : _("Received mails"), + "unit" : "s", + "color" : "31/a", +} + metric_info["mail_queue_deferred_length"] = { "title" : _("Length of deferred mail queue"), "unit" : "count", "color" : "#40a0b0", } -metric_info["mails_received_time"] = { - "title" : _("Received mails"), - "unit" : "s", - "color" : "31/a", +metric_info["mail_queue_active_length"] = { + "title" : _("Length of active mail queue"), + "unit" : "count", + "color" : "#ff6000", } metric_info["mail_queue_deferred_size"] = { "title" : _("Size of deferred mail queue"), "unit" : "bytes", - "color" : "#402010", + "color" : "43/a", } -metric_info["mail_queue_active_length"] = { - "title" : _("Length of active mail queue"), - "unit" : "count", - "color" : "#ff6000", +metric_info["mail_queue_active_size"] = { + "title" : _("Size of active mail queue"), + "unit" : "bytes", + "color" : "31/a", } metric_info["messages_inbound"] = { @@ -3487,6 +3493,13 @@ check_metrics["check_mk-citrix_serverload"] = { "perf" : { "name" : "citrix_load", "scale" : 0.01 } } +check_metrics["check_mk-postfix_mailq"] = { + "length" : { "name" : "mail_queue_deferred_length" }, + "size" : { "name" : "mail_queue_deferred_size" }, + "~mail_queue_.*_size" : { "name" : "mail_queue_active_size" }, + "~mail_queue_.*_length" : { "name" : "mail_queue_active_length" }, +} + check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } @@ -6486,10 +6499,18 @@ graph_info.append({ }) graph_info.append({ - "title" : _("Outgoing Mails"), + "title" : _("Amount of mails in queues"), + "metrics" : [ + ( "mail_queue_deferred_length", "stack" ), + ( "mail_queue_active_length", "stack" ), + ], +}) + +graph_info.append({ + "title" : _("Size of mails in queues"), "metrics" : [ - ( "mail_queue_deferred_length", "stack" ), - ( "mail_queue_active_length", "stack" ), + ( "mail_queue_deferred_size", "stack" ), + ( "mail_queue_active_size", "stack" ), ], })

8 years, 1 month

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016