Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Make cppcheck and human readers more happy about Logfile.

by Sven Panne

Module: check_mk Branch: master Commit: 925a9e9f64497f08733f838608a7fc7dd4da3698 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=925a9e9f64497f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 11:39:02 2016 +0200 Make cppcheck and human readers more happy about Logfile. --- livestatus/src/Logfile.cc | 38 ++++++++++++++++++++------------------ livestatus/src/Logfile.h | 5 +---- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 0765a63..bde700b 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -27,7 +27,9 @@ #include <unistd.h> #include <cstdlib> #include <cstring> +#include <memory> #include <utility> +#include <vector> #include "LogCache.h" #include "LogEntry.h" #include "Query.h" @@ -40,7 +42,8 @@ #include "cmc.h" #endif -using std::make_pair; +using std::make_unique; +using std::vector; extern unsigned long g_max_lines_per_logfile; @@ -152,14 +155,15 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { - while (fgets(_linebuffer, MAX_LOGLINE, file) != nullptr) { + vector<char> linebuffer(65536); + while (fgets(&linebuffer[0], linebuffer.size(), file) != nullptr) { if (_lineno >= g_max_lines_per_logfile) { logger(LG_ERR, "More than %lu lines in %s. Ignoring the rest!", g_max_lines_per_logfile, this->_path); return; } _lineno++; - if (processLogLine(_lineno, missing_types)) { + if (processLogLine(_lineno, &linebuffer[0], missing_types)) { logcache->handleNewMessage(this, since, until, logclasses); // memory management } @@ -186,26 +190,24 @@ long Logfile::freeMessages(unsigned logclasses) { return freed; } -bool Logfile::processLogLine(uint32_t lineno, unsigned logclasses) { - auto entry = new LogEntry(_commands_holder, lineno, _linebuffer); +bool Logfile::processLogLine(uint32_t lineno, const char *linebuffer, + unsigned logclasses) { + auto entry = make_unique<LogEntry>(_commands_holder, lineno, linebuffer); // ignored invalid lines if (entry->_logclass == LOGCLASS_INVALID) { - delete entry; return false; } - if (((1 << entry->_logclass) & logclasses) != 0u) { - uint64_t key = makeKey(entry->_time, lineno); - if (_entries.find(key) == _entries.end()) { - _entries.insert(make_pair(key, entry)); - } else { // this should never happen. The lineno must be unique! - logger(LG_ERR, "Strange: duplicate logfile line %s", _linebuffer); - delete entry; - return false; - } - return true; + if (((1 << entry->_logclass) & logclasses) == 0u) { + return false; } - delete entry; - return false; + uint64_t key = makeKey(entry->_time, entry->_lineno); + if (_entries.find(key) != _entries.end()) { + // this should never happen. The lineno must be unique! + logger(LG_ERR, "Strange: duplicate logfile line %s", entry->_complete); + return false; + } + _entries.emplace(key, entry.release()); + return true; } logfile_entries_t *Logfile::getEntriesFromQuery(Query * /*unused*/, diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index bc1e817..69cfb61 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -39,8 +39,6 @@ struct LogEntry; class World; #endif -#define MAX_LOGLINE 65536 - typedef std::map<uint64_t, LogEntry *> logfile_entries_t; // key is time_t . lineno @@ -54,7 +52,6 @@ private: uint32_t _lineno; // read until this line logfile_entries_t _entries; - char _linebuffer[MAX_LOGLINE]; #ifdef CMC World *_world; // CMC: world our references point into #endif @@ -90,7 +87,7 @@ public: private: void loadRange(FILE *file, unsigned missing_types, LogCache *, time_t since, time_t until, unsigned logclasses); - bool processLogLine(uint32_t, unsigned); + bool processLogLine(uint32_t, const char *linebuffer, unsigned); uint64_t makeKey(time_t, unsigned); };

8 years, 1 month

const-corrected LogEntry constructor.

by Sven Panne

Module: check_mk Branch: master Commit: c8cf9ca7d6eb6684a9487cc4a99ad7ce07903896 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8cf9ca7d6eb66… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 11:38:11 2016 +0200 const-corrected LogEntry constructor. --- livestatus/src/LogEntry.cc | 2 +- livestatus/src/LogEntry.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 938343e..3a69685 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -34,7 +34,7 @@ using mk::starts_with; using std::string; LogEntry::LogEntry(const CommandsHolder &commands_holder, unsigned lineno, - char *line) + const char *line) : _type(NONE) { // TODO(sp) Fix all handleFooEntry() member functions below to always set // all fields and remove this set-me-to-zero-to-be-sure-block. diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index ba5a780..acdf524 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -91,7 +91,7 @@ struct LogEntry { CommandsHolder::Command _command; LogEntry(const CommandsHolder &commands_holder, unsigned lineno, - char *line); + const char *line); ~LogEntry(); unsigned updateReferences(const CommandsHolder &commands_holder); static int serviceStateToInt(const char *s);

8 years, 1 month

Construct lines in-places, as suggested by clang-tidy.

by Sven Panne

Module: check_mk Branch: master Commit: ace211b268d583e137d0d7e7e8efff223c7f1fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ace211b268d583… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 11:37:09 2016 +0200 Construct lines in-places, as suggested by clang-tidy. --- livestatus/src/InputBuffer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 199de3d..4a906e1 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -192,8 +192,8 @@ InputBuffer::Result InputBuffer::readRequest() { length--; } if (length > 0) { - _request_lines.push_back( - string(&_readahead_buffer[_read_index], length)); + _request_lines.emplace_back(&_readahead_buffer[_read_index], + length); } else { logger(LG_INFO, "Warning ignoring line containing only whitespace");

8 years, 1 month

cppcheck tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: 21fa5a86dedbd84b0f9d156edff84be7034d062b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21fa5a86dedbd8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 09:58:48 2016 +0200 cppcheck tweaks. --- livestatus/src/module.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index bb126fd..396441e 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -881,7 +881,8 @@ void omd_advertize() { } } -/* this function gets called when the module is loaded by the event broker */ +// Called from Nagios after we have been loaded. +// cppcheck-suppress unusedFunction extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, void *handle) { g_nagios_handle = handle; @@ -930,6 +931,8 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, return 0; } +// Called from Nagios after before we are unloaded. +// cppcheck-suppress unusedFunction extern "C" int nebmodule_deinit(int flags __attribute__((__unused__)), int reason __attribute__((__unused__))) { logger(LG_INFO, "deinitializing");

8 years, 1 month

Removed unnecessary cppcheck suppressions.

by Sven Panne

Module: check_mk Branch: master Commit: 5ba66dcc79ced352fd54ffaa95fa0cc995059aa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ba66dcc79ced3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 08:25:40 2016 +0200 Removed unnecessary cppcheck suppressions. --- livestatus/src/Logfile.cc | 5 ----- livestatus/src/module.cc | 2 -- 2 files changed, 7 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index dd373bc..0765a63 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -44,11 +44,6 @@ using std::make_pair; extern unsigned long g_max_lines_per_logfile; -// TODO(sp): We need the suppression pragma below because _readpos and -// _linebuffer is not initialized in the constructor. Just replace all this -// manual fiddling with pointers, offsets, etc. with vector. - -// cppcheck-suppress uninitMemberVar Logfile::Logfile(const CommandsHolder &commands_holder, const char *path, bool watch) : _commands_holder(commands_holder) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index d25b232..bb126fd 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -882,7 +882,6 @@ void omd_advertize() { } /* this function gets called when the module is loaded by the event broker */ -/* cppcheck-suppress unusedFunction */ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, void *handle) { g_nagios_handle = handle; @@ -931,7 +930,6 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, return 0; } -/* cppcheck-suppress unusedFunction */ extern "C" int nebmodule_deinit(int flags __attribute__((__unused__)), int reason __attribute__((__unused__))) { logger(LG_INFO, "deinitializing");

8 years, 1 month

Suppress cppcheck warnings about missing system includes.

by Sven Panne

Module: check_mk Branch: master Commit: 1af168a2c4af86607d69f9d2972c6250bdaa400e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af168a2c4af86… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 11 16:24:48 2016 +0200 Suppress cppcheck warnings about missing system includes. They are actually useless, cppcheck knows about them out-of-the-box and would choke on them, anyway. With this change we can actually go back to our zero-tolerance strategy on Jenkins. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4602aa1..6acc8fb 100644 --- a/Makefile +++ b/Makefile @@ -296,13 +296,13 @@ analyze: livestatus/config.h cppcheck: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) --max-configs=16 -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc + $(CPPCHECK) --max-configs=16 -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc # XML output into file intended for machine processing. cppcheck-xml: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) --max-configs=16 -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml + $(CPPCHECK) --max-configs=16 -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 1 month

3784 agent_netapp / 7mode: now also reports snapsvaults for the default filer

by Andreas Boesl

Module: check_mk Branch: master Commit: 486ffb96c5bb711a772ddc19599e76d71bf82fc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=486ffb96c5bb71… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 11 15:57:14 2016 +0200 3784 agent_netapp / 7mode: now also reports snapsvaults for the default filer Previously only vfiler specific snapvaults were reported --- .werks/3784 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_netapp | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.werks/3784 b/.werks/3784 new file mode 100644 index 0000000..7c72216 --- /dev/null +++ b/.werks/3784 @@ -0,0 +1,9 @@ +Title: agent_netapp / 7mode: now also reports snapsvaults for the default filer +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470923754 +Class: feature + +Previously only vfiler specific snapvaults were reported diff --git a/ChangeLog b/ChangeLog index 7173e95..3e5c27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 3712 ispro_sensors_temp, ispro_sensors_humid, ispro_sensors_digital: new checks which monitor Interseptro Pro devices which support the ISPRO-MIB * 3560 emcvnx_disks: now able to configure states for hard read/write errors and when enclosure rebuilds * 3783 netapp_api_qtree_quota: new check to monitor disk usage of qtrees + * 3784 agent_netapp / 7mode: now also reports snapsvaults for the default filer... * 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/agents/special/agent_netapp b/agents/special/agent_netapp index 4fa3d19..d27f5c1 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -778,7 +778,7 @@ else: # VFiler vfiler_info = query("vfiler-list-info") - vfiler_names = [] + vfiler_names = [""] # default is no vfiler if vfiler_info: print "<<<netapp_api_vf_status:sep(9)>>>" for vfiler in vfiler_info.children_get(): @@ -788,20 +788,20 @@ else: print "%s\t%s" % (name, response.child_get_string("status")) # Snapvaults - if vfiler_names: - print "<<<netapp_api_snapvault:sep(9)>>>" - for vfiler in vfiler_names: - server.set_vfiler(vfiler) - response = server.invoke("snapvault-secondary-relationship-status-list-iter-start") - records = response.child_get_string("records") - if not records or records == "0": - continue - tag = response.child_get_string("tag") - response = server.invoke("snapvault-secondary-relationship-status-list-iter-next", "maximum", records, "tag", tag) - print format_config(response.child_get("status-list"), "snapvault", "source-path", - config_report = ["lag-time", "state", "status", "source-system", "destination-system"]) - server.invoke("snapvault-secondary-relationship-status-list-iter-end","tag", tag) - server.set_vfiler("") + print "<<<netapp_api_snapvault:sep(9)>>>" + for vfiler in vfiler_names: + server.set_vfiler(vfiler) + response = server.invoke("snapvault-secondary-relationship-status-list-iter-start") + records = response.child_get_string("records") + if not records or records == "0": + continue + tag = response.child_get_string("tag") + response = server.invoke("snapvault-secondary-relationship-status-list-iter-next", "maximum", records, "tag", tag) + print format_config(response.child_get("status-list"), "snapvault", "source-path", + config_report = ["lag-time", "state", "status", "source-system", "destination-system"]) + server.invoke("snapvault-secondary-relationship-status-list-iter-end","tag", tag) + server.set_vfiler("") # revert back to default (no) vfiler + # VFiler Counters vfiler_counters = query_counters("vfiler")

8 years, 1 month

3783 netapp_api_qtree_quota: new check to monitor disk usage of qtrees

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f476d375e08b2bdc9c10cd761174d476a2e30a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f476d375e08b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 11 15:48:59 2016 +0200 3783 netapp_api_qtree_quota: new check to monitor disk usage of qtrees --- .werks/3783 | 9 ++++++ ChangeLog | 1 + agents/special/agent_netapp | 23 ++++++++++++-- checkman/netapp_api_qtree_quota | 48 ++++++++++++++++++++++++++++ checks/netapp_api_qtree_quota | 66 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 145 insertions(+), 2 deletions(-) diff --git a/.werks/3783 b/.werks/3783 new file mode 100644 index 0000000..acd0bf7 --- /dev/null +++ b/.werks/3783 @@ -0,0 +1,9 @@ +Title: netapp_api_qtree_quota: new check to monitor disk usage of qtrees +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470923312 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ac02ae2..7173e95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 3732 esx_vsphere_hostsystem.mem_usage esx_vsphere_hostsystem.mem_usage_cluster: Providing mem_total as dedicated metric * 3712 ispro_sensors_temp, ispro_sensors_humid, ispro_sensors_digital: new checks which monitor Interseptro Pro devices which support the ISPRO-MIB * 3560 emcvnx_disks: now able to configure states for hard read/write errors and when enclosure rebuilds + * 3783 netapp_api_qtree_quota: new check to monitor disk usage of qtrees * 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/agents/special/agent_netapp b/agents/special/agent_netapp index 13cb323..4fa3d19 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -318,10 +318,10 @@ def query_nodes(what, node_attribute = "node-name"): section_errors = [] def query(what, return_toplevel_node = False): - # HACK: if "what" endswith get-iter, add max_records = 5000 + # HACK: if "what" endswith "iter", add max_records = 5000 # This approach is way easier than reading the tag, invoke another # command and merge all answers together - if what.endswith("get-iter"): + if what.endswith("iter"): response = server.invoke(what, "max-records", 5000) else: response = server.invoke(what) @@ -665,6 +665,15 @@ if netapp_mode == "clustermode": if node in ha_partners: processed_nodes.append(ha_partners[node]) + # Qtree quota usage (# UNTESTED! #) + quota_info = query("quota-report-iter") + if quota_info: + print "<<<netapp_api_qtree_quota:sep(9)>>>" + print format_config(quota_info, "quota", "tree", + config_report = ["volume", "tree", "disk-limit", "disk-used", + "quota-type", "quota-users.quota-user.quota-user-name"], + config_rename = {"quota-users.quota-user.quota-user-name": "quota-users"}) + #. # .--7Mode Settings------------------------------------------------------. @@ -836,6 +845,16 @@ else: if licensev2_info: print format_config(licensev2_info, "license", "package") + # Qtree quota usage + quota_info = query("quota-report") + if quota_info: + print "<<<netapp_api_qtree_quota:sep(9)>>>" + print format_config(quota_info, "quota", "tree", + config_report = ["volume", "tree", "disk-limit", "disk-used", + "quota-type", "quota-users.quota-user.quota-user-name"], + config_rename = {"quota-users.quota-user.quota-user-name": "quota-users"}) + + # #print "<<<netapp_errors>>>" #import pprint diff --git a/checkman/netapp_api_qtree_quota b/checkman/netapp_api_qtree_quota new file mode 100644 index 0000000..f502039 --- /dev/null +++ b/checkman/netapp_api_qtree_quota @@ -0,0 +1,48 @@ +title: NetApp Filers: Used space of qtrees in volumes +agents: netapp +catalog: hw/storagehw/netapp +license: GPL +distribution: check_mk +description: + This check measures the disk usage of qtrees. The usage + is checked against a warning and a critical level, which + can be specified in numerous ways. + + {Trends:} This checks supports aggregation {trends}. This means that the {netapp_api_qtree_quota} check + is able to compute the {change} of the used space over the time and can + make a forecast into the future. It can estimate the time when + the aggregation will be full. + + In the default configuration the check will compute the trend based on the + data of the last 24 hours using a logarithmic average that gives more recent + data a higher weight. Also data beyond the 24 hours will to some small degree be + reflected in the computation. The advantage of this algorithm is a more + precise prediction and a simpler implementation, which does not need any + access to any RRDs or similar storage. + + Please note that when a aggregation is started to be monitored, + the trend of the past is unknown and is assumed to be {zero}. + It will take at least one trend range of time until the trend + approximately reflects the reality. + +item: + Name of the qtree as defined in the system + +examples: + # Example configuration with usage levels at 75%/90%, trend enabled + # and performance data for global, nfs, fcp and iscsi + checkgroup_parameters['filesystem'] = [ + ( {'trend_range': 24, + 'trend_mb': (100, 200), + 'trend_showtimeleft': True, + 'trend_perc': (5.0, 10.0), + 'trend_perfdata': True}, + 'levels': (75.0, 90.0), + [], ALL_HOSTS, ALL_SERVICES ), + ] + checkgroup_parameters['filesystem'] + + +inventory: + All qtrees with the quota-type {tree} are detected upon inventory. + {User} and {group} quota types are not shown. + diff --git a/checks/netapp_api_qtree_quota b/checks/netapp_api_qtree_quota new file mode 100644 index 0000000..24e49f3 --- /dev/null +++ b/checks/netapp_api_qtree_quota @@ -0,0 +1,66 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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- +# tails. 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. + +# <<<netapp_api_qtree_quota:sep(9)>>> +# quota user01 quota-type user disk-limit 12288000 quota-users AD\aolov volume vol_silber2_group_cifs disk-used 0 +# quota user01 quota-type user disk-limit 12288000 quota-users AD\bva volume vol_silber2_group_cifs disk-used 0 +# quota user01 quota-type user disk-limit 12288000 quota-users AD\cclze volume vol_silber2_group_cifs disk-used 0 +# quota fdo01 quota-type tree disk-limit 4294967296 volume vol_bronze1_fdo1 disk-used 3544121572 +# quota fdo03 quota-type tree disk-limit 2684354560 volume vol_bronze1_fdo2 disk-used 788905236 + +def inventory_netapp_api_qtree_quota(parsed): + for qtree, attrs in parsed.items(): + if attrs.get("quota-type") == "tree": + yield qtree, {} + +def check_netapp_api_qtree_quota(item, params, parsed): + qtree = parsed.get(item) + + if not qtree: + return 3, "Qtree not found in agent output" + + size_total = int(qtree.get("disk-limit")) / 1024.0 + size_avail = size_total - int(qtree.get("disk-used")) / 1024.0 + if qtree.get("files-used", "").isdigit() and qtree.get("file-limit", "").isdigit(): + inodes_total = int(qtree.get("file-limit")) + inodes_avail = inodes_total - int(qtree.get("files-used")) + else: + inodes_total = None + inodes_avail = None + + return df_check_filesystem_single(g_hostname, item, size_total, size_avail, 0, + inodes_total, inodes_avail, params) + +check_info["netapp_api_qtree_quota"] = { + 'check_function' : check_netapp_api_qtree_quota, + 'inventory_function' : inventory_netapp_api_qtree_quota, + 'parse_function' : lambda info: netapp_api_parse_lines(info, custom_keys = ["quota", "quota-users"]), + 'service_description' : 'Qtree %s', + 'has_perfdata' : True, + 'group' : "filesystem", + 'includes' : [ "df.include", "netapp_api.include" ], + "default_levels_variable" : "filesystem_default_levels", +}

8 years, 1 month

3782 FIX agent_netapp: fixed exception with values containing umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: c006f30b9176ebb0562efa660024adf58e46932f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c006f30b9176eb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 11 15:28:01 2016 +0200 3782 FIX agent_netapp: fixed exception with values containing umlauts --- .werks/3782 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_netapp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3782 b/.werks/3782 new file mode 100644 index 0000000..3598ad7 --- /dev/null +++ b/.werks/3782 @@ -0,0 +1,9 @@ +Title: agent_netapp: fixed exception with values containing umlauts +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470922034 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8c2c54d..ac02ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -331,6 +331,7 @@ * 3772 FIX: ipmi_sensors: fixed missing states * 3562 FIX: agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions/python versions * 3773 FIX: check_http: fixed proxy authentication + * 3782 FIX: agent_netapp: fixed exception with values containing umlauts Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 618ef6d..13cb323 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -248,7 +248,7 @@ def format_config(instances, prefix, config_key, config_report = "all", if value and (extra_info_report == "all" or key in extra_info_report): line.append("%s %s" % (key, value)) - result.append(("%s" % delimeter).join(line)) + result.append(("%s" % delimeter).join(map(lambda x: x.encode("utf-8"), line))) return "\n".join(result) # Format instance without subnodes as key/value lines

8 years, 1 month

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 332a52834787c5d9ecb4e9f0425c9df36998dfd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=332a52834787c5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 11 15:26:49 2016 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0235404..b105540 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3782 +3832

8 years, 1 month

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016