Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

diskstat: remove bogus spaces before the commas

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f8f35472eb84de411436a90cef814a1e421e071 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f8f35472eb84d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 15 15:04:06 2016 +0100 diskstat: remove bogus spaces before the commas --- checks/diskstat.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 4837d6c..2ab907b 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -411,7 +411,7 @@ def check_diskstat_dict(item, params, disks): wait = disk["average_" + what] state, text, extraperf = check_levels(wait, what, params.get(what), unit = "ms", scale = 0.001, statemarkers=False) - yield state, "Average %s: %.2f ms %s" % (what.title().replace("_", " "), wait * 1000, text), extraperf + yield state, "Average %s: %.2f ms%s" % (what.title().replace("_", " "), wait * 1000, text), extraperf # Average disk latency if "latency" in disk:

8 years, 8 months

added agent output

by Simon Betz

Module: check_mk Branch: master Commit: 27fa5b9d2693c13243e4aa4d7c152ebc53ed050b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27fa5b9d2693c1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 15 14:45:02 2016 +0100 added agent output --- checks/sap | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/checks/sap b/checks/sap index b2f8449..698339a 100644 --- a/checks/sap +++ b/checks/sap @@ -24,6 +24,23 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# <<<sap:sep(9)>>> +# sap_XYZ 1 50 Nagios/Allgemein/Intern/ResponseTime 249 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/ResponseTimeDialog 249 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/ResponseTimeDialogRFC 249 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/ResponseTimeHTTP 9830 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/FrontendResponseTime 542 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/LongRunners 120 sec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/ResponseTime(StandardTran.) 7 msec +# sap_XYZ 1 50 Nagios/Allgemein/Intern/UsersLoggedIn 97 - +# sap_XYZ 1 50 SAP CCMS Monitor Templates/Dialog Overview/Dialog Response Time/ResponseTime 249 msec +# sap_XYZ 1 50 SAP CCMS Monitor Templates/Dialog Overview/Network Time/FrontEndNetTime 80 msec +# sap_XYZ 1 50 SAP CCMS Monitor Templates/Dialog Overview/Standardized Response Time/ResponseTime(StandardTran.) 7 msec +# sap_XYZ 1 50 SAP CCMS Monitor Templates/Dialog Overview/Users Logged On/UsersLoggedIn 97 - + + + # This map converts between the SAP color codes (key values) and the # nagios state codes sap_nagios_state_map = [ @@ -51,7 +68,7 @@ def check_sap_dialog(item, params, info): dialog[key] = perfval, uom if not dialog: - # this isn't perfect. Sap data is delivered as piggyback output. Potentially mulitple + # this isn't perfect. Sap data is delivered as piggyback output. Potentially multiple # hosts can each send data for multiple sap instances. The data can also overlap. # This means technically we may not get here and report then incomplete data if one host is # down.

8 years, 8 months

added new source files to the list of files hidden from watos "

by Sebastian Herbord

Unpackaged Agents" list Message-ID: <5698f674.gsj/J/MAmpJzmeH9%sh(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: 413ce6f58b0ac7c4a46ae73cf5b0fb0c21d0db62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413ce6f58b0ac7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 15 14:37:43 2016 +0100 added new source files to the list of files hidden from watos "Unpackaged Agents" list --- agents/windows/CONTENTS | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index fe1c961..7a4e9e9 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -15,3 +15,34 @@ nowin.cc (hide) nowin.exe (hide) check_mk_agent.unversioned.exe (hide) check_mk_agent-64.unversioned.exe (hide) +check_mk_agent.cc (hide) +Configuration.cc (hide) +Configuration.h (hide) +crash.cc (hide) +Crypto.cc (hide) +Crypto.h (hide) +Environment.cc (hide) +Environment.h (hide) +ListenSocket.cc (hide) +ListenSocket.h (hide) +logging.cc (hide) +logging.h (hide) +nowin.cc (hide) +OutputProxy.cc (hide) +OutputProxy.h (hide) +pdhtest.cc (hide) +PerfCounter.cc (hide) +PerfCounter.h (hide) +PerfCounterPdh.cc (hide) +PerfCounterPdh.h (hide) +perftest.cc (hide) +SettingsCollector.cc (hide) +SettingsCollector.h (hide) +stringutil.cc (hide) +stringutil.h (hide) +Thread.cc (hide) +Thread.h (hide) +types.h (hide) +wmiHelper.cc (hide) +wmiHelper.h (hide) +wmitest.cc (hide)

8 years, 8 months

updated werk 2920 and related documentation

by Sebastian Herbord

Module: check_mk Branch: master Commit: e06f7fe3e568022c094e15274ee2f7584b37b91f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e06f7fe3e56802… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 15 11:46:39 2016 +0100 updated werk 2920 and related documentation --- .werks/2920 | 6 +++--- ChangeLog | 2 +- web/plugins/wato/check_parameters.py | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.werks/2920 b/.werks/2920 index 14299e8..df5cd2e 100644 --- a/.werks/2920 +++ b/.werks/2920 @@ -1,4 +1,4 @@ -Title: hr_cpu: this check can now also display per-core graphs +Title: hr_cpu: this check can now also supports per-core features Level: 1 Component: checks Compatible: compat @@ -6,5 +6,5 @@ Version: 1.2.7i4 Date: 1452853469 Class: feature -per-core graphs are optional and have to be enabled through the rule "CPU utilization for simple -devices" +per-core graphs and alerts on high single-core load are optional features +that have to be enabled through the rule "CPU utilization for simple devices" diff --git a/ChangeLog b/ChangeLog index d142bd1..b9a65ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,7 +81,7 @@ * 2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB * 2918 agent_jolokia: jolokia can now be monitored using a special agent * 2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices... - * 2920 hr_cpu: this check can now also display per-core graphs... + * 2920 hr_cpu: this check can now also supports per-core features... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9d3c400..337f235 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4695,7 +4695,7 @@ register_check_parameters( ( "core_util_time", Tuple( title = _("Alert on high utilization over an extended time period on a single " - "core (windows only)"), + "core"), elements = [ Percentage(title = _("High utilization at "), default_value = 100.0), Age(title = _("Warning after "), default_value = 5 * 60), @@ -4704,7 +4704,9 @@ register_check_parameters( help = _("A single thread fully utilizing a single core (potentially due to a bug) " "may go unnoticed when only monitoring the total utilization of the CPU. " "With this configuration, check_mk will alert if a single core is " - "exceeding a utilization threshold over an extended period of time.") + "exceeding a utilization threshold over an extended period of time." + "This is currently only supported on linux and windows agents " + "as well as devices monitored through the host-resource mib") ) ), ( "core_util_graph",

8 years, 8 months

#2920 hr_cpu: this check can now also display per-core graphs

by Sebastian Herbord

Module: check_mk Branch: master Commit: b164dc880f424931038e6c66369b8e206a071e36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b164dc880f4249… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 15 11:25:38 2016 +0100 #2920 hr_cpu: this check can now also display per-core graphs per-core graphs are optional and have to be enabled through the rule "CPU utilization for simple devices" --- .werks/2920 | 10 ++++++++++ ChangeLog | 1 + checks/hr_cpu | 7 +++++-- web/plugins/wato/check_parameters.py | 5 +++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/2920 b/.werks/2920 new file mode 100644 index 0000000..14299e8 --- /dev/null +++ b/.werks/2920 @@ -0,0 +1,10 @@ +Title: hr_cpu: this check can now also display per-core graphs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452853469 +Class: feature + +per-core graphs are optional and have to be enabled through the rule "CPU utilization for simple +devices" diff --git a/ChangeLog b/ChangeLog index b55f708..d142bd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB * 2918 agent_jolokia: jolokia can now be monitored using a special agent * 2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices... + * 2920 hr_cpu: this check can now also display per-core graphs... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/hr_cpu b/checks/hr_cpu index f327b66..3d26fa4 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -32,13 +32,16 @@ def inventory_hr_cpu(info): def check_hr_cpu(_no_item, params, info): num_cpus = 0 util = 0 + cores = [] for line in info: - util += int(line[0]) + core_util = int(line[0]) + cores.append(("core%d" % num_cpus, core_util)) + util += core_util num_cpus += 1 if num_cpus == 0: return 3, "No data found in SNMP output" util = float(util) / num_cpus - return check_cpu_util(util, params) + return check_cpu_util(util, params, cores=cores) # HOST-RESOURCES-MIB::hrSystemUptime.0 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 89ae8bd..9d3c400 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4709,13 +4709,14 @@ register_check_parameters( ), ( "core_util_graph", Checkbox( - title = _("Graphs for individual cores (windows only)"), + title = _("Graphs for individual cores"), label = _("Enable performance graph for utilization of individual cores"), help = _("This adds another graph to the performance CPU utilization " "details page, showing utilization of individual cores. " "Please note that this graph may be impractical on " "device with very many cores. " - "This is currently only supported on windows.") + "This is currently only supported on linux and windows agents " + "as well as devices monitored through the host-resource mib") ), ), ]

8 years, 8 months

#2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 6d5a494780cc76325131844f4d7a7bdf350e39fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d5a494780cc76… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Jan 15 09:46:05 2016 +0100 #2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices This check supports different device types but apparently not all models. Among the supported devices are some switches and tape libraries of the storever series. --- .werks/2919 | 10 ++++++++ ChangeLog | 1 + checkman/hp_webmgmt_status | 18 ++++++++++++++ checks/hp_webmgmt_status | 58 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/.werks/2919 b/.werks/2919 new file mode 100644 index 0000000..5a940e3 --- /dev/null +++ b/.werks/2919 @@ -0,0 +1,10 @@ +Title: hp_webmgmt_status: New check for health status of various Hewlett-Packard devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1452847397 +Class: feature + +This check supports different device types but apparently not all models. Among the supported devices are some +switches and tape libraries of the storever series. diff --git a/ChangeLog b/ChangeLog index 4c63f18..b55f708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 2916 checkpoint_fan, checkpoint_firewall, checkpoint_ha_problems, checkpoint_ha_status, checkpoint_powersupply, checkpoint_svn_status, checkpoint_temp, checkpoint_voltage: New checks for various aspects of checkpoint firewalls * 2890 cisco_nexus_cpu, cisco_oldcpu: new checks for Cisco devices which do not support CPU utilization information from CISCO PROCESS MIB * 2918 agent_jolokia: jolokia can now be monitored using a special agent + * 2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/hp_webmgmt_status b/checkman/hp_webmgmt_status new file mode 100644 index 0000000..eecc07d --- /dev/null +++ b/checkman/hp_webmgmt_status @@ -0,0 +1,18 @@ +title: HP Web Management: Status +agents: snmp +catalog: hw/network/hp +license: GPL +distribution: check_mk +description: + This check monitors the overall health status of various HP devices. + + The check status is directly relayed from the device, with both "critical" + and "non-recoverable" device statuses translating to {CRIT} + + It's not entirely clear which devices are covered by the check but it does + support some switches and tape libraries of the storever series. + It's possible support for the used mib is configurable in the device. + +inventory: + One service per management object is discovered, usually one. + diff --git a/checks/hp_webmgmt_status b/checks/hp_webmgmt_status new file mode 100644 index 0000000..e9906dc --- /dev/null +++ b/checks/hp_webmgmt_status @@ -0,0 +1,58 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +def inventory_hp_webmgmt_status(info): + for index, health in info: + yield index, None + + +def check_hp_webmgmt_status(item, _no_params, info): + status_map = { + "1": (3, "unknown"), + "2": (3, "unused"), + "3": (0, "ok"), + "4": (1, "warning"), + "5": (2, "critical"), + "6": (2, "non-recoverable") + } + for index, health in info: + if index == item: + status, status_msg = status_map[health] + return status, "Device status: %s" % status_msg + + +check_info['hp_webmgmt_status'] = { + 'check_function' : check_hp_webmgmt_status, + 'inventory_function' : inventory_hp_webmgmt_status, + 'service_description' : "Status %s", + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11")\ + and oid(".1.3.6.1.4.1.11.2.36.1.1.5.1.1.1"), + 'snmp_info' : ('.1.3.6.1.4.1.11.2.36.1.1.5.1.1', [1, # hpHttpMgDeviceIndex + 3 # hpHttpMgDeviceHealth + ]), +} +

8 years, 8 months

Some IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: b9d696f4d847e35b2c4cba982a2fcada39117456 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9d696f4d847e3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 15 08:25:45 2016 +0100 Some IWYU fixes. --- livestatus/src/ContactgroupsMemberColumn.h | 2 +- livestatus/src/HostContactsColumn.h | 2 +- livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/TableDownComm.cc | 1 - livestatus/src/TableHosts.cc | 1 - livestatus/src/TableLog.cc | 1 - livestatus/src/TableServices.cc | 1 - livestatus/src/TableStateHistory.cc | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/livestatus/src/ContactgroupsMemberColumn.h b/livestatus/src/ContactgroupsMemberColumn.h index cd6a76a..65c9ab9 100644 --- a/livestatus/src/ContactgroupsMemberColumn.h +++ b/livestatus/src/ContactgroupsMemberColumn.h @@ -37,7 +37,7 @@ public: ContactgroupsMemberColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // ContactgroupsMemberColumn_h diff --git a/livestatus/src/HostContactsColumn.h b/livestatus/src/HostContactsColumn.h index 9cd9dff..ccdbdf5 100644 --- a/livestatus/src/HostContactsColumn.h +++ b/livestatus/src/HostContactsColumn.h @@ -37,7 +37,7 @@ public: HostContactsColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset = -1) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // HostContactsColumn_h diff --git a/livestatus/src/ServiceContactsColumn.h b/livestatus/src/ServiceContactsColumn.h index 30fb8c2..dd9c270 100644 --- a/livestatus/src/ServiceContactsColumn.h +++ b/livestatus/src/ServiceContactsColumn.h @@ -37,7 +37,7 @@ public: ServiceContactsColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : ContactsColumn(name, description, indirect_offset, extra_offset) {} int type() override { return COLTYPE_LIST; } - bool isNagiosMember(void *data, void *member); + bool isNagiosMember(void *data, void *member) override; }; #endif // ServiceContactsColumn_h diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index d08f4d4..f4ecb7c 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -32,7 +32,6 @@ #include "TableServices.h" #include "auth.h" #include "logger.h" -#include "tables.h" using std::make_pair; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index e4856d2..5c40dbf 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -48,7 +48,6 @@ #include "ServicelistStateColumn.h" #include "TableHostgroups.h" #include "auth.h" -#include "tables.h" using std::string; diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 2914ebe..8c219c8 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -40,7 +40,6 @@ #include "TableContacts.h" #include "TableHosts.h" #include "TableServices.h" -#include "tables.h" #ifndef CMC #include "auth.h" diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 7956182..25a4daf 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -48,7 +48,6 @@ #include "TableServicegroups.h" #include "auth.h" #include "strutil.h" -#include "tables.h" using std::string; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index f0cdf9e..cf72fe2 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -47,7 +47,6 @@ #include "TableHosts.h" #include "TableServices.h" #include "logger.h" -#include "tables.h" #ifdef CMC #include "Host.h"

8 years, 8 months

Globally ignore tags file now

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c117a18db3a3eae46cb8f38480d3f27aa7ad141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c117a18db3a3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 14 15:06:47 2016 +0100 Globally ignore tags file now --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cf1d0a4..2a4812c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ check-mk-agent-*.msi RemoteSystemsTempFiles .directory .DS_Store +tags

8 years, 8 months

Push extra_offset through TableHosts::addColumns.

by Sven Panne

Module: check_mk Branch: master Commit: f8bdb0f0c4842ec4a0b58d75405e9b063e8467c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8bdb0f0c4842e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 15:05:46 2016 +0100 Push extra_offset through TableHosts::addColumns. --- livestatus/src/TableHosts.cc | 244 +++++++++++++++++++++--------------------- livestatus/src/TableHosts.h | 2 +- 2 files changed, 123 insertions(+), 123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f8bdb0f0c4…

8 years, 8 months

Add a possible 3rd level of indirection to Column and thread it through to AttributelistColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 0ee4434201b1e4c3f08cbf8a59d75119a91ea604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ee4434201b1e4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 14 14:47:41 2016 +0100 Add a possible 3rd level of indirection to Column and thread it through to AttributelistColumn. This is needed for the chain: bygroup => Service => Host => State Things are getting slightly out of hands here... :-/ What we really need is a kind of flexible DSL for describing the access path instead of this monster. --- livestatus/src/AttributelistColumn.h | 4 ++-- livestatus/src/Column.cc | 18 ++++++++---------- livestatus/src/Column.h | 3 ++- livestatus/src/IntColumn.h | 4 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/livestatus/src/AttributelistColumn.h b/livestatus/src/AttributelistColumn.h index bb0be54..f6ff767 100644 --- a/livestatus/src/AttributelistColumn.h +++ b/livestatus/src/AttributelistColumn.h @@ -46,8 +46,8 @@ class AttributelistColumn : public IntColumn { public: AttributelistColumn(std::string name, std::string description, int offset, int indirect_offset, bool show_list, - int extra_offset = -1) - : IntColumn(name, description, indirect_offset, extra_offset) + int extra_offset = -1, int extra_extra_offset = -1) + : IntColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) , _offset(offset) , _show_list(show_list) { diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index 354b784..ce72c22 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -28,31 +28,29 @@ using std::string; Column::Column(string name, string description, int indirect_offset, - int extra_offset) + int extra_offset, int extra_extra_offset) : _name(name) , _description(description) , _indirect_offset(indirect_offset) , _extra_offset(extra_offset) + , _extra_extra_offset(extra_extra_offset) { } void *Column::shiftPointer(void *data) { - if (!data) - return 0; - + if (!data) return 0; if (_indirect_offset >= 0) { - // add one indirection level - // indirect_offset is place in structure, where - // pointer to real object is data = *((void **)((char *)data + _indirect_offset)); - if (!data) - return 0; } - // one optional extra level of indirection + if (!data) return 0; if (_extra_offset >= 0) data = *((void **)((char *)data + _extra_offset)); + if (!data) return 0; + if (_extra_extra_offset >= 0) + data = *((void **)((char *)data + _extra_extra_offset)); + return data; } diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index e5a1f47..c56e0bd 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -47,10 +47,11 @@ class Column std::string _description; int _indirect_offset; int _extra_offset; + int _extra_extra_offset; public: Column(std::string name, std::string description, int indirect_offset, - int extra_offset); + int extra_offset, int extra_extra_offset = -1); virtual ~Column() {} const char *name() const { return _name.c_str(); } diff --git a/livestatus/src/IntColumn.h b/livestatus/src/IntColumn.h index 3eb50bd..c002db2 100644 --- a/livestatus/src/IntColumn.h +++ b/livestatus/src/IntColumn.h @@ -36,8 +36,8 @@ class Query; class IntColumn : public Column { public: IntColumn(std::string name, std::string description, int indirect_offset, - int extra_offset) - : Column(name, description, indirect_offset, extra_offset) + int extra_offset, int extra_extra_offset = -1) + : Column(name, description, indirect_offset, extra_offset, extra_extra_offset) { } virtual int32_t getValue(void *data, Query *) = 0;

8 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016