Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems

by Andreas Boesl

Module: check_mk Branch: master Commit: 953735306be7f1c8e59a7e73b72488270714dde3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953735306be7f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 18 13:08:47 2016 +0200 3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems Solaris systems either report statgrab_mem or solaris_mem sections. The data from these sections is similar, both inventory plugins determine the same inventory data - total ram and total swap. --- .werks/3028 | 11 ++++++++++ ChangeLog | 1 + inventory/solaris_mem | 33 +++++++++++------------------- inventory/statgrab_mem | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 21 deletions(-) diff --git a/.werks/3028 b/.werks/3028 new file mode 100644 index 0000000..1af9f42 --- /dev/null +++ b/.werks/3028 @@ -0,0 +1,11 @@ +Title: statgrab_mem, solaris_mem: updated inventory plugins for solaris systems +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1460977554 +Class: feature + +Solaris systems either report statgrab_mem or solaris_mem sections. +The data from these sections is similar, both inventory plugins determine +the same inventory data - total ram and total swap. diff --git a/ChangeLog b/ChangeLog index 6b3c674..943d5f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -320,6 +320,7 @@ * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag... + * 3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems... * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/inventory/solaris_mem b/inventory/solaris_mem index ad5de97..8f7bd81 100644 --- a/inventory/solaris_mem +++ b/inventory/solaris_mem @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -19,36 +19,27 @@ # 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- -# tails. You should have received a copy of the GNU General Public +# 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. +#<<<solaris_mem>>> +#Memory: 64G phys mem, 28G free mem, 8198M total swap, 8198M free swap -# <<<statgrab_mem>>> -# mem.cache 0 -# mem.free 166014599168 -# mem.total 274877906944 -# mem.used 108863307776 -# swap.free 87748075520 -# swap.total 203939356672 -# swap.used 116191281152 - -# statgrab_mem has a parse function with the following output: +# solaris_mem a parse function with the following output: # { -# 'SwapTotal' : 0, -# 'Cached' : 0, -# 'MemFree' : 1582464, # kB -# 'MemTotal' : 2017928, # kB -# 'SwapFree' : 0, +# 'MemFree': 2070528, +# 'MemTotal': 25165824, +# 'SwapFree': 3802112, +# 'SwapTotal': 4194304 # } def inv_solaris_mem(parsed): node = inv_tree("hardware.memory.") - node["total_ram_usable"] = parsed["MemTotal"] * 1024 - node["total_swap"] = parsed["SwapTotal"] * 1024 - + node["total_ram_usable"] = parsed["MemFree"] + node["total_swap"] = parsed["SwapTotal"] -inv_info['statgrab_mem'] = { +inv_info['solaris_mem'] = { "inv_function" : inv_solaris_mem, } diff --git a/inventory/statgrab_mem b/inventory/statgrab_mem new file mode 100644 index 0000000..7926a06 --- /dev/null +++ b/inventory/statgrab_mem @@ -0,0 +1,52 @@ +#!/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. + +# <<<statgrab_mem>>> +# mem.cache 0 +# mem.free 166014599168 +# mem.total 274877906944 +# mem.used 108863307776 +# swap.free 87748075520 +# swap.total 203939356672 +# swap.used 116191281152 + +# statgrab_mem has a parse function with the following output: +# { +# 'SwapTotal' : 0, +# 'Cached' : 0, +# 'MemFree' : 1582464, # kB +# 'MemTotal' : 2017928, # kB +# 'SwapFree' : 0, +# } +def inv_statgrab_mem(parsed): + node = inv_tree("hardware.memory.") + node["total_ram_usable"] = parsed["MemTotal"] * 1024 + node["total_swap"] = parsed["SwapTotal"] * 1024 + + +inv_info['statgrab_mem'] = { + "inv_function" : inv_statgrab_mem, +}

8 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: a8b2a81a66ff7ae354a1be4d2f5978be5a6ffc05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8b2a81a66ff7a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 18 12:45:45 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/Store.cc | 45 ++++++++++++++++++++++----------------------- livestatus/src/Store.h | 2 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 23dddf5..f3d002d 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -30,6 +30,7 @@ #include "InputBuffer.h" #include "OutputBuffer.h" #include "Query.h" +#include "Table.h" #include "global_counters.h" #include "logger.h" #include "strutil.h" @@ -61,24 +62,23 @@ Store::Store() , _table_commands(_commands_holder) , _table_downtimes(_downtimes, true) , _table_comments(_comments, false) { - _tables.insert(make_pair("columns", &_table_columns)); - _tables.insert(make_pair("commands", &_table_commands)); - _tables.insert(make_pair("comments", &_table_comments)); - _tables.insert(make_pair("contactgroups", &_table_contactgroups)); - _tables.insert(make_pair("contacts", &_table_contacts)); - _tables.insert(make_pair("downtimes", &_table_downtimes)); - _tables.insert(make_pair("hostgroups", &_table_hostgroups)); - _tables.insert(make_pair("hostsbygroup", &_table_hostsbygroup)); - _tables.insert(make_pair("hosts", &_table_hosts)); - _tables.insert(make_pair("log", &_table_log)); - _tables.insert(make_pair("servicegroups", &_table_servicegroups)); - _tables.insert(make_pair("servicesbygroup", &_table_servicesbygroup)); - _tables.insert( - make_pair("servicesbyhostgroup", &_table_servicesbyhostgroup)); - _tables.insert(make_pair("services", &_table_services)); - _tables.insert(make_pair("statehist", &_table_statehistory)); - _tables.insert(make_pair("status", &_table_status)); - _tables.insert(make_pair("timeperiods", &_table_timeperiods)); + addTable(&_table_columns); + addTable(&_table_commands); + addTable(&_table_comments); + addTable(&_table_contactgroups); + addTable(&_table_contacts); + addTable(&_table_downtimes); + addTable(&_table_hostgroups); + addTable(&_table_hostsbygroup); + addTable(&_table_hosts); + addTable(&_table_log); + addTable(&_table_servicegroups); + addTable(&_table_servicesbygroup); + addTable(&_table_servicesbyhostgroup); + addTable(&_table_services); + addTable(&_table_statehistory); + addTable(&_table_status); + addTable(&_table_timeperiods); g_table_hosts = &_table_hosts; g_table_services = &_table_services; @@ -96,13 +96,12 @@ Store::Store() g_table_log = &_table_log; g_table_statehistory = &_table_statehistory; g_table_columns = &_table_columns; - - for (auto &table : _tables) { - _table_columns.addTable(table.second); - } } -Store::~Store() = default; +void Store::addTable(Table *table) { + _tables.emplace(table->name(), table); + _table_columns.addTable(table); +} Table *Store::findTable(string name) { auto it = _tables.find(name); diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 57d0abc..564f50d 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -57,7 +57,6 @@ class Table; class Store { public: Store(); - ~Store(); LogCache *logCache() { return &_log_cache; }; void registerDowntime(nebstruct_downtime_data *); const DowntimesOrComments &downtimes() const; @@ -92,6 +91,7 @@ private: std::mutex _command_mutex; + void addTable(Table *table); Table *findTable(std::string name); void answerGetRequest(const std::list<std::string> &lines, OutputBuffer *, const char *);

8 years, 5 months

3383 FIX Host search: Don't preselect any optional field (

by Lars Michelsen

Searched for empty values) Message-ID: <5710fe31.FVs0UJgpPEBe6n7W%lm(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: eeb3fdae7501f83d8eba6108bcf08f7fb583c551 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeb3fdae7501f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 16:43:54 2016 +0200 3383 FIX Host search: Don't preselect any optional field (Searched for empty values) --- .werks/3383 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/3383 b/.werks/3383 new file mode 100644 index 0000000..db42c4a --- /dev/null +++ b/.werks/3383 @@ -0,0 +1,10 @@ +Title: Host search: Don't preselect any optional field (Searched for empty values) +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460731406 + + diff --git a/ChangeLog b/ChangeLog index 5737b1b..6b3c674 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,6 +274,7 @@ * 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration * 3381 FIX: Folder property editing: Redirect back to folder when coming from folder * 3382 FIX: Fixed exception when moving multiple folder levels to another folder + * 3383 FIX: Host search: Don't preselect any optional field (Searched for empty values) Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4688418..451978a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15782,8 +15782,6 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr active = True elif cb != None: active = cb # get previous state of checkbox - elif for_what == "host_search": - active = attr.default_value() == "" # show empty text search fields always elif for_what == "bulk": active = unique and len(values) > 0 elif for_what == "folder" and myself:

8 years, 5 months

3382 FIX Fixed exception when moving multiple folder levels to another folder

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fc4bddb0ac245921563dc94a9875f2c72fa28a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc4bddb0ac245… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 16:39:22 2016 +0200 3382 FIX Fixed exception when moving multiple folder levels to another folder --- .werks/3382 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3382 b/.werks/3382 new file mode 100644 index 0000000..9a830f6 --- /dev/null +++ b/.werks/3382 @@ -0,0 +1,9 @@ +Title: Fixed exception when moving multiple folder levels to another folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460731130 + diff --git a/ChangeLog b/ChangeLog index 228ec0a..5737b1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 3378 FIX: Fixed too long contact group names overflowing WATO folders * 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration * 3381 FIX: Folder property editing: Redirect back to folder when coming from folder + * 3382 FIX: Fixed exception when moving multiple folder levels to another folder Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index af88693..7b87839 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1330,8 +1330,9 @@ class Folder(BaseFolder): self.need_unlocked() self.need_unlocked_subfolders() self.need_unlocked_hosts() + for subfolder in self.subfolders().values(): - subfolder.need_recursive_write_permission(how) + subfolder.need_recursive_permission(how) def need_unlocked(self):

8 years, 5 months

3381 FIX Folder property editing: Redirect back to folder when coming from folder

by Lars Michelsen

Module: check_mk Branch: master Commit: 598232e5a128f7747b1a384649ccb62f021d4213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=598232e5a128f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 16:28:51 2016 +0200 3381 FIX Folder property editing: Redirect back to folder when coming from folder --- .werks/3381 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3381 b/.werks/3381 new file mode 100644 index 0000000..92dc63f --- /dev/null +++ b/.werks/3381 @@ -0,0 +1,10 @@ +Title: Folder property editing: Redirect back to folder when coming from folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460730504 + + diff --git a/ChangeLog b/ChangeLog index b2b16de..228ec0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -272,6 +272,7 @@ * 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 * 3378 FIX: Fixed too long contact group names overflowing WATO folders * 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration + * 3381 FIX: Folder property editing: Redirect back to folder when coming from folder Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ca022e9..4688418 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -361,7 +361,7 @@ def mode_folder(phase): html.context_button(_("Rulesets"), folder_preserving_link([("mode", "ruleeditor")]), "rulesets") html.context_button(_("Manual Checks"), folder_preserving_link([("mode", "static_checks")]), "static_checks") if folder.may("read"): - html.context_button(_("Folder Properties"), folder.edit_url(), "edit") + html.context_button(_("Folder Properties"), folder.edit_url(backfolder=folder), "edit") if not folder.locked_subfolders() and config.may("wato.manage_folders") and folder.may("write"): html.context_button(_("New folder"), folder.url([("mode", "newfolder")]), "newfolder") if not folder.locked_hosts() and config.may("wato.manage_hosts") and folder.may("write"):

8 years, 5 months

fixed missing metrics for active ping check

by Andreas Boesl

Module: check_mk Branch: master Commit: 5cbf9cb62ac10fafda0519e7101bef97f9e1d353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cbf9cb62ac10f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 15 15:48:13 2016 +0200 fixed missing metrics for active ping check --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ad80128..8595d69 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -293,7 +293,7 @@ def indexed_color(idx, total): MAX_NUMBER_HOPS = 45 # the amount of hop metrics, graphs and perfometers to create -for idx in range(1, MAX_NUMBER_HOPS): +for idx in range(0, MAX_NUMBER_HOPS): if idx: prefix_perf = "hop_%d_" % idx prefix_text = "Hop %d " % idx

8 years, 5 months

3412 stulz_temp: now has readable sensor names and discovers all possible sensors which are connected

by Simon Betz

Module: check_mk Branch: master Commit: 384844a4cabb1e35f3e84d09ac626b05de451e4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=384844a4cabb1e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 15 15:35:41 2016 +0200 3412 stulz_temp: now has readable sensor names and discovers all possible sensors which are connected --- .werks/3412 | 9 +++++ ChangeLog | 2 ++ checks/stulz_temp | 94 +++++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 84 insertions(+), 21 deletions(-) diff --git a/.werks/3412 b/.werks/3412 new file mode 100644 index 0000000..d345c49 --- /dev/null +++ b/.werks/3412 @@ -0,0 +1,9 @@ +Title: stulz_temp: now has readable sensor names and discovers all possible sensors which are connected +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.9i1 +Date: 1460727255 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 51f6a99..b2b16de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ * 3027 mtr (Matt's traceroute): New agent plugin... * 3410 ipmi: now monitors compact/discrete sensors... * 3411 mysql_slave: now max time and related state can be configured if slave-IO and slave-SQL are not running + * 3412 stulz_temp: now has readable sensor names and discovers all possible sensors which are connected + NOTE: Please refer to the migration notes! * 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/stulz_temp b/checks/stulz_temp index 573cd78..ef8f7cb 100644 --- a/checks/stulz_temp +++ b/checks/stulz_temp @@ -25,34 +25,86 @@ # Boston, MA 02110-1301 USA. -# TODO: This device provides multiple temperature readings, currently -# only one is evaluated: "Return Air" -# Right now the items are not named according to the guideline +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1170.1.1.1 220 --> Stulz-WIB8000-MIB::unitAirTemperature.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1170.1.2.1 216 --> Stulz-WIB8000-MIB::unitAirTemperature.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1175.1.1.1 220 --> Stulz-WIB8000-MIB::unitSetpointAirTratureCorrected.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1175.1.2.1 220 --> Stulz-WIB8000-MIB::unitSetpointAirTratureCorrected.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1192.1.1.1 221 --> Stulz-WIB8000-MIB::unitReturnAirTemperature.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1192.1.2.1 216 --> Stulz-WIB8000-MIB::unitReturnAirTemperature.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1193.1.1.1 220 --> Stulz-WIB8000-MIB::unitSupplyAirTemperature.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1193.1.2.1 214 --> Stulz-WIB8000-MIB::unitSupplyAirTemperature.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1196.1.2.1 83 --> Stulz-WIB8000-MIB::unitOutsideAirTemperature.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1171.1.1.1 418 --> Stulz-WIB8000-MIB::unitHumidity.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1171.1.2.1 420 --> Stulz-WIB8000-MIB::unitHumidity.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1178.1.1.1 500 --> Stulz-WIB8000-MIB::unitSetpointHumidityCorrected.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1178.1.2.1 500 --> Stulz-WIB8000-MIB::unitSetpointHumidityCorrected.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1194.1.1.1 418 --> Stulz-WIB8000-MIB::unitReturnAirHumidity.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1194.1.2.1 419 --> Stulz-WIB8000-MIB::unitReturnAirHumidity.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1195.1.1.1 421 --> Stulz-WIB8000-MIB::unitSupplyAirHumidity.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.2.1.1.1195.1.2.1 425 --> Stulz-WIB8000-MIB::unitSupplyAirHumidity.1.2.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.3.1.1.1208.1.1.1 11 --> Stulz-WIB8000-MIB::currentRaisedFloorPressure.1.1.1 +# .1.3.6.1.4.1.29462.10.2.1.1.1.1.3.1.1.1208.1.2.1 16 --> Stulz-WIB8000-MIB::currentRaisedFloorPressure.1.2.1 factory_settings["stulz_temp_default_levels"] = { "levels": (25, 28) } -def inventory_stulz_temp(info): - for line in info: - yield line[0], {} -def check_stulz_temp(item, params, info): - for line in info: - if line[0] == item: - return check_temperature(int(line[1])/10, params, "stulz_temp_%s" % item) +def parse_stulz_temp(info): + map_types = { + "1170" : "unit air", + "1192" : "unit return air", + "1193" : "unit supply air", + "1196" : "unit outside air", + "1243" : "unit supply 3", + "1244" : "unit return air 2", + "1245" : "unit return air 3", + "1246" : "unit return air temrn", + "1247" : "unit return air temly", + "1248" : "unit supply air 2", + "10210" : "condensor", + "10211" : "supply 1", + "10212" : "supply 2", + "10264" : "FCB room air", + "10266" : "supply air comfort unit 1", + "10267" : "supply air comfort unit 2", + "10268" : "FCB outside air", + } -check_info["stulz_temp"] = { - "check_function" : check_stulz_temp, - "inventory_function" : inventory_stulz_temp, - "service_description" : "Temperature %s", - "has_perfdata" : True, - "group" : "temperature", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.29462.10", - "snmp_info" : ( ".1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1192", [ OID_END, 1] ), - "includes" : [ "temperature.include" ], - "default_levels_variable": "stulz_temp_default_levels" + parsed = {} + for oidend, reading_str in info: + oids = oidend.split(".") + temp_ty = oids[0] + index = oids[2] + if temp_ty in map_types: + itemname = "%s-%s" % (map_types[temp_ty], index) + parsed.setdefault(itemname, float(reading_str)/10) + + return parsed + + +def inventory_stulz_temp(parsed): + for item in parsed: + yield item, {} -} +def check_stulz_temp(item, params, parsed): + if item in parsed: + return check_temperature(parsed[item], params, "stulz_temp_%s" % item) + + +check_info["stulz_temp"] = { + "parse_function" : parse_stulz_temp, + "inventory_function" : inventory_stulz_temp, + "check_function" : check_stulz_temp, + "service_description" : "Temperature %s", + "has_perfdata" : True, + "group" : "temperature", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.29462.10", + "snmp_info" : ( ".1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1", [ + OID_END, "", + ]), + "includes" : [ "temperature.include" ], + "default_levels_variable" : "stulz_temp_default_levels" +}

8 years, 5 months

3399 FIX statgrab_mem, hr_mem: Fix display of total installed memory in graph

by Mathias Kettner

Module: check_mk Branch: master Commit: c537ac33bf4777db9bcee9f749cce384346a6290 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c537ac33bf4777… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 15 15:17:01 2016 +0200 3399 FIX statgrab_mem, hr_mem: Fix display of total installed memory in graph --- .werks/3399 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3399 b/.werks/3399 new file mode 100644 index 0000000..808bd72 --- /dev/null +++ b/.werks/3399 @@ -0,0 +1,10 @@ +Title: statgrab_mem, hr_mem: Fix display of total installed memory in graph +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460726194 + + diff --git a/ChangeLog b/ChangeLog index 2a9c447..51f6a99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more * 3122 FIX: netapp_fcpio: the rules for this check are now actually used... * 3409 FIX: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates + * 3399 FIX: statgrab_mem, hr_mem: Fix display of total installed memory in graph Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b72d0d4..ad80128 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3201,7 +3201,7 @@ check_metrics["check_mk-netscaler_mem"] = { ram_used_swap_translation = { "ramused" : { "name" : "mem_used", "scale" : MB }, "swapused" : { "name" : "swap_used", "scale" : MB }, - "memused" : { "name" : "mem_total", "scale" : MB }, + "memused" : { "name" : "total_used", "auto_graph" : False, "scale" : MB }, } check_metrics["check_mk-statgrab_mem"] = ram_used_swap_translation @@ -5695,9 +5695,13 @@ graph_info.append({ "metrics" : [ ("mem_used", "area"), ("swap_used", "stack"), - ("mem_total", "line"), ], "conflicting_metrics" : [ "swap_total" ], + "scalars" : [ + ( "swap_used:max,mem_used:max,+#008080", _("Total RAM + SWAP installed") ), + ( "mem_used:max#80ffff", _("Total RAM installed") ), + ], + "range" : (0, "swap_used:max,mem_used:max,+"), }) graph_info.append({

8 years, 5 months

Use unique_ptr in DowntimesOrComments instead of old-skool pointers, vastly simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: cf41811bbb92099162ba1d9be1b540fbf3f72e16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf41811bbb9209… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 15 15:04:30 2016 +0200 Use unique_ptr in DowntimesOrComments instead of old-skool pointers, vastly simplifying things. --- livestatus/src/DownCommColumn.cc | 9 +++---- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/DowntimesOrComments.cc | 42 ++++++++++----------------------- livestatus/src/DowntimesOrComments.h | 9 +++---- livestatus/src/TableDownComm.cc | 6 +++-- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index eb816cb..9b7b583 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -25,6 +25,7 @@ #include "DownCommColumn.h" #include <stdint.h> #include <stdlib.h> +#include <memory> #include <utility> #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" @@ -43,9 +44,9 @@ void DownCommColumn::output(void *data, Query *query) { data = shiftPointer(data); // points to host or service if (data != nullptr) { bool first = true; - for (auto entry : holder()) { + for (const auto &entry : holder()) { unsigned long id = entry.first; - DowntimeOrComment *dt = entry.second; + DowntimeOrComment *dt = entry.second.get(); if (match(dt, data)) { if (first) { first = false; @@ -115,8 +116,8 @@ bool DownCommColumn::isEmpty(void *data) { return true; } - for (auto entry : holder()) { - DowntimeOrComment *dt = entry.second; + for (const auto &entry : holder()) { + DowntimeOrComment *dt = entry.second.get(); if (dt->_service == data || (dt->_service == nullptr && dt->_host == data)) { return false; diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index 5c5ec3e..27b5f7f 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -29,7 +29,7 @@ #include <string> #include "Column.h" #include "ListColumn.h" -class DowntimeOrComment; +struct DowntimeOrComment; class DowntimesOrComments; class Query; diff --git a/livestatus/src/DowntimesOrComments.cc b/livestatus/src/DowntimesOrComments.cc index 6810fcf..f842220 100644 --- a/livestatus/src/DowntimesOrComments.cc +++ b/livestatus/src/DowntimesOrComments.cc @@ -27,20 +27,19 @@ #include "DowntimeOrComment.h" #include "logger.h" -DowntimesOrComments::~DowntimesOrComments() { - for (auto &entry : _entries) { - delete entry.second; - } -} +using std::make_unique; void DowntimesOrComments::registerDowntime(nebstruct_downtime_data *data) { + unsigned long id = data->downtime_id; switch (data->type) { case NEBTYPE_DOWNTIME_ADD: case NEBTYPE_DOWNTIME_LOAD: - add(new Downtime(data)); + _entries[id] = make_unique<Downtime>(data); break; case NEBTYPE_DOWNTIME_DELETE: - remove(data->downtime_id); + if (_entries.erase(id) == 0) { + logger(LG_INFO, "Cannot delete non-existing downtime %lu", id); + } break; default: break; @@ -48,40 +47,23 @@ void DowntimesOrComments::registerDowntime(nebstruct_downtime_data *data) { } void DowntimesOrComments::registerComment(nebstruct_comment_data *data) { + unsigned long id = data->comment_id; switch (data->type) { case NEBTYPE_COMMENT_ADD: case NEBTYPE_COMMENT_LOAD: - add(new Comment(data)); + _entries[id] = make_unique<Comment>(data); break; case NEBTYPE_COMMENT_DELETE: - remove(data->comment_id); + if (_entries.erase(id) == 0) { + logger(LG_INFO, "Cannot delete non-existing comment %lu", id); + } break; default: break; } } -void DowntimesOrComments::add(DowntimeOrComment *data) { - auto it = _entries.find(data->_id); - if (it == _entries.end()) { - _entries.emplace(data->_id, data); - } else { - delete it->second; - it->second = data; - } -} - -void DowntimesOrComments::remove(unsigned long id) { - auto it = _entries.find(id); - if (it == _entries.end()) { - logger(LG_INFO, "Cannot delete non-existing downtime/comment %lu", id); - } else { - delete it->second; - _entries.erase(it); - } -} - DowntimeOrComment *DowntimesOrComments::findEntry(unsigned long id) const { auto it = _entries.find(id); - return it == _entries.end() ? nullptr : it->second; + return it == _entries.end() ? nullptr : it->second.get(); } diff --git a/livestatus/src/DowntimesOrComments.h b/livestatus/src/DowntimesOrComments.h index e0d9092..00c7552 100644 --- a/livestatus/src/DowntimesOrComments.h +++ b/livestatus/src/DowntimesOrComments.h @@ -27,12 +27,12 @@ #include "config.h" // IWYU pragma: keep #include <map> +#include <memory> +#include "DowntimeOrComment.h" // IWYU pragma: keep #include "nagios.h" -struct DowntimeOrComment; class DowntimesOrComments { public: - ~DowntimesOrComments(); void registerDowntime(nebstruct_downtime_data *data); void registerComment(nebstruct_comment_data *data); DowntimeOrComment *findEntry(unsigned long id) const; @@ -40,10 +40,7 @@ public: auto end() const { return _entries.cend(); } private: - std::map<unsigned long, DowntimeOrComment *> _entries; - - void add(DowntimeOrComment *data); - void remove(unsigned long id); + std::map<unsigned long, std::unique_ptr<DowntimeOrComment>> _entries; }; #endif // DowntimesOrComments_h diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 2a13e3d..ce163c9 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableDownComm.h" +#include <memory> #include <utility> #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep @@ -36,7 +37,8 @@ // TODO(sp): the dynamic data in this table must be locked with a mutex -TableDownComm::TableDownComm(const DowntimesOrComments &holder, bool is_downtime) +TableDownComm::TableDownComm(const DowntimesOrComments &holder, + bool is_downtime) : _is_downtime(is_downtime), _holder(holder) { DowntimeOrComment *ref = nullptr; addColumn(new OffsetStringColumn( @@ -131,7 +133,7 @@ TableDownComm::TableDownComm(const DowntimesOrComments &holder, bool is_downtime void TableDownComm::answerQuery(Query *query) { for (const auto &entry : _holder) { - if (!query->processDataset(entry.second)) { + if (!query->processDataset(entry.second.get())) { break; } }

8 years, 5 months

Simplified downtime/comment handling.

by Sven Panne

Module: check_mk Branch: master Commit: a98f9cda36e03da4ee91baa386487a15990d54d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a98f9cda36e03d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 15 09:43:55 2016 +0200 Simplified downtime/comment handling. Nagios has different ID namespaces for downtimes and comments, but these namespaces contain things for both hosts and services. In other words: Within downtimes, each downtime ID alone is a unique key, and the same holds for comments and their commend IDs. Therefore we can remove the host/service flag from the key in our internal data structures, making things much clearer. Various minor cleanups on the way. --- livestatus/src/DownCommColumn.cc | 44 ++++++++--------- livestatus/src/DownCommColumn.h | 4 ++ livestatus/src/TableDownComm.cc | 101 ++++++++++++++++++-------------------- livestatus/src/TableDownComm.h | 21 ++++---- 4 files changed, 83 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a98f9cda36…

8 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
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