Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Availability annotations can now be used to reclassify downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f131f347c99189704f295ee8516b7ca01fac47c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f131f347c9918… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 16:59:12 2016 +0200 Availability annotations can now be used to reclassify downtimes Still some cases need to be fixed. To be continued tomorrow... --- web/htdocs/availability.py | 146 ++++++++++++++++++++++++++++++++- web/htdocs/images/icon_nodowntime.png | Bin 0 -> 4808 bytes web/plugins/views/availability.py | 142 ++++++++++++-------------------- 3 files changed, 197 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0f131f347c…

8 years, 5 months

Updated bug entries #2485, #2486, #2487

by Mathias Kettner

Module: check_mk Branch: master Commit: 478561a802ac806c0371931a9b397f6a3dc8101f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=478561a802ac80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 16:51:23 2016 +0200 Updated bug entries #2485, #2486, #2487 --- .bugs/2485 | 9 +++++++++ .bugs/2486 | 9 +++++++++ .bugs/2487 | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/.bugs/2485 b/.bugs/2485 new file mode 100644 index 0000000..35bfb09 --- /dev/null +++ b/.bugs/2485 @@ -0,0 +1,9 @@ +Title: statehist_annotation.mk must not be in var/check_mk/web +Component: multisite +State: open +Date: 2016-04-07 13:32:15 +Targetversion: future +Class: bug + +This is a name space conflict. A user with the name statehist_annotation.mk +would conflict with this file! diff --git a/.bugs/2486 b/.bugs/2486 new file mode 100644 index 0000000..e5f990f --- /dev/null +++ b/.bugs/2486 @@ -0,0 +1,9 @@ +Title: Availablity: visual levels do check themselves when working with annotations +Component: multisite +State: open +Date: 2016-04-07 16:49:26 +Targetversion: 1.2.8 +Class: bug + +As ist seems if you edit annotations or stuff like that then suddenly the visual +levels for availability are activated. Is this a name clash in an HTML variable? diff --git a/.bugs/2487 b/.bugs/2487 new file mode 100644 index 0000000..775ec15 --- /dev/null +++ b/.bugs/2487 @@ -0,0 +1,10 @@ +Title: Availability: Changing time range of an annotation duplicates it +Component: multisite +State: open +Date: 2016-04-07 16:50:29 +Targetversion: 1.2.8 +Class: bug + +The start/end is used as a key. If you edit an existing annotation and +change one of those - Check_MK thinks you are creating a new one and +creates a duplicate entry.

8 years, 5 months

Updated bug entries #2485

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e00a2482f0911627bb88484015a5a3ca3f86267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e00a2482f0911… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 16:51:40 2016 +0200 Updated bug entries #2485 --- .bugs/2485 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2485 b/.bugs/2485 index 35bfb09..78dc5fd 100644 --- a/.bugs/2485 +++ b/.bugs/2485 @@ -1,9 +1,11 @@ Title: statehist_annotation.mk must not be in var/check_mk/web Component: multisite -State: open +Class: bug +State: done Date: 2016-04-07 13:32:15 Targetversion: future -Class: bug This is a name space conflict. A user with the name statehist_annotation.mk would conflict with this file! + +2016-04-07 16:51:38: changed state open -> done

8 years, 5 months

3374 FIX Fixed broken Logwatch page when a host has no log directory (yet)

by Lars Michelsen

Module: check_mk Branch: master Commit: 26e57854fb68b9db8a7c7dc5840e8cb20596a462 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e57854fb68b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 7 16:43:45 2016 +0200 3374 FIX Fixed broken Logwatch page when a host has no log directory (yet) --- .werks/3374 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 15 +++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/3374 b/.werks/3374 new file mode 100644 index 0000000..79df35d --- /dev/null +++ b/.werks/3374 @@ -0,0 +1,10 @@ +Title: Fixed broken Logwatch page when a host has no log directory (yet) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460040199 + + diff --git a/ChangeLog b/ChangeLog index 0b56b60..555a0e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 3326 FIX: Fixed white text on white background in mobile GUI * 3327 FIX: Disallow scheduling downtimes with an end date that is before the start date * 3373 FIX: Fixed exception when handling syntax errors while loading pagetype files + * 3374 FIX: Fixed broken Logwatch page when a host has no log directory (yet) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 00870ef..73cbec9 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -54,13 +54,14 @@ def level_state(level): # '----------------------------------------------------------------------' def page_show(): - host = html.var('host') - filename = html.var('file') - if "/" in host: - return + host = html.var("host", "") + filename = html.var("file", "") # Fix problem when URL is missing certain illegal characters - filename = form_file_to_ext(find_matching_logfile(host, form_file_to_int(filename))) + try: + filename = form_file_to_ext(find_matching_logfile(host, form_file_to_int(filename))) + except OSError: + pass # host log dir does not exist # Acknowledging logs is supported on # a) all logs on all hosts @@ -153,7 +154,9 @@ def list_logs(host, logfiles): (form_datetime(last_log['datetime']), len(logs))) if rowno == 0: - html.write('<tr><td class="data" colspan=4>'+_('No logs found for this host.')+'</td></tr>\n') + html.write('<tr><td class="data" colspan=4>') + html.message(_('No logs found for this host.')) + html.write('</td></tr>\n') def ack_button(host = None, int_filename = None):

8 years, 5 months

Simplified and cleaned up Table interface.

by Sven Panne

Module: check_mk Branch: master Commit: e3a7cf22249f22614ec60c4988496c977f83e069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a7cf22249f22… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 7 16:24:16 2016 +0200 Simplified and cleaned up Table interface. Following item 28 from Scott Meyer's "Effective C++" ('Avoid returning "handles" to object internals.'), Table::columns has been replaced the new safe and more versatile Table::any_column member function. Luckily enough, this opened up the possibility to nuke 2 more member functions and 2 typedefs. Made Table::dynamicColumn private on the way, it's just used internally. --- livestatus/src/Query.cc | 2 +- livestatus/src/Table.cc | 18 ------------------ livestatus/src/Table.h | 29 +++++++++++++++++------------ livestatus/src/TableColumns.cc | 10 ++-------- 4 files changed, 20 insertions(+), 39 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 4f49d33..abb0b15 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -171,7 +171,7 @@ Query::Query(const list<string> &lines, OutputBuffer *output, Table *table) } if (_columns.empty() && !doStats()) { - table->addAllColumnsToQuery(this); + table->any_column([this](Column *c) { return addColumn(c), false; }); // TODO(sp) We overwrite the value from a possible ColumnHeaders: line // here, is that really what we want? _show_column_headers = true; diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 9dc84e8..dc415fe 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -24,10 +24,8 @@ #include "Table.h" #include <string.h> -#include <utility> #include "Column.h" #include "DynamicColumn.h" -#include "Query.h" using std::make_pair; using std::string; @@ -58,12 +56,6 @@ Table::~Table() { } } -void Table::addAllColumnsToQuery(Query *q) { - for (auto &column : _columns) { - q->addColumn(column.second); - } -} - Column *Table::column(const char *colname) { // We allow the name of the table to be // prefixed to the column name. So if we @@ -116,13 +108,3 @@ Column *Table::dynamicColumn(const char *colname_with_args) { } return nullptr; } - -bool Table::hasColumn(Column *col) { - // this is not very efficient but seldomly used - for (auto &column : _columns) { - if (col == column.second) { - return true; - } - } - return false; -} diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index bd6717c..9b1da6d 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -28,6 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <map> #include <string> +#include <utility> #include "nagios.h" // IWYU pragma: keep class Column; class DynamicColumn; @@ -35,28 +36,32 @@ class Query; class Table { public: - typedef std::map<std::string, Column *> _columns_t; - typedef std::map<std::string, DynamicColumn *> _dynamic_columns_t; - -private: - _columns_t _columns; - _dynamic_columns_t _dynamic_columns; - -public: Table() {} virtual ~Table(); virtual Column *column(const char *colname); - Column *dynamicColumn(const char *colname_with_args); virtual void answerQuery(Query *) = 0; virtual const char *name() = 0; virtual const char *prefixname() { return name(); } virtual bool isAuthorized(contact *, void *) { return true; } virtual void *findObject(char *) { return nullptr; } void addColumn(Column *); - bool hasColumn(Column *); void addDynamicColumn(DynamicColumn *); - void addAllColumnsToQuery(Query *); - _columns_t *columns() { return &_columns; } + + template <typename Predicate> + bool any_column(Predicate pred) { + for (auto &c : _columns) { + if (pred(c.second)) { + return true; + } + } + return false; + } + +private: + Column *dynamicColumn(const char *colname_with_args); + + std::map<std::string, Column *> _columns; + std::map<std::string, DynamicColumn *> _dynamic_columns; }; #endif // Table_h diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 8aef372..3e95a86 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "TableColumns.h" -#include <utility> #include "Column.h" #include "ColumnsColumn.h" #include "Query.h" @@ -44,12 +43,7 @@ void TableColumns::addTable(Table *table) { _tables.push_back(table); } void TableColumns::answerQuery(Query *query) { for (auto table : _tables) { - Table::_columns_t *columns = table->columns(); - for (auto &column : *columns) { - if (!query->processDataset(column.second)) { - break; - } - } + table->any_column([&](Column *c) { return !query->processDataset(c); }); } } @@ -73,7 +67,7 @@ const char *TableColumns::getValue(Column *column, int colcol) { const char *TableColumns::tableNameOf(Column *column) { for (auto table : _tables) { - if (table->hasColumn(column)) { + if (table->any_column([&](Column *c) { return c == column; })) { return table->name(); } }

8 years, 5 months

Fixed wrong comment

by Lars Michelsen

Module: check_mk Branch: master Commit: 31de99ef77b6f3524c6b435fa104985934b2060a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31de99ef77b6f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 7 16:17:06 2016 +0200 Fixed wrong comment --- modules/check_mk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9e5df42..fc5a7c5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2090,8 +2090,9 @@ def lookup_ipv4_address(hostname): def lookup_ipv6_address(hostname): return lookup_ip_address(hostname, 6) -# Determine the IP address of a host. It returns either an IP address, -# or raise an exception when a hostname can not be resolved on the first +# Determine the IP address of a host. It returns either an IP address or, when +# a hostname is configured as IP address, the hostname. +# Or raise an exception when a hostname can not be resolved on the first # try to resolve a hostname. On later tries to resolve a hostname it # returns None instead of raising an exception. # FIXME: This different handling is bad. Clean this up!

8 years, 5 months

3312 check_ssh: service description can be set

by Simon Betz

Module: check_mk Branch: master Commit: f9dc314289c20c1a5589dc458249596987e67073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9dc314289c20c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 7 14:51:18 2016 +0200 3312 check_ssh: service description can be set --- .werks/3312 | 9 +++++++++ ChangeLog | 1 + checks/check_ssh | 11 ++++++++++- web/plugins/wato/active_checks.py | 4 ++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/3312 b/.werks/3312 new file mode 100644 index 0000000..c08d2bc --- /dev/null +++ b/.werks/3312 @@ -0,0 +1,9 @@ +Title: check_ssh: service description can be set +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1460033328 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 77a5276..0b56b60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 3109 dotnet_clrmemory: levels are now configurable * 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB * 3115 logwatch: made check cluster-able... + * 3312 check_ssh: service description can be set * 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/checks/check_ssh b/checks/check_ssh index 0e091d4..902e455 100644 --- a/checks/check_ssh +++ b/checks/check_ssh @@ -24,6 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def check_ssh_desc(params): + if params.get("description"): + return "SSH %s" % params["description"] + else: + return "SSH" + + def check_ssh_arguments(params): args = [] if 'timeout' in params: @@ -39,10 +47,11 @@ def check_ssh_arguments(params): return " ".join(args) + active_check_info['ssh'] = { "command_line" : '$USER1$/check_ssh $ARG1$', "argument_function" : check_ssh_arguments, - "service_description" : lambda args: "SSH", + "service_description" : check_ssh_desc, "has_perfdata" : True, } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index f9677ea..8bf83a2 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -186,6 +186,10 @@ register_rule(group, title = _("Check SSH service"), help = _("This rulset allow you to configure a SSH check for a host"), elements = [ + ( "description", + TextUnicode( + title = _("Service Description"), + )), ("port", Integer( title = _("TCP port number"),

8 years, 5 months

gitbug 2406

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8ff9aa12deef039b665c280f28a95494b679e2d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ff9aa12deef03… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 7 13:50:11 2016 +0200 gitbug 2406 --- .bugs/2406 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2406 b/.bugs/2406 new file mode 100644 index 0000000..d16c130 --- /dev/null +++ b/.bugs/2406 @@ -0,0 +1,8 @@ +Title: If var_dir is configured incorrectly, logging in notify helper (or other check_mk tools) doesn't work +Component: core +State: open +Date: 2016-04-07 13:45:58 +Targetversion: future +Class: nastiness + +Currently, if var_dir is invalid for any reason (which will actually happen if no defaults file is specified on the command line) then check_mk can't log any problems, including the fact that it's configuration is invalid. A fallback mechanism should be established to reliably report problems under all circumstances. \ No newline at end of file

8 years, 5 months

3115 logwatch: made check cluster-able

by Sebastian Herbord

Module: check_mk Branch: master Commit: 61413c69c9ddae0d559c2d97344b5efd6713c40c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61413c69c9ddae… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 7 13:34:50 2016 +0200 3115 logwatch: made check cluster-able Previously, if one tried to cluster a logwatch-service, only log entries from one node would be passed to the cluster. Another problem was that when re-scheduling checks on a cluster, the same log messages were re-read and transfered the the cluster log again. Both these problems are fixed now. --- .werks/3115 | 13 ++++++++++ ChangeLog | 1 + checks/logwatch | 76 ++++++++++++++++++++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.werks/3115 b/.werks/3115 new file mode 100644 index 0000000..6d22c14 --- /dev/null +++ b/.werks/3115 @@ -0,0 +1,13 @@ +Title: logwatch: made check cluster-able +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1460028648 +Class: feature + +Previously, if one tried to cluster a logwatch-service, only log entries from one node would be +passed to the cluster. +Another problem was that when re-scheduling checks on a cluster, the same log messages were re-read +and transfered the the cluster log again. +Both these problems are fixed now. diff --git a/ChangeLog b/ChangeLog index 8a3c0db..77a5276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ NOTE: Please refer to the migration notes! * 3109 dotnet_clrmemory: levels are now configurable * 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB + * 3115 logwatch: made check cluster-able... * 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/checks/logwatch b/checks/logwatch index 3cc8fad..0388b2a 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -67,7 +67,8 @@ def logwatch_select_forwarded(info): forward_settings = host_extra_conf(g_hostname, checkgroup_parameters.get('logwatch_ec', [])) for l in info: - line = " ".join(l) + # node info ignored (only used in regular logwatch check) + line = " ".join(l[1:]) if len(line) > 6 and line[0:3] == "[[[" and line[-3:] == "]]]" \ and ':missing' not in line and ':cannotopen' not in line: logfile_name = line[3:-3] @@ -236,31 +237,49 @@ def logwatch_parse_line(line): # without precompiled checks, the params must be None an will be # ignored. def check_logwatch(item, params, info): + def cachefile_path(node): + return tcp_cache_dir + "/" + node + + now = time.time() + last_run = get_item_state("logwatch_last_run_%s" % item, 0) + set_item_state("logwatch_last_run_%s" % item, now) + cache_new = {} + + def is_cache_new(node): + if node not in cache_new: + path = cachefile_path(node) + if not os.path.exists(path): + raise MKGeneralException("cache not found: %s" % path) + else: + cache_new[node] = os.stat(path).st_mtime > last_run + return cache_new[node] + if len(info) == 1: - line = " ".join(info[0]) + line = " ".join(info[0][1:]) if line.startswith("CANNOT READ CONFIG FILE"): return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) found = False loglines = [] for l in info: - line = " ".join(l) + node = l[0] + line = " ".join(l[1:]) if line == "[[[%s]]]" % item: found = True elif len(line) > 6 and line[0:3] == "[[[" and line[-3:] == "]]]": - if found: - break found = False - elif found: + elif found and is_cache_new(node): loglines.append(line) + return check_logwatch_generic(item, params, loglines, found) check_info['logwatch'] = { - 'check_function': check_logwatch, - 'inventory_function': inventory_logwatch, - 'service_description': "Log %s", - 'group': 'logwatch', + 'check_function' : check_logwatch, + 'inventory_function' : inventory_logwatch, + 'service_description' : "Log %s", + 'node_info' : True, + 'group' : 'logwatch', } precompile_params['logwatch'] = logwatch_precompile @@ -307,7 +326,7 @@ def inventory_logwatch_groups(info): def check_logwatch_groups(item, params, info): if len(info) == 1: - line = " ".join(info[0]) + line = " ".join(info[0][1:]) if line.startswith("CANNOT READ CONFIG FILE"): return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) @@ -315,7 +334,8 @@ def check_logwatch_groups(item, params, info): logfile_found = False loglines = [] for l in info: - line = " ".join(l) + # node info ignored (only used in regular logwatch check) + line = " ".join(l[1:]) if logfile_found == True and not line.startswith('[[['): loglines.append(line) if line.startswith('[[['): @@ -330,10 +350,11 @@ def check_logwatch_groups(item, params, info): check_info['logwatch.groups'] = { - 'check_function': check_logwatch_groups, - 'inventory_function': inventory_logwatch_groups, - 'service_description': "LOG %s", - 'group': 'logwatch', + 'check_function' : check_logwatch_groups, + 'inventory_function' : inventory_logwatch_groups, + 'service_description' : "LOG %s", + 'node_info' : True, + 'group' : 'logwatch', } precompile_params['logwatch.groups'] = logwatch_group_precompile #. @@ -635,7 +656,8 @@ def check_logwatch_ec(item, params, info): logs = {} logfile = None for l in info: - line = " ".join(l) + # node info ignored (only used in regular logwatch check) + line = " ".join(l[1:]) if len(line) > 6 and line[0:3] == "[[[" and line[-3:] == "]]]": # new logfile, extract name logfile = line[3:-3] @@ -856,16 +878,18 @@ precompile_params['logwatch.ec'] = logwatch_ec_precompile precompile_params['logwatch.ec_single'] = logwatch_ec_precompile check_info['logwatch.ec'] = { - 'check_function': check_logwatch_ec, - 'inventory_function': lambda info: inventory_logwatch_ec(info, False), - 'service_description': "Log Forwarding", - 'group': 'logwatch_ec', - 'has_perfdata': True, + 'check_function' : check_logwatch_ec, + 'inventory_function' : lambda info: inventory_logwatch_ec(info, False), + 'service_description' : "Log Forwarding", + 'group' : 'logwatch_ec', + 'node_info' : True, + 'has_perfdata' : True, } check_info['logwatch.ec_single'] = { - 'check_function': check_logwatch_ec, - 'inventory_function': lambda info: inventory_logwatch_ec(info, True), - 'service_description': "Log %s", - 'has_perfdata': True, + 'check_function' : check_logwatch_ec, + 'inventory_function' : lambda info: inventory_logwatch_ec(info, True), + 'service_description' : "Log %s", + 'node_info' : True, + 'has_perfdata' : True, }

8 years, 5 months

Cleaned up pagetypes subclassing

by Lars Michelsen

Module: check_mk Branch: master Commit: 04bff8838a880762b40433f3bc1202fab265740d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04bff8838a8807… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 17:35:50 2016 +0200 Cleaned up pagetypes subclassing --- web/htdocs/pagetypes.py | 18 ++++++++++++------ web/plugins/sidebar/shipped.py | 6 +----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index b7565db..304aa1f 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -34,8 +34,6 @@ try: except ImportError: import json -# TODO: Whey not user super() for calling the functions of all classes? - # .--Base----------------------------------------------------------------. # | ____ | # | | __ ) __ _ ___ ___ | @@ -48,8 +46,10 @@ except ImportError: # | or PageRenderer. | # '----------------------------------------------------------------------' -class Base: +class Base(object): def __init__(self, d): + super(Base, self).__init__() + # The dictionary with the name _ holds all information about # the page in question - as a dictionary that can be loaded # and saved to files using repr(). @@ -64,6 +64,7 @@ class Base: def internal_representation(self): return self._ + # You always must override the following method. Not all phrases # might be neccessary depending on the type of you page. # Possible phrases: @@ -253,6 +254,11 @@ class Base: return instance + @classmethod + def type_name(self): + raise NotImplementedError() + + #. # .--PageRenderer--------------------------------------------------------. # | ____ ____ _ | @@ -267,7 +273,7 @@ class Base: # | pages. # '----------------------------------------------------------------------' -class PageRenderer: +class PageRenderer(Base): # Stuff to be overridden by the implementation of actual page types # TODO: Das von graphs.py rauspfluecken. Also alles, was man @@ -353,7 +359,7 @@ class PageRenderer: # | Examples: views, dashboards, graphs collections | # '----------------------------------------------------------------------' -class Overridable: +class Overridable(Base): @classmethod def sanitize(self, d): d.setdefault("public", False) @@ -961,7 +967,7 @@ class Overridable: # | graphs. | # '----------------------------------------------------------------------' -class Container: +class Container(Base): @classmethod def sanitize(self, d): d.setdefault("elements", []) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 034a450..a29230a 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1060,11 +1060,7 @@ div.snapin table.master_control td img.iconbutton { # | Shareable lists of bookmarks | # '----------------------------------------------------------------------' -class BookmarkList(pagetypes.Overridable, pagetypes.Base): - def __init__(self, d): - pagetypes.Base.__init__(self, d) - - +class BookmarkList(pagetypes.Overridable): @classmethod def type_name(self): return "bookmark_list"

8 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016