Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable

by Simon Betz

Module: check_mk Branch: master Commit: fa2801b2ebf1b985a38a2f828e8024fed04d7bd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa2801b2ebf1b9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 23 13:49:41 2016 +0200 3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable --- .werks/3609 | 9 +++++++ ChangeLog | 1 + checkman/apc_rackpdu_power | 15 +++++------ checks/apc_rackpdu_power | 61 +++++++++++++++++++++++--------------------- 4 files changed, 48 insertions(+), 38 deletions(-) diff --git a/.werks/3609 b/.werks/3609 new file mode 100644 index 0000000..c422ac9 --- /dev/null +++ b/.werks/3609 @@ -0,0 +1,9 @@ +Title: apc_rackpdu_power: now upper levels for electrical current are confiugurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1464004147 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 012fc5a..abbb911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * 3533 rds_licenses: Monitors used remote desktop licenses... * 3606 saprouter_cert: new check which monitors the age of validity of a SAP router certificate... * 3135 skype, skype.xmpp_proxy, skype.conferencing, skype.sip_stack: added furter metrics and adjusted default levels + * 3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable * 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/checkman/apc_rackpdu_power b/checkman/apc_rackpdu_power index 00233fd..8e79581 100644 --- a/checkman/apc_rackpdu_power +++ b/checkman/apc_rackpdu_power @@ -1,20 +1,17 @@ -title: APC PDU: Power and Voltage +title: APC PDU: electrical current agents: snmp catalog: hw/power/apc license: GPL distribution: check_mk description: - Monitors Power and Voltage on APC PDU Units. - This check will alert if the amperage on the input exceeds - the limit reported by the PDU. It knows either {OK} or {CRIT} - states. + This check monitors the electrical current of APC PDU units. + + The device sends thresholds WARN and CRIT itself. If one of these + will be excedeed then the check goes WARN or CRIT. Otherwise it is OK. + There are no default levels. Upper levels can be configured. item: The name of the PDU as set in the PDU -perfdata: - Amps, defined MAX Amp value - inventory: One service per PDU - diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index 094f385..8eeb397 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -24,42 +24,45 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - # Originally written / contributed by Dave Cundiff +# .1.3.6.1.4.1.318.1.1.12.1.1.0 "sf9pdu1" --> PowerNet-MIB::rPDUIdentName.0 +# .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 160 --> PowerNet-MIB::rPDULoadStatusLoad.1 (measured in tenths of Amps) +# .1.3.6.1.4.1.318.1.1.12.2.2.1.1.3.1 12 --> PowerNet-MIB::rPDULoadPhaseConfigNearOverloadThreshold.phase1 +# .1.3.6.1.4.1.318.1.1.12.2.2.1.1.4.1 16 --> PowerNet-MIB::rPDULoadPhaseConfigOverloadThreshold.phase1 + -def inventory_apc_rackpdu_power(checkname, info): - inventory = [] - for host, amperage, min, max in info: - inventory.append((host, None)) - return inventory +def parse_apc_rackpdu_power(info): + parsed = {} + for host, amperage_str, warn, crit in info: + amperage = float(amperage_str) / 10 + if amperage >= int(crit): + status_info = (amperage, (2, "crit exceeded")) + elif amperage >= int(warn): + status_info = (amperage, (1, "warn exceeded")) + else: + status_info = amperage -def check_apc_rackpdu_power(item, _no_params, info): - for host, raw_amperage, min, max in info: - amperage = float(raw_amperage) / 10 - if host == item: - perfdata = [ ( "amperage", amperage, max ) ] - if amperage >= max: - return (2, "Amperage: %f - Overload possible" % amperage, perfdata) - else: - return (0, "Amperage: %f" % amperage, perfdata) + parsed.setdefault(host, {"current" : status_info}) + return parsed -# Look for the APC management module and then dive into it's rackpdu tree check_info["apc_rackpdu_power"] = { - 'check_function': check_apc_rackpdu_power, - 'inventory_function': inventory_apc_rackpdu_power, - 'service_description': 'PDU %s', - 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.318.1.1.12', [ - '1.1.0', - '2.3.1.1.2.1', - '2.2.1.1.3.1', - '2.2.1.1.4.1' - ]), - 'snmp_scan_function': lambda oid: \ - oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp") \ - and oid(".1.3.6.1.4.1.318.1.1.12.1.1.0"), + 'parse_function' : parse_apc_rackpdu_power, + 'inventory_function' : inventory_elphase, + 'check_function' : check_elphase, + 'service_description' : 'PDU %s', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.4.1.318.1.1.12', [ + '1.1.0', # PowerNet-MIB::rPDUIdentName + '2.3.1.1.2.1', # PowerNet-MIB::rPDULoadStatusLoad + '2.2.1.1.3.1', # PowerNet-MIB::rPDULoadPhaseConfigNearOverloadThreshold + '2.2.1.1.4.1', # PowerNet-MIB::rPDULoadPhaseConfigOverloadThreshold + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp") and \ + oid(".1.3.6.1.4.1.318.1.1.12.1.1.0"), + 'group' : 'el_inphase', + 'includes' : [ 'elphase.include' ], }

8 years, 1 month

3135 skype, skype.xmpp_proxy, skype.conferencing, skype.sip_stack: added furter metrics and adjusted default levels

by Sebastian Herbord

Module: check_mk Branch: master Commit: cab74b6bec815201d1f49b724f726dbd32751e31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab74b6bec8152… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon May 23 13:38:07 2016 +0200 3135 skype, skype.xmpp_proxy, skype.conferencing, skype.sip_stack: added furter metrics and adjusted default levels --- .werks/3135 | 9 ++ ChangeLog | 1 + checkman/skype.conferencing | 14 +++ checkman/skype.xmpp_proxy | 14 +++ checks/skype | 135 +++++++++++++++++++++++--- checks/wmi.include | 4 +- web/plugins/metrics/check_mk.py | 73 +++++++++++++- web/plugins/wato/check_parameters.py | 174 ++++++++++++++++++++++++++++++++-- 8 files changed, 400 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cab74b6bec…

8 years, 1 month

Fixed missing spaces in help text of ACME agent

by Mathias Kettner

Module: check_mk Branch: master Commit: daf5ef01b034bfe3d53c2ab8e5a10c5c817df3ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daf5ef01b034bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 11:38:20 2016 +0200 Fixed missing spaces in help text of ACME agent --- web/plugins/wato/datasource_programs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 0a79132..bcaef33 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -456,10 +456,9 @@ register_rule(group, FixedValue( {}, title = _("Check ACME Session Border Controller"), - help = _("This rule activates an agent who connects" - "to an ACME Session Border Controller (SBC). This agent uses SSH, this" - "means that you have to exchange an SSH key to make a passwordless" - "connect possible"), + help = _("This rule activates an agent which connects " + "to an ACME Session Border Controller (SBC). This agent uses SSH, so " + "you have to exchange an SSH key to make a passwordless connect possible."), totext = _("Connect to ACME SBC"), ), factory_default = FACTORY_DEFAULT_UNUSED, # No default, do not use setting if no rule matches

8 years, 1 month

mssql_counters: a few more counters now include warn/ crit in their perfdata

by Sebastian Herbord

Module: check_mk Branch: master Commit: 610a9b3119517635ca211f039294847f45168af0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=610a9b31195176… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon May 23 10:54:59 2016 +0200 mssql_counters: a few more counters now include warn/crit in their perfdata --- checks/mssql_counters | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 5bb9861..bea2a22 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -249,8 +249,6 @@ def check_mssql_counters_sqlstats(item, params, info): status = 0 infotext = "%.1f/sec" % rate - perfdata = [ (counter_type, rate) ] - if params.get(counter_type): warn, crit = params[counter_type] levelstext = " (warn/crit at %.1f/%.1f per second)" % (warn, crit) @@ -260,6 +258,9 @@ def check_mssql_counters_sqlstats(item, params, info): elif rate >= warn: status = 1 infotext += levelstext + perfdata = [ (counter_type, rate, warn, crit) ] + else: + perfdata = [ (counter_type, rate) ] return status, infotext, perfdata @@ -298,7 +299,6 @@ def check_mssql_counters_pageactivity(item, params, info): rate = get_rate(countername, now, reading) state = 0 infotext = "%s %.1f/sec" % (label, rate) - perfdata = [ (counter, rate) ] if params.get(counter): warn, crit = params[counter] @@ -309,6 +309,10 @@ def check_mssql_counters_pageactivity(item, params, info): elif rate >= warn: state = 1 infotext += levelstext + perfdata = [ (counter, rate, warn, crit) ] + else: + perfdata = [ (counter, rate) ] + yield state, infotext, perfdata

8 years, 1 month

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: f9dd882cf4b4d361e7c1a6a6539b2772485531be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9dd882cf4b4d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 20 15:36:11 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/TableEventConsole.h | 7 +++++-- livestatus/src/TableEventConsoleEvents.cc | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index f6f4314..9fbe442 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -129,13 +129,16 @@ protected: public: ListEventConsoleColumn(std::string name, std::string description) : ListColumn(name, description, -1, -1) - , _ecc(name, _column_t(), - [](std::string x) { return split(x, '\001'); }) {} + , _ecc(name, _column_t(), [](std::string x) { + return x.empty() || x == "\002" ? _column_t() + : split(x.substr(1), '\001'); + }) {} void output(void *data, Query *query) override { query->outputBeginList(); bool first = true; for (const auto &elem : _ecc.getValue(data)) { + printf("-------------------- [%s]\n", elem.c_str()); if (first) { first = false; } else { diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 656d26f..083687d 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -70,8 +70,8 @@ void TableEventConsoleEvents::addColumns(Table *table) { new StringEventConsoleColumn("event_owner", "The owner of the event")); table->addColumn(new ListEventConsoleColumn( "event_match_groups", "Text groups from regular expression match")); - table->addColumn(new StringEventConsoleColumn("event_contact_groups", - "Contact groups")); // list + table->addColumn( + new ListEventConsoleColumn("event_contact_groups", "Contact groups")); table->addColumn(new StringEventConsoleColumn( "event_ipaddress", "The IP address where the event originated")); }

8 years, 1 month

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 9230ef40c0c30e86ce85ffab17b70d4899e0adb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9230ef40c0c30e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 20 14:57:19 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/TableEventConsole.cc | 10 +++---- livestatus/src/TableEventConsole.h | 41 ++++++++++++++++++++++++++++- livestatus/src/TableEventConsoleEvents.cc | 6 ++--- livestatus/src/TableEventConsoleEvents.h | 1 + 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index daca67c..1121a8b 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -67,8 +67,10 @@ string readLine(int sock) { } while (true); return line; // unreachable } +}; // namespace -vector<string> split(string str, char delimiter = '\t') { +// static +vector<string> TableEventConsole::split(string str, char delimiter) { istringstream iss(str); vector<string> result; string field; @@ -78,8 +80,6 @@ vector<string> split(string str, char delimiter = '\t') { return result; } -}; // namespace - void TableEventConsole::answerQuery(Query *query) { string path = "/omd/sites/heute/tmp/run/mkeventd/status"; int sock = socket(PF_LOCAL, SOCK_STREAM, 0); @@ -125,7 +125,7 @@ void TableEventConsole::answerQuery(Query *query) { bytes_to_write -= bytes_written; } - vector<string> headers = split(readLine(sock)); + vector<string> headers = split(readLine(sock), '\t'); do { string line = readLine(sock); @@ -134,7 +134,7 @@ void TableEventConsole::answerQuery(Query *query) { } _row_t row; int i = 0; - for (const auto &field : split(line)) { + for (const auto &field : split(line, '\t')) { logger(LOG_DEBUG, "setting EC column \"%s\" to \"%s\"", headers[i].c_str(), field.c_str()); row[headers[i++]] = field; diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 347becb..f6f4314 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -32,12 +32,14 @@ #include <functional> #include <map> #include <string> +#include <vector> #include "DoubleColumn.h" #include "IntColumn.h" +#include "ListColumn.h" #include "OffsetTimeColumn.h" +#include "Query.h" #include "StringColumn.h" #include "Table.h" -class Query; class TableEventConsole : public Table { public: @@ -46,6 +48,9 @@ public: protected: typedef std::map<std::string, std::string> _row_t; + // TODO(sp) Move this to some helper. + static std::vector<std::string> split(std::string str, char delimiter); + template <typename T> class EventConsoleColumn { std::string _name; @@ -116,6 +121,40 @@ protected: return _ecc.getValue(data); } }; + + class ListEventConsoleColumn : public ListColumn { + typedef std::vector<std::string> _column_t; + EventConsoleColumn<_column_t> _ecc; + + public: + ListEventConsoleColumn(std::string name, std::string description) + : ListColumn(name, description, -1, -1) + , _ecc(name, _column_t(), + [](std::string x) { return split(x, '\001'); }) {} + + void output(void *data, Query *query) override { + query->outputBeginList(); + bool first = true; + for (const auto &elem : _ecc.getValue(data)) { + if (first) { + first = false; + } else { + query->outputListSeparator(); + } + query->outputString(elem.c_str()); + } + query->outputEndList(); + } + + bool isEmpty(void *data) override { + return _ecc.getValue(data).empty(); + } + + // TODO(sp) We should probably rename the methods below and actually + // implement them here for real. + void *getNagiosObject(char *) override { return nullptr; } + bool isNagiosMember(void *, void *) override { return false; } + }; }; #endif // TableEventConsole_h diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 1361de1..656d26f 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleEvents.h" +#include "Table.h" TableEventConsoleEvents::TableEventConsoleEvents() { addColumns(this); } @@ -67,9 +68,8 @@ void TableEventConsoleEvents::addColumns(Table *table) { "of open/closed/delayed/counting/ack)")); table->addColumn( new StringEventConsoleColumn("event_owner", "The owner of the event")); - table->addColumn(new StringEventConsoleColumn( - "event_match_groups", - "Text groups from regular expression match")); // list + table->addColumn(new ListEventConsoleColumn( + "event_match_groups", "Text groups from regular expression match")); table->addColumn(new StringEventConsoleColumn("event_contact_groups", "Contact groups")); // list table->addColumn(new StringEventConsoleColumn( diff --git a/livestatus/src/TableEventConsoleEvents.h b/livestatus/src/TableEventConsoleEvents.h index 80b174c..287d7f2 100644 --- a/livestatus/src/TableEventConsoleEvents.h +++ b/livestatus/src/TableEventConsoleEvents.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include "TableEventConsole.h" +class Table; class TableEventConsoleEvents : public TableEventConsole { public:

8 years, 1 month

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 6d1cb096fae43b0c7ab86cd58a8f4c0f3460ec7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d1cb096fae43b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 20 13:42:34 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/Store.h | 1 + livestatus/src/TableEventConsoleEvents.cc | 71 ++++++++++++++++++++-------- livestatus/src/TableEventConsoleEvents.h | 2 + livestatus/src/TableEventConsoleHistory.cc | 42 +++++++--------- 4 files changed, 70 insertions(+), 46 deletions(-) diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 88893f0..26f6a2c 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -92,6 +92,7 @@ private: TableEventConsoleStatus _table_eventconsolestatus; std::map<std::string, Table *> _tables; + std::mutex _command_mutex; void addTable(Table *table); diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index ef20056..1361de1 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -24,27 +24,56 @@ #include "TableEventConsoleEvents.h" -TableEventConsoleEvents::TableEventConsoleEvents() { - addColumn(new StringEventConsoleColumn("event_id", "blah")); - addColumn(new StringEventConsoleColumn("event_count", "blah")); - addColumn(new StringEventConsoleColumn("event_text", "blah")); - addColumn(new StringEventConsoleColumn("event_first", "blah")); - addColumn(new StringEventConsoleColumn("event_last", "blah")); - addColumn(new StringEventConsoleColumn("event_comment", "blah")); - addColumn(new StringEventConsoleColumn("event_sl", "blah")); - addColumn(new StringEventConsoleColumn("event_host", "blah")); - addColumn(new StringEventConsoleColumn("event_contact", "blah")); - addColumn(new StringEventConsoleColumn("event_application", "blah")); - addColumn(new StringEventConsoleColumn("event_pid", "blah")); - addColumn(new StringEventConsoleColumn("event_priority", "blah")); - addColumn(new StringEventConsoleColumn("event_facility", "blah")); - addColumn(new StringEventConsoleColumn("event_rule_id", "blah")); - addColumn(new StringEventConsoleColumn("event_state", "blah")); - addColumn(new StringEventConsoleColumn("event_phase", "blah")); - addColumn(new StringEventConsoleColumn("event_owner", "blah")); - addColumn(new StringEventConsoleColumn("event_match_groups", "blah")); - addColumn(new StringEventConsoleColumn("event_contact_groups", "blah")); - addColumn(new StringEventConsoleColumn("event_ipaddress", "blah")); +TableEventConsoleEvents::TableEventConsoleEvents() { addColumns(this); } + +// static +void TableEventConsoleEvents::addColumns(Table *table) { + table->addColumn( + new IntEventConsoleColumn("event_id", "The unique ID for this event")); + table->addColumn(new IntEventConsoleColumn( + "event_count", + "The number of occurrences of this event within period")); + table->addColumn(new StringEventConsoleColumn( + "event_text", "The textual description of the event")); + table->addColumn(new TimeEventConsoleColumn( + "event_first", + "Time of the first occurrence of the event (Unix timestamp)")); + table->addColumn(new TimeEventConsoleColumn( + "event_last", + "Time of the last occurrence of this event (Unix timestamp)")); + table->addColumn( + new StringEventConsoleColumn("event_comment", "Event comment")); + table->addColumn(new IntEventConsoleColumn( + "event_sl", "The service level for this event")); + table->addColumn( + new StringEventConsoleColumn("event_host", "Host name for this event")); + table->addColumn( + new StringEventConsoleColumn("event_contact", "Contact information")); + table->addColumn(new StringEventConsoleColumn("event_application", + "Syslog tag/application")); + table->addColumn(new IntEventConsoleColumn( + "event_pid", "The process ID of the originating process")); + table->addColumn( + new IntEventConsoleColumn("event_priority", "Syslog priority")); + table->addColumn( + new IntEventConsoleColumn("event_facility", "Syslog facility")); + table->addColumn( + new StringEventConsoleColumn("event_rule_id", "The ID of the rule")); + table->addColumn(new IntEventConsoleColumn( + "event_state", "The state of the event (0/1/2/3)")); + table->addColumn( + new StringEventConsoleColumn("event_phase", + "The phase the event is currently in (one " + "of open/closed/delayed/counting/ack)")); + table->addColumn( + new StringEventConsoleColumn("event_owner", "The owner of the event")); + table->addColumn(new StringEventConsoleColumn( + "event_match_groups", + "Text groups from regular expression match")); // list + table->addColumn(new StringEventConsoleColumn("event_contact_groups", + "Contact groups")); // list + table->addColumn(new StringEventConsoleColumn( + "event_ipaddress", "The IP address where the event originated")); } const char *TableEventConsoleEvents::name() const { diff --git a/livestatus/src/TableEventConsoleEvents.h b/livestatus/src/TableEventConsoleEvents.h index d345adb..80b174c 100644 --- a/livestatus/src/TableEventConsoleEvents.h +++ b/livestatus/src/TableEventConsoleEvents.h @@ -33,6 +33,8 @@ public: TableEventConsoleEvents(); const char *name() const override; const char *namePrefix() const override; + + static void addColumns(Table *table); }; #endif // TableEventConsoleEvents_h diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index a76c32a..9ba3e1b 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -23,33 +23,25 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleHistory.h" +#include "TableEventConsoleEvents.h" TableEventConsoleHistory::TableEventConsoleHistory() { - addColumn(new StringEventConsoleColumn("history_line", "blah")); - addColumn(new StringEventConsoleColumn("history_time", "blah")); - addColumn(new StringEventConsoleColumn("history_what", "blah")); - addColumn(new StringEventConsoleColumn("history_who", "blah")); - addColumn(new StringEventConsoleColumn("history_addinfo", "blah")); - addColumn(new StringEventConsoleColumn("event_id", "blah")); - addColumn(new StringEventConsoleColumn("event_count", "blah")); - addColumn(new StringEventConsoleColumn("event_text", "blah")); - addColumn(new StringEventConsoleColumn("event_first", "blah")); - addColumn(new StringEventConsoleColumn("event_last", "blah")); - addColumn(new StringEventConsoleColumn("event_comment", "blah")); - addColumn(new StringEventConsoleColumn("event_sl", "blah")); - addColumn(new StringEventConsoleColumn("event_host", "blah")); - addColumn(new StringEventConsoleColumn("event_contact", "blah")); - addColumn(new StringEventConsoleColumn("event_application", "blah")); - addColumn(new StringEventConsoleColumn("event_pid", "blah")); - addColumn(new StringEventConsoleColumn("event_priority", "blah")); - addColumn(new StringEventConsoleColumn("event_facility", "blah")); - addColumn(new StringEventConsoleColumn("event_rule_id", "blah")); - addColumn(new StringEventConsoleColumn("event_state", "blah")); - addColumn(new StringEventConsoleColumn("event_phase", "blah")); - addColumn(new StringEventConsoleColumn("event_owner", "blah")); - addColumn(new StringEventConsoleColumn("event_match_groups", "blah")); - addColumn(new StringEventConsoleColumn("event_contact_groups", "blah")); - addColumn(new StringEventConsoleColumn("event_ipaddress", "blah")); + addColumn(new IntEventConsoleColumn( + "history_line", "The line number of the event in the history file")); + addColumn(new TimeEventConsoleColumn("history_time", + "Time when the event was written into " + "the history file (Unix timestamp)")); + addColumn(new StringEventConsoleColumn( + "history_what", + "What happened (one of " + "ARCHIVED/AUTODELETE/CANCELLED/CHANGESTATE/COUNTFAILED/COUNTREACHED/" + "DELAYOVER/DELETE/EMAIL/EXPIRED/NEW/NOCOUNT/ORPHANED/SCRIPT/UPDATE)")); + addColumn(new StringEventConsoleColumn( + "history_who", "The user who triggered the command")); + addColumn(new StringEventConsoleColumn( + "history_addinfo", + "Additional information, like email recipient/subject or action ID")); + TableEventConsoleEvents::addColumns(this); } const char *TableEventConsoleHistory::name() const {

8 years, 1 month

3613 FIX Fix vertical scaling of graph for disk utilization from 0...1% to 0...100%

by Mathias Kettner

Module: check_mk Branch: master Commit: c8646e60687c2a34d161e82cb4cf09c14ae5400b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8646e60687c2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 20 12:13:16 2016 +0200 3613 FIX Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% --- .werks/3613 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3613 b/.werks/3613 new file mode 100644 index 0000000..931a5ee --- /dev/null +++ b/.werks/3613 @@ -0,0 +1,10 @@ +Title: Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1463739171 + + diff --git a/ChangeLog b/ChangeLog index 2615aad..c20e66f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -227,6 +227,7 @@ * 3604 FIX: ups_capacity.include: fixed displaying wrong levels and cleanup * 3605 FIX: kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: fixed discovery if data is wrong or incomplete * 3607 FIX: wut_webtherm: fixed missing sensor data if only decimal comma marked values are available + * 3613 FIX: Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 910aab1..37d96ed 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5635,7 +5635,7 @@ graph_info.append({ "metrics" : [ ( "disk_utilization", "area" ), ], - "range" : (0, 1), + "range" : (0, 100), }) graph_info.append({

8 years, 1 month

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: d59c469a1cd3eea61e37a053d210db1abf29cc84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d59c469a1cd3ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 20 12:11:56 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 5abe252..8643b83 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3613 +3623

8 years, 1 month

fixed missing case

by Simon Betz

Module: check_mk Branch: master Commit: e6d93608cf49132bc1a8b06ab51c7e1ebd32bd5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d93608cf4913… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 20 11:27:19 2016 +0200 fixed missing case --- checks/wut_webtherm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 42dc58e..138660f 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -41,6 +41,8 @@ def parse_wut_webtherm(info): reading_str = reading_en elif reading_de: reading_str = reading_de.replace(",", ".") + else: + reading_str = "" webtherm_type, sensor_id = index.split(".") # Dependent on webtherm_type we have to determine

8 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
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