Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: mk_oracle.aix: fix cache age computation, output cache meta information

by Mathias Kettner

Module: check_mk Branch: master Commit: f3d1a82acfb348843e60aadc715e0eeb2af5d3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3d1a82acfb348… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 18 15:33:03 2015 +0200 mk_oracle.aix: fix cache age computation, output cache meta information --- agents/plugins/mk_oracle.aix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index cd2389d..fb1a1f6 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -948,8 +948,8 @@ export -f sqlplus_internal export -f do_async_checks export -f set_oraenv -function file_age() { - /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($^T-$mtime);' "$1" +function file_mtime() { + /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($mtime);' "$1" } function run_cached_local () { @@ -967,7 +967,7 @@ function run_cached_local () { # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE local NOW=$(date +%s) if [ -e "$CACHEFILE.new" ] ; then - CF_ATIME=$(file_age "$CACHEFILE.new") + CF_ATIME=$(file_mtime "$CACHEFILE.new") if [ $((NOW - CF_ATIME)) -ge $((MAXAGE * 2)) ] ; then # Kill the process still accessing that file in case # it is still running. This avoids overlapping processes! @@ -979,11 +979,11 @@ function run_cached_local () { # Check if cache file exists and is recent enough if [ -s "$CACHEFILE" ] ; then - MTIME=$(file_age "$CACHEFILE") + MTIME=$(file_mtime "$CACHEFILE") if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + sed "/^<<</s/>>>$/:cached($MTIME,$MAXAGE)>>>/" "$CACHEFILE" fi # Cache file outdated and new job not yet running? Start it

9 years, 1 month

Check_MK Git: check_mk: #2229 Do not fail on non-existing Livestatus columns any longer, output None or null instead

by Mathias Kettner

Module: check_mk Branch: master Commit: ac3ae91d9c47f972ab691347545966ae4e669b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac3ae91d9c47f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 18 10:01:08 2015 +0200 #2229 Do not fail on non-existing Livestatus columns any longer, output None or null instead When you ask for a column that does not exist in your Livestatus version, now this is not considered as a fatal error any longer but just being logged as a warning. Instead an empty string (CSV), <tt>None</tt> (Python) or <tt>null</tt> (JSON) is being returned. This makes it easier for GUIs to maintain compatibility with existing Livestatus version when new features are implemented that make use of new Livestatus columns. --- .werks/2229 | 13 +++++++++++++ ChangeLog | 1 + livestatus/src/Column.h | 1 + livestatus/src/Makefile.am | 2 +- livestatus/src/NullColumn.cc | 31 +++++++++++++++++++++++++++++++ livestatus/src/NullColumn.h | 41 +++++++++++++++++++++++++++++++++++++++++ livestatus/src/Query.cc | 34 +++++++++++++++++++++------------- livestatus/src/Query.h | 1 + 8 files changed, 110 insertions(+), 14 deletions(-) diff --git a/.werks/2229 b/.werks/2229 new file mode 100644 index 0000000..9546287 --- /dev/null +++ b/.werks/2229 @@ -0,0 +1,13 @@ +Title: Do not fail on non-existing Livestatus columns any longer, output None or null instead +Level: 1 +Component: livestatus +Compatible: compat +Version: 1.2.7i1 +Date: 1431935942 +Class: feature + +When you ask for a column that does not exist in your Livestatus version, now this is not +considered as a fatal error any longer but just being logged as a warning. Instead +an empty string (CSV), <tt>None</tt> (Python) or <tt>null</tt> (JSON) is being returned. +This makes it easier for GUIs to maintain compatibility with existing Livestatus version +when new features are implemented that make use of new Livestatus columns. diff --git a/ChangeLog b/ChangeLog index 598dc78..0ff2f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -549,6 +549,7 @@ * 2151 FIX: Fixed wrong time in events when forwarding logwatch to EC between timezones... Livestatus: + * 2229 Do not fail on non-existing Livestatus columns any longer, output None or null instead... * 2208 FIX: Add missing Livestatus column service_period... HW/SW-Inventory: diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 036cd98..1045dd8 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -38,6 +38,7 @@ using namespace std; #define COLTYPE_TIME 4 #define COLTYPE_DICT 5 #define COLTYPE_BLOB 6 +#define COLTYPE_NULL 7 class Filter; class Query; diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 151a34c..660769b 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -31,7 +31,7 @@ pkglib_LIBRARIES = livestatus.so livestatus_so_SOURCES = \ AndingFilter.cc ClientQueue.cc Column.cc ColumnsColumn.cc CustomVarsExplicitColumn.cc \ ContactsColumn.cc CustomVarsColumn.cc CustomVarsFilter.cc DoubleColumn.cc \ - DoubleColumnFilter.cc DowntimeOrComment.cc DownCommColumn.cc EmptyColumn.cc \ + DoubleColumnFilter.cc DowntimeOrComment.cc DownCommColumn.cc EmptyColumn.cc NullColumn.cc \ Filter.cc GlobalCountersColumn.cc HostContactsColumn.cc HostgroupsColumn.cc \ HostlistColumn.cc HostlistColumnFilter.cc HostlistStateColumn.cc MetricsColumn.cc \ HostSpecialIntColumn.cc ServiceSpecialIntColumn.cc InputBuffer.cc IntColumn.cc IntColumnFilter.cc \ diff --git a/livestatus/src/NullColumn.cc b/livestatus/src/NullColumn.cc new file mode 100644 index 0000000..a439e2b --- /dev/null +++ b/livestatus/src/NullColumn.cc @@ -0,0 +1,31 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#include "NullColumn.h" +#include "Query.h" + +void NullColumn::output(void *data __attribute__ ((__unused__)), Query *query) +{ + query->outputNull(); +} diff --git a/livestatus/src/NullColumn.h b/livestatus/src/NullColumn.h new file mode 100644 index 0000000..6e7add1 --- /dev/null +++ b/livestatus/src/NullColumn.h @@ -0,0 +1,41 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef NullColumn_h +#define NullColumn_h + +#include "config.h" + +#include "Column.h" + +class NullColumn : public Column +{ +public: + NullColumn(string name, string description) : + Column(name, description, -1) {} + int type() { return COLTYPE_NULL; } + void output(void *data, Query *); +}; + +#endif // NullColumn_h diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 77fde0c..8bb3b93 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -36,7 +36,7 @@ #include "Query.h" #include "Filter.h" #include "Column.h" -#include "EmptyColumn.h" +#include "NullColumn.h" #include "OutputBuffer.h" #include "InputBuffer.h" #include "StatsColumn.h" @@ -199,7 +199,7 @@ Query::~Query() Column *Query::createDummyColumn(const char *name) { - Column *col = new EmptyColumn(name, "Dummy column"); + Column *col = new NullColumn(name, "Non existing column"); _dummy_columns.push_back(col); return col; } @@ -543,8 +543,12 @@ void Query::parseColumnsLine(char *line) if (column) _columns.push_back(column); else { - _output->setError(RESPONSE_CODE_INVALID_HEADER, - "Table '%s' has no column '%s'", _table->name(), column_name); + logger(LOG_WARNING, "Replacing non-existing column '%s' with null column", column_name); + // Do not fail any longer. We might want to make this configurable. + // But not failing has the advantage that an updated GUI, that expects new columns, + // will be able to keep compatibility with older Livestatus versions. + // _output->setError(RESPONSE_CODE_INVALID_HEADER, + // "Table '%s' has no column '%s'", _table->name(), column_name); Column *col = createDummyColumn(column_name); _columns.push_back(col); } @@ -1052,15 +1056,8 @@ void Query::outputCounter(counter_t value) void Query::outputDouble(double value) { - if (isnan(value)) { - if (_output_format == OUTPUT_FORMAT_CSV) { - // output empty cell - } - else if (_output_format == OUTPUT_FORMAT_PYTHON) - _output->addBuffer("None", 4); - else - _output->addBuffer("null", 4); // JSON - } + if (isnan(value)) + outputNull(); else { char buf[64]; int l = snprintf(buf, sizeof(buf), "%.10e", value); @@ -1068,6 +1065,17 @@ void Query::outputDouble(double value) } } +void Query::outputNull() +{ + if (_output_format == OUTPUT_FORMAT_CSV) { + // output empty cell + } + else if (_output_format == OUTPUT_FORMAT_PYTHON) + _output->addBuffer("None", 4); + else + _output->addBuffer("null", 4); // JSON +} + void Query::outputAsciiEscape(char value) { char buf[8]; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 752a859..a15bd6b 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -115,6 +115,7 @@ public: void outputUnsignedLong(unsigned long); void outputCounter(counter_t); void outputDouble(double); + void outputNull(); void outputAsciiEscape(char value); void outputUnicodeEscape(unsigned value); void outputString(const char *, int size=-1);

9 years, 1 month

Check_MK Git: check_mk: Allow option for visual levels in availability in reports

by Mathias Kettner

Module: check_mk Branch: master Commit: faeae7a7e7f2da215fa73f25a1fcacba7f52f8e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faeae7a7e7f2da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 18 09:41:56 2015 +0200 Allow option for visual levels in availability in reports --- web/htdocs/availability.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index d0c0fc8..fb0d34e 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -32,10 +32,19 @@ #### Reporting abbilden. import bi, views -# TODO: Get rid of views +# TODO: Get rid of import of views # from lib import * from valuespec import * +# .--Declarations--------------------------------------------------------. +# | ____ _ _ _ | +# | | _ \ ___ ___| | __ _ _ __ __ _| |_(_) ___ _ __ ___ | +# | | | | |/ _ \/ __| |/ _` | '__/ _` | __| |/ _ \| '_ \/ __| | +# | | |_| | __/ (__| | (_| | | | (_| | |_| | (_) | | | \__ \ | +# | |____/ \___|\___|_|\__,_|_| \__,_|\__|_|\___/|_| |_|___/ | +# | | +# '----------------------------------------------------------------------' + host_availability_columns = [ ( "up", "state0", _("UP"), None ), ( "down", "state2", _("DOWN"), None ), @@ -237,7 +246,7 @@ avoption_entries = [ # Visual levels for the availability ( "av_levels", "double", - False, + True, Optional( Tuple( elements = [ @@ -934,7 +943,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): # Summary line. It has the same format as each entry in cells - if show_summary: + if show_summary and len(availability_table) > 0: summary_cells = [] for sid, css, sname, help in availability_columns[what]:

9 years, 1 month

Check_MK Git: check_mk: Fixed handling of duplicate oids in case of using SNMPv3 contextes

by Lars Michelsen

Module: check_mk Branch: master Commit: 97808d280054fa3ff26ec4264758d9971ab9253b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97808d280054fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 15 15:09:55 2015 +0200 Fixed handling of duplicate oids in case of using SNMPv3 contextes --- modules/snmp.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index c312e63..79ccbc8 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -154,6 +154,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info): if opt_use_snmp_walk or is_usewalk_host(hostname): rowinfo = get_stored_snmpwalk(hostname, fetchoid) else: + added_oids = set([]) rowinfo = [] if is_snmpv3_host(hostname): snmp_contexts = snmpv3_contexts_of(hostname, check_type) @@ -162,18 +163,25 @@ def get_snmp_table(hostname, ip, check_type, oid_info): for context_name in snmp_contexts: if has_inline_snmp and use_inline_snmp: - rowinfo += inline_snmpwalk_on_suboid(hostname, check_type, fetchoid, oid, + rows = inline_snmpwalk_on_suboid(hostname, check_type, fetchoid, oid, context_name=context_name) else: - rowinfo += snmpwalk_on_suboid(hostname, ip, fetchoid, context_name=context_name) - - # I've seen a broken device (Mikrotik Router), that broke after an - # update to RouterOS v6.22. It would return 9 time the same OID when - # .1.3.6.1.2.1.1.1.0 was being walked. We try to detect these situations - # by removing any duplicate OID information - if len(rowinfo) > 1 and rowinfo[0][0] == rowinfo[1][0]: - vverbose("Detected broken SNMP agent. Ignoring duplicate OID %s.\n" % rowinfo[0][0]) - rowinfo = rowinfo[:1] + rows = snmpwalk_on_suboid(hostname, ip, fetchoid, context_name=context_name) + + # I've seen a broken device (Mikrotik Router), that broke after an + # update to RouterOS v6.22. It would return 9 time the same OID when + # .1.3.6.1.2.1.1.1.0 was being walked. We try to detect these situations + # by removing any duplicate OID information + if len(rows) > 1 and rows[0][0] == rows[1][0]: + vverbose("Detected broken SNMP agent. Ignoring duplicate OID %s.\n" % rows[0][0]) + rows = rows[:1] + + for row_oid, val in rows: + if row_oid in added_oids: + vverbose("Duplicate OID found: %s (%s)\n" % (row_oid, val)) + else: + rowinfo.append((row_oid, val)) + added_oids.add(row_oid) columns.append((fetchoid, rowinfo)) number_rows = len(rowinfo) @@ -409,7 +417,6 @@ def get_stored_snmpwalk(hostname, oid): rowinfo = collect_until(current, -1) rowinfo.reverse() rowinfo += collect_until(current + 1, 1) - # import pprint ; pprint.pprint(rowinfo) if dot_star: return [ rowinfo[0] ]

9 years, 1 month

Check_MK Git: check_mk: Fixed problem using snmpv3 contextes in nagios based installations

by Lars Michelsen

Module: check_mk Branch: master Commit: d259e3167b69fdde546394ae1be3d9b56186060d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d259e3167b69fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 15 14:37:53 2015 +0200 Fixed problem using snmpv3 contextes in nagios based installations --- modules/check_mk.py | 1 + modules/snmp.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 698398b..f187bef 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3052,6 +3052,7 @@ no_discovery_possible = None output.write("def is_snmpv3_host(hostname):\n return % r\n\n" % is_snmpv3_host(hostname)) output.write("def is_tcp_host(hostname):\n return % r\n\n" % is_tcp_host(hostname)) output.write("def is_usewalk_host(hostname):\n return % r\n\n" % is_usewalk_host(hostname)) + output.write("def snmpv3_contexts_of_host(hostname):\n return % r\n\n" % snmpv3_contexts_of_host(hostname)) if has_inline_snmp and use_inline_snmp: output.write("def is_snmpv2c_host(hostname):\n return % r\n\n" % is_snmpv2c_host(hostname)) output.write("def is_bulkwalk_host(hostname):\n return % r\n\n" % is_bulkwalk_host(hostname)) diff --git a/modules/snmp.py b/modules/snmp.py index 78fd211..c312e63 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -90,8 +90,11 @@ def oid_to_intlist(oid): def cmp_oids(o1, o2): return cmp(oid_to_intlist(o1), oid_to_intlist(o2)) +def snmpv3_contexts_of_host(hostname): + return host_extra_conf(hostname, snmpv3_contexts) + def snmpv3_contexts_of(hostname, check_type): - for ty, rules in host_extra_conf(hostname, snmpv3_contexts): + for ty, rules in snmpv3_contexts_of_host(hostname): if ty == None or ty == check_type: return rules return [None]

9 years, 1 month

Check_MK Git: check_mk: hitachi_hus_dkc, hitachi_hus_dku: Minor changes in scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 57033587c64c414ca30b665d58119e6c9f02e658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57033587c64c41… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 15 14:27:54 2015 +0200 hitachi_hus_dkc, hitachi_hus_dku: Minor changes in scan function --- checks/hitachi_hus_dkc | 2 +- checks/hitachi_hus_dku | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hitachi_hus_dkc b/checks/hitachi_hus_dkc index 5cfac6f..5555a1e 100644 --- a/checks/hitachi_hus_dkc +++ b/checks/hitachi_hus_dkc @@ -81,5 +81,5 @@ check_info["hitachi_hus_dkc"] = { 8, # dkcHWFan 9, # dkcHWEnvironment ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11.4"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11"), } diff --git a/checks/hitachi_hus_dku b/checks/hitachi_hus_dku index ba15a7b..6ca91a7 100644 --- a/checks/hitachi_hus_dku +++ b/checks/hitachi_hus_dku @@ -74,5 +74,5 @@ check_info["hitachi_hus_dku"] = { 4, # dkuHWEnvironment 5, # dkuHWDrive ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11.4"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11"), }

9 years, 1 month

Check_MK Git: check_mk: Matrix layout: fix CSV export, fix minority detection

by Mathias Kettner

Module: check_mk Branch: master Commit: db236cf960439407a3dc40fb49b28dd9efbfcac6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db236cf9604394… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 15 14:19:18 2015 +0200 Matrix layout: fix CSV export, fix minority detection --- web/htdocs/htmllib.py | 3 ++- web/htdocs/table.py | 2 +- web/htdocs/views.py | 20 +++++++++++--- web/plugins/views/layouts.py | 57 ++++++++++++++++++++++++++++++++++----- web/plugins/views/webservice.py | 6 +---- 5 files changed, 72 insertions(+), 16 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 54f763a..e66d913 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -968,6 +968,7 @@ class html: self.write('<a target="_top" href="%s"><img class=statusicon src="images/status_pageurl.png" title="%s"></a>\n' % \ ("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), _("URL to this page including sidebar"))) + # TODO: Move this away from here. Make a context button. The view should handle this if self.myfile == "view" and self.var('mode') != 'availability': self.write('<a target="_top" href="%s">' \ '<img class=statusicon src="images/status_download_csv.png" title="%s"></a>\n' % \ @@ -1447,7 +1448,7 @@ class html: if y == -1: break ht = ht[0:x] + ht[y+1:] - return ht + return ht.replace(" ", " ") def strip_scripts(self, ht): while True: diff --git a/web/htdocs/table.py b/web/htdocs/table.py index b45fe4a..7470435 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -318,7 +318,7 @@ def end(): odd = "even" for nr, (row, css, state, fixed) in enumerate(rows): if do_csv: - html.write(csv_separator.join([ html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) + html.write(csv_separator.join([html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) html.write("\n") else: # HTML output diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6971260..e140c36 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1113,15 +1113,22 @@ def show_view(view, show_heading = False, show_buttons = True, # always needed. In case of an embedded view in the reporting this # field is simply missing, because the rendering is done by the # report itself. + # TODO: CSV export should be handled by the layouts. It cannot + # be done generic in most cases if html.output_format == "html": if "layout" in view: layout = multisite_layouts[view["layout"]] else: layout = None else: - layout = multisite_layouts.get(html.output_format) - if not layout: - layout = multisite_layouts["json"] + if "layout" in view and "csv_export" in multisite_layouts[view["layout"]]: + multisite_layouts[view["layout"]]["csv_export"](rows, view, group_painters, painters) + return + else: + # Generic layout of export + layout = multisite_layouts.get(html.output_format) + if not layout: + layout = multisite_layouts["json"] # Until now no single byte of HTML code has been output. # Now let's render the view. The render_function will be @@ -2438,6 +2445,13 @@ def ajax_inv_render_tree(): else: render_inv_subtree_container(hostname, tree_id, invpath, node) +def output_csv_headers(view): + html.req.content_type = "text/csv; charset=UTF-8" + filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) + if type(filename) == unicode: + filename = filename.encode("utf-8") + html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename + #. # .--Icon Selector-------------------------------------------------------. # | ___ ____ _ _ | diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index a2a6eab..2f3ab9d 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -571,7 +571,7 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho html.write("<td class=cell><table>") for painter_nr, p in enumerate(painters[1:]): tdclass, content = prepare_paint(p, cell_row) - gv = group_value(cell_row, [p])[0] + gv = group_value(cell_row, [p]) majority_value = row_majorities[row_id].get(painter_nr, None) if majority_value != None and majority_value != gv: tdclass += " minority" @@ -587,6 +587,47 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho html.write("</table>") +def csv_export_matrix(rows, view, group_painters, painters): + output_csv_headers(view) + + groups, unique_row_ids, matrix_cells = list(create_matrices(rows, group_painters, painters, num_columns=None))[0] + + table.begin(output_format="csv") + for painter_nr, painter in enumerate(group_painters): + table.row() + table.cell("", painter[0]["title"]) + for group, group_row in groups: + tdclass, content = prepare_paint(painter, group_row) + table.cell("", content) + + for row_id in unique_row_ids: + # Omit rows where all cells have the same values + if config.matrix_omit_uniform_lines: + at_least_one_different = False + for counts in value_counts[row_id].values(): + if len(counts) > 1: + at_least_one_different = True + break + if not at_least_one_different: + continue + + table.row() + tdclass, content = prepare_paint(painters[0], matrix_cells[row_id].values()[0]) + table.cell("", content) + + for group_id, group_row in groups: + table.cell("") + cell_row = matrix_cells[row_id].get(group_id) + if cell_row != None: + for painter_nr, p in enumerate(painters[1:]): + tdclass, content = prepare_paint(p, cell_row) + if painter_nr: + html.write(",") + html.write(content) + + table.end() + + def matrix_find_majorities(rows, painters, for_header): counts = {} # dict row_id -> painter_nr -> value -> count @@ -609,13 +650,16 @@ def matrix_find_majorities(rows, painters, for_header): maj_entry = majorities.setdefault(row_id, {}) for painter_nr, painter_entry in row_entry.items(): maj_value = None - max_count = 0 + max_count = 0 # Absolute maximum count + max_non_unique = 0 # maximum count, but maybe non unique for value, count in painter_entry.items(): - if count == max_count: - maj_value = None # No majority - elif count > max_count and count >= 2: + if count > max_non_unique and count >= 2: maj_value = value + max_non_unique = count max_count = count + elif count == max_non_unique: + maj_value = None + max_count = None maj_entry[painter_nr] = maj_value @@ -647,7 +691,7 @@ def create_matrices(rows, group_painters, painters, num_columns): group_id = group_value(row, group_painters) if group_id != last_group_id: col_num += 1 - if col_num > num_columns: + if num_columns != None and col_num > num_columns: yield (groups, unique_row_ids, matrix_cells) groups = [] unique_row_ids = [] # not a set, but a list. Need to keep sort order! @@ -674,6 +718,7 @@ def create_matrices(rows, group_painters, painters, num_columns): multisite_layouts["matrix"] = { "title" : _("Matrix"), "render" : render_matrix, + "csv_export" : csv_export_matrix, "group" : True, "checkboxes" : False, } diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 6ca0251..ceae7d7 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -137,11 +137,7 @@ multisite_layouts["jsonp"] = { def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxes, export = False): if export: - html.req.content_type = "text/csv; charset=UTF-8" - filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) - if type(filename) == unicode: - filename = filename.encode("utf-8") - html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename + output_csv_headers(view) csv_separator = html.var("csv_separator", ";") first = True

9 years, 1 month

Check_MK Git: check_mk: Manpages of checks cisco_srst_state,

by Simon Betz

cisco_srst_phones, cisco_srst_call_legs edited Message-ID: <5555e03f.sveqm7vGoZdcSHBq%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c213ab2a35eee77fb8bd4b9ceed0e41d13fdb691 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c213ab2a35eee7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 15 14:01:47 2015 +0200 Manpages of checks cisco_srst_state, cisco_srst_phones, cisco_srst_call_legs edited --- checkman/cisco_srst_call_legs | 8 ++++---- checkman/cisco_srst_phones | 3 ++- checkman/cisco_srst_state | 16 +++++----------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/checkman/cisco_srst_call_legs b/checkman/cisco_srst_call_legs index 4e888e9..dfa662f 100644 --- a/checkman/cisco_srst_call_legs +++ b/checkman/cisco_srst_call_legs @@ -4,13 +4,13 @@ catalog: hw/network/cisco license: GPL distribution: check_mk description: - This check monitors the amount of participants of a telephony conference using - an Cisco SRST router. + This check monitors the total number of SIP call legs routed through the Cisco + device since going active. This Cisco device supports the Cisco Unified SRST feature. The status is always OK. perfdata: - One variable: the amount of the participants of a current - telephony conference. + One variable: the total number of SIP call legs routed through the device since + going active. inventory: One service is created for each device. diff --git a/checkman/cisco_srst_phones b/checkman/cisco_srst_phones index 477da5b..af7e867 100644 --- a/checkman/cisco_srst_phones +++ b/checkman/cisco_srst_phones @@ -4,7 +4,8 @@ catalog: hw/network/cisco license: GPL distribution: check_mk description: - This check monitors the registered phones of an Cisco SRST router. + This check monitors the registered phones of a Cisco device which supports + the Cisco Unified SRST feature. The status is always OK. perfdata: diff --git a/checkman/cisco_srst_state b/checkman/cisco_srst_state index c97a55b..e1de5a0 100644 --- a/checkman/cisco_srst_state +++ b/checkman/cisco_srst_state @@ -4,18 +4,12 @@ catalog: hw/network/cisco license: GPL distribution: check_mk description: - This check monitors the status of the SRST mode of a Cisco SRST router: + This check monitors the status of the Cisco Unified SRST feature + of a Cisco device which supports that feature. + There are two possible states: active (OK) or inactive (WARN). - - active (OK) - - inactive (WARN) - - Moreover the check displays the time since the SRST mode switched - to active mode. The time format looks like - - Wed May 13 15:33:28 2015 (0d 00:47:00) - - which means that the conference started 47 minutes ago on wednesday, - the 13th of May, 2015, at 15:33:28. + Moreover the check displays the time (in minutes) since the SRST feature + switched to active mode. inventory: One service is created for each device.

9 years, 1 month

Check_MK Git: check_mk: Manpages of checks cisco_srst_phones and cisco_srst_call_legs edited

by Simon Betz

Module: check_mk Branch: master Commit: e5fa46f091b65c3cbea23a195aa54feebab20552 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5fa46f091b65c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 15 13:21:07 2015 +0200 Manpages of checks cisco_srst_phones and cisco_srst_call_legs edited --- checkman/cisco_srst_call_legs | 2 +- checkman/cisco_srst_phones | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/cisco_srst_call_legs b/checkman/cisco_srst_call_legs index 1c9a3eb..4e888e9 100644 --- a/checkman/cisco_srst_call_legs +++ b/checkman/cisco_srst_call_legs @@ -10,7 +10,7 @@ description: perfdata: One variable: the amount of the participants of a current - telephony conference (int >= 0). + telephony conference. inventory: One service is created for each device. diff --git a/checkman/cisco_srst_phones b/checkman/cisco_srst_phones index 8bc76fb..477da5b 100644 --- a/checkman/cisco_srst_phones +++ b/checkman/cisco_srst_phones @@ -8,7 +8,7 @@ description: The status is always OK. perfdata: - One variable: the amount of registered phones (int >= 0). + One variable: the amount of registered phones. inventory: One service is created for each device.

9 years, 1 month

Check_MK Git: check_mk: Updated werk formatting

by Mathias Kettner

Module: check_mk Branch: master Commit: 50fc4ad47cb5a496e5c5e50777c113f78bbab15b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50fc4ad47cb5a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 15 13:14:08 2015 +0200 Updated werk formatting --- .werks/1246 | 2 +- .werks/2283 | 4 ++-- ChangeLog | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.werks/1246 b/.werks/1246 index e7178b8..6e1794f 100644 --- a/.werks/1246 +++ b/.werks/1246 @@ -1,4 +1,4 @@ -Title: blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter +Title: blade_bays, blade_blades, blade_blowers, blade_health, blade_mediatray: Checks now support IBM Flex Bladecenter Level: 1 Component: checks Compatible: compat diff --git a/.werks/2283 b/.werks/2283 index fd88a25..dfb684f 100644 --- a/.werks/2283 +++ b/.werks/2283 @@ -1,9 +1,9 @@ -Title: cisco_srst_call_legs cisco_srst_phones cisco_srst_state : new checks for monitoring Cisco SRST routers +Title: cisco_srst_call_legs cisco_srst_phones cisco_srst_state: New checks for monitoring Cisco SRST routers Level: 1 Component: checks Compatible: compat Version: 1.2.7i1 Date: 1431675161 Class: feature - + diff --git a/ChangeLog b/ChangeLog index 3e65b1c..598dc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,8 +176,8 @@ * 2252 SEC: mk_logwatch: Fixed mostly uncritical command injection from config... * 2270 windows agent: now able to add cached information into section headers... * 2271 logwatch_ec: Now able to create a single check for each logfile forwarded to the event console... - * 1246 blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter - * 2283 cisco_srst_call_legs cisco_srst_phones cisco_srst_state : new checks for monitoring Cisco SRST routers + * 2283 cisco_srst_call_legs cisco_srst_phones cisco_srst_state: New checks for monitoring Cisco SRST routers + * 1246 blade_bays, blade_blades, blade_blowers, blade_health, blade_mediatray: Checks now support IBM Flex Bladecenter * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...

9 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015