Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2758 FIX Fixed processing of metrics containing varnames with quotes and/ or spaces

by Lars Michelsen

Module: check_mk Branch: master Commit: d4fa4a36111013172a773cf830020b51310268b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4fa4a36111013… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 10 15:26:52 2015 +0100 #2758 FIX Fixed processing of metrics containing varnames with quotes and/or spaces --- .werks/2758 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 9 ++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/2758 b/.werks/2758 new file mode 100644 index 0000000..cb7623b --- /dev/null +++ b/.werks/2758 @@ -0,0 +1,10 @@ +Title: Fixed processing of metrics containing varnames with quotes and/or spaces +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447165571 + + diff --git a/ChangeLog b/ChangeLog index 01bde39..515645a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists * 2709 FIX: fixed exception when opening the action menu... * 2447 FIX: Fixed sorting of performancedata values with units... + * 2758 FIX: Fixed processing of metrics containing varnames with quotes and/or spaces WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 12b96c1..3bca3e0 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -34,7 +34,7 @@ # unit: The definition-dict of a unit like in unit_info # graph_template: Template for a graph. Essentially a dict with the key "metrics" -import math, time, colorsys +import math, time, colorsys, shlex import config, defaults, pagetypes, table from lib import * from valuespec import * @@ -278,12 +278,14 @@ def mix_colors(a, b): # Convert perf_data_string into perf_data, extract check_command def parse_perf_data(perf_data_string, check_command=None): # Strip away arguments like in "check_http!-H mathias-kettner.de" + # FIXME: check_command=None? Fails here! check_command = check_command.split("!")[0] if not perf_data_string: return None, check_command - parts = perf_data_string.split() + # Split the perf data string into parts. Preserve quoted strings! + parts = shlex.split(perf_data_string) # Try if check command is appended to performance data # in a PNP like style @@ -300,7 +302,8 @@ def parse_perf_data(perf_data_string, check_command=None): try: perf_data = [] for part in parts: - varname, values = part.split("=") + varname, values = part.split("=", 1) + varname = varname.replace("\"", "").replace("\'", "") value_parts = values.split(";") while len(value_parts) < 5: value_parts.append(None)

8 years, 7 months

#2701 FIX zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems

by Simon Betz

Module: check_mk Branch: master Commit: 5c319eef6f6063150b96d9ecd9f2ab20878dfebc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c319eef6f6063… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 10 15:12:49 2015 +0100 #2701 FIX zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems Affected solaris systems are solaris 10 10/08 s10s_u6wos_07b SPARC and solaris 10 10/09 s10x_u8wos_08a X86. --- .werks/2701 | 9 +++++++++ ChangeLog | 1 + checks/zfsget | 19 +++++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/2701 b/.werks/2701 new file mode 100644 index 0000000..0f1fb71 --- /dev/null +++ b/.werks/2701 @@ -0,0 +1,9 @@ +Title: zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447164386 +Class: fix + +Affected solaris systems are solaris 10 10/08 s10s_u6wos_07b SPARC and solaris 10 10/09 s10x_u8wos_08a X86. diff --git a/ChangeLog b/ChangeLog index 863a120..01bde39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 2755 FIX: apc_symmetra: Check is handling missing data more robust now * 2783 FIX: esx_vsphere_datastores: fixed crash when no provisioning levels were set * 2700 FIX: ibm_svc_node: fixed handling with agent output after firmware update + * 2701 FIX: zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/zfsget b/checks/zfsget index f100cbf..bc9cc20 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -110,12 +110,23 @@ def parse_zfsget(info): device, fs_type, kbytes, used, avail, percent, mountpoint = line if mountpoint.startswith("/"): entry = {} - total = int(kbytes) / 1024.0 entry["name"] = device - entry["total"] = total - entry["used"] = int(used) / 1024.0 - entry["available"] = total - entry["used"] entry["mountpoint"] = mountpoint + # With some versions of solaris systems such as + # solaris 10 10/08 s10s_u6wos_07b SPARC and solaris 10 10/09 s10x_u8wos_08a X86 + # there migth be a bug in the 'df -h' command which we use for filesystem infos. + # Then the received data from the agent looks like "/ 0 12445007 19012273 5% /". + # In this case we compute the total size as the sum of used and available. + total = int(kbytes) + used = int(used) + avail = int(avail) + if used and avail and not total: + total = used + avail + else: + avail = total - used + entry["total"] = total / 1024.0 + entry["used"] = used / 1024.0 + entry["available"] = avail / 1024.0 df_parsed[mountpoint] = entry # Now remove duplicate entries for the root filesystem, such

8 years, 7 months

Revert "#2784 FIX Search function of tables: fixed exception when columns contain utf-8 encoded umlauts"

by Andreas Boesl

Module: check_mk Branch: master Commit: 638cc767e2a343b08c11d763e382872466b022ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638cc767e2a343… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 10 12:17:43 2015 +0100 Revert "#2784 FIX Search function of tables: fixed exception when columns contain utf-8 encoded umlauts" An even better solution is coming soon. This reverts commit a84dd1d14d629a773fa2f619419fc2e057c1bff7. --- .werks/2784 | 10 ---------- ChangeLog | 1 - web/htdocs/table.py | 3 --- 3 files changed, 14 deletions(-) diff --git a/.werks/2784 b/.werks/2784 deleted file mode 100644 index e48bf00..0000000 --- a/.werks/2784 +++ /dev/null @@ -1,10 +0,0 @@ -Title: Search function of tables: fixed exception when columns contain utf-8 encoded umlauts -Level: 1 -Component: multisite -Class: fix -Compatible: compat -State: unknown -Version: 1.2.7i4 -Date: 1447150471 - -This exception did not happen on every umlaut, just on columns with the python datatype str. diff --git a/ChangeLog b/ChangeLog index 34a69b8..863a120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,7 +82,6 @@ * 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists * 2709 FIX: fixed exception when opening the action menu... * 2447 FIX: Fixed sorting of performancedata values with units... - * 2784 FIX: Search function of tables: fixed exception when columns contain utf-8 encoded umlauts... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 403ef92..b86bf30 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -194,9 +194,6 @@ def end(): if state == "header" or fixed: continue # skip filtering of headers or fixed rows for cell_content, css_classes, colspan in row: - if type(cell_content) == str: - cell_content = cell_content.decode("utf-8") - if fixed or search_term in cell_content.lower(): filtered_rows.append((row, css, state, fixed)) break # skip other cells when matched

8 years, 7 months

Make doxygen configurable.

by Sven Panne

Module: check_mk Branch: master Commit: 46225ee5520c83c8202f71efe27ffb05c97de4bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46225ee5520c83… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 12:14:17 2015 +0100 Make doxygen configurable. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eaaad93..373a87c 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,10 @@ LIBDIR = $(PREFIX)/lib/$(NAME) DISTNAME = $(NAME)-$(VERSION) TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 -IWYU = include-what-you-use + CPPCHECK = cppcheck +DOXYGEN = doxygen +IWYU = include-what-you-use # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ @@ -254,4 +256,4 @@ cppcheck: # Note: You need the doxygen and graphviz packages. documentation: - doxygen doc/Doxyfile + $(DOXYGEN) doc/Doxyfile

8 years, 7 months

#2700 FIX ibm_svc_node: fixed handling with agent output after firmware update

by Simon Betz

Module: check_mk Branch: master Commit: 23ccdbfbf8112707cf1b957d22de659b66a3e5be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23ccdbfbf81127… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 10 11:42:52 2015 +0100 #2700 FIX ibm_svc_node: fixed handling with agent output after firmware update --- .werks/2700 | 9 +++++++++ ChangeLog | 1 + checks/ibm_svc_node | 42 ++++++++++++++++++++++++++---------------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/.werks/2700 b/.werks/2700 new file mode 100644 index 0000000..c2b2d25 --- /dev/null +++ b/.werks/2700 @@ -0,0 +1,9 @@ +Title: ibm_svc_node: fixed handling with agent output after firmware update +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447152046 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 49cfed1..863a120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 2754 FIX: ipmitool: Killing asynchronous ipmitool call after 300 seconds... * 2755 FIX: apc_symmetra: Check is handling missing data more robust now * 2783 FIX: esx_vsphere_datastores: fixed crash when no provisioning levels were set + * 2700 FIX: ibm_svc_node: fixed handling with agent output after firmware update Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_svc_node b/checks/ibm_svc_node index 04c0bce..a9b2bed 100644 --- a/checks/ibm_svc_node +++ b/checks/ibm_svc_node @@ -28,14 +28,23 @@ # Put here the example output from your TCP-Based agent. If the # check is SNMP-Based, then remove this section +# newer agent output with more columns +# 1:N1_164191:10001AA202:500507680100D7CA:online:0:io_grp0:no:2040000051442002:CG8:iqn.1986-03.com.ibm:2145.svc-cl.n1164191::164191::::: +# 2:N2_164373:10001AA259:500507680100D874:online:0:io_grp0:no:2040000051442149:CG8:iqn.1986-03.com.ibm:2145.svc-cl.n2164373::164373::::: +# 5:N3_162711:100025E317:500507680100D0A7:online:1:io_grp1:no:2040000085543047:CG8:iqn.1986-03.com.ibm:2145.svc-cl.n3162711::162711::::: +# 6:N4_164312:100025E315:500507680100D880:online:1:io_grp1:yes:2040000085543045:CG8:iqn.1986-03.com.ibm:2145.svc-cl.n4164312::164312::::: + def inventory_ibm_svc_node(info): io_groups = {} inventory = [] - for node_id, node_name, ups_serial, wwnn, node_status, io_group_id, \ - io_group_name, config_node, ups_unique_id, hardware, iscsi_name, \ - iscsi_alias, panel_name, enclosure_id, canister_id, \ - enclosure_serial_number, additional in info: - io_groups[io_group_name] = 1 + for line in info: + node_id, node_name, ups_serial, wwnn, node_status, io_group_id,\ + io_group_name, config_node, ups_unique_id, hardware, iscsi_name,\ + iscsi_alias, panel_name, enclosure_id, canister_id,\ + enclosure_serial_number, additional = line[:17] + io_groups[io_group_name] = 1 + for line in info: + io_groups[line[5]] = 1 for io_group_name in io_groups.keys(): inventory.append( (io_group_name, None) ) return inventory @@ -46,17 +55,18 @@ def check_ibm_svc_node(item, _no_params, info): online_nodes = 0 nodes_of_iogroup = 0 - for node_id, node_name, ups_serial, wwnn, node_status, io_group_id, \ - io_group_name, config_node, ups_unique_id, hardware, iscsi_name, \ - iscsi_alias, panel_name, enclosure_id, canister_id, \ - enclosure_serial_number, additional in info: - if io_group_name == item: - if message != "": - message += ", " - message += "Node %s is %s" % (node_name, node_status) - nodes_of_iogroup += 1 - if node_status == "online": - online_nodes += 1 + for line in info: + node_id, node_name, ups_serial, wwnn, node_status, io_group_id,\ + io_group_name, config_node, ups_unique_id, hardware, iscsi_name,\ + iscsi_alias, panel_name, enclosure_id, canister_id,\ + enclosure_serial_number, additional = line[:17] + if io_group_name == item: + if message != "": + message += ", " + message += "Node %s is %s" % (node_name, node_status) + nodes_of_iogroup += 1 + if node_status == "online": + online_nodes += 1 if nodes_of_iogroup == 0: return 3, "IO Group %s not found in agent output" % item

8 years, 7 months

#2784 FIX Search function of tables: fixed exception when columns contain utf-8 encoded umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: a84dd1d14d629a773fa2f619419fc2e057c1bff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a84dd1d14d629a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 10 11:20:48 2015 +0100 #2784 FIX Search function of tables: fixed exception when columns contain utf-8 encoded umlauts This exception did not happen on every umlaut, just on columns with the python datatype str. --- .werks/2784 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/table.py | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2784 b/.werks/2784 new file mode 100644 index 0000000..e48bf00 --- /dev/null +++ b/.werks/2784 @@ -0,0 +1,10 @@ +Title: Search function of tables: fixed exception when columns contain utf-8 encoded umlauts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447150471 + +This exception did not happen on every umlaut, just on columns with the python datatype str. diff --git a/ChangeLog b/ChangeLog index 49cfed1..d154c9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists * 2709 FIX: fixed exception when opening the action menu... * 2447 FIX: Fixed sorting of performancedata values with units... + * 2784 FIX: Search function of tables: fixed exception when columns contain utf-8 encoded umlauts... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index b86bf30..403ef92 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -194,6 +194,9 @@ def end(): if state == "header" or fixed: continue # skip filtering of headers or fixed rows for cell_content, css_classes, colspan in row: + if type(cell_content) == str: + cell_content = cell_content.decode("utf-8") + if fixed or search_term in cell_content.lower(): filtered_rows.append((row, css, state, fixed)) break # skip other cells when matched

8 years, 7 months

Fixed external references.

by Sven Panne

Module: check_mk Branch: master Commit: 53c0b44d7d4d37a15e907df6647adc969ff2cf07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c0b44d7d4d37… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 10:22:05 2015 +0100 Fixed external references. We should really, really remove the EXTERN hack, it is highly fragile... --- livestatus/src/Store.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 4133912..d0aa487 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -34,7 +34,6 @@ #include "global_counters.h" #include "logger.h" #include "strutil.h" -#include "tables.h" // TODO: Remove this hack. #ifdef EXTERN

8 years, 7 months

Clean doxygen docs.

by Sven Panne

Module: check_mk Branch: master Commit: 88ef98338d02f307d6a1d524888986232dabfc31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88ef98338d02f3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:27:33 2015 +0100 Clean doxygen docs. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa7dc24..eaaad93 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ minify-js: fi clean: - rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \ + rm -rf api dist.tmp rpm.topdir *.rpm *.deb *.exe \ mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js

8 years, 7 months

Fixed includes for inttypes, older headers are a bit picky about the format macros.

by Sven Panne

Module: check_mk Branch: master Commit: d6b4017ec0d766cd75806f4515744a72c647039c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6b4017ec0d766… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:26:19 2015 +0100 Fixed includes for inttypes, older headers are a bit picky about the format macros. --- livestatus/src/AndingFilter.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 568dc16..d1f3879 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,7 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" -#include <inttypes.h> +#include <cinttypes> #include "OringFilter.h" #include "Query.h" #include "logger.h" diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index dd3d934..b6ea0b2 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -25,11 +25,11 @@ #include "Logfile.h" #include <errno.h> #include <fcntl.h> -#include <inttypes.h> #include <stdlib.h> #include <string.h> #include <syslog.h> #include <unistd.h> +#include <cinttypes> #include <utility> #include "LogCache.h" #include "LogEntry.h" diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index a6a1ad7..69a7385 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -50,8 +50,8 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc mk_inventory.cc \ ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc -livestatus_so_CXXFLAGS = -fPIC -livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) +livestatus_so_CXXFLAGS = -std=gnu++0x -fPIC +livestatus_so_CFLAGS = -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) -rm -f plugin.so

8 years, 7 months

cppcheck-induced cleanup: Make pointer hacks more explicit.

by Sven Panne

Module: check_mk Branch: master Commit: a8148f739c65f6b8c6bf0bd50e346bf8b62300f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8148f739c65f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 10 09:16:35 2015 +0100 cppcheck-induced cleanup: Make pointer hacks more explicit. --- livestatus/src/OffsetDoubleColumn.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/livestatus/src/OffsetDoubleColumn.cc b/livestatus/src/OffsetDoubleColumn.cc index a68833f..770ff9e 100644 --- a/livestatus/src/OffsetDoubleColumn.cc +++ b/livestatus/src/OffsetDoubleColumn.cc @@ -23,16 +23,15 @@ // Boston, MA 02110-1301 USA. #include "OffsetDoubleColumn.h" +#include <string.h> double OffsetDoubleColumn::getValue(void *data) { - if (!data) - return 0; - - char *p = (char *)shiftPointer(data); - if (p) - return *(double *)(p + _offset); - else - return 0; + if (!data) return 0; + char *p = static_cast<char *>(shiftPointer(data)); + if (!p) return 0; + double d; + memcpy(&d, p + _offset, sizeof(d)); + return d; }

8 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015