Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4612 FIX Auth works now with $apr1$ prefixed passwords

by Lars Michelsen

Module: check_mk Branch: master Commit: a8cf8f6901d2f06bc6e3c3846ad1e18a5933711c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8cf8f6901d2f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 11:21:06 2017 +0200 4612 FIX Auth works now with $apr1$ prefixed passwords The default encryption algorithm of htpasswd stores passwords in MD5 format. If you take a look at the file it prefixes the password with $apr1$. This format was not handled by the Check_MK GUI. If you set the prefix to $1$ it worked. The GUI has been changed to be able to work with both formats. Passwords set with this command should now work out of the box: htpasswd -m $OMD_ROOT/etc/htpasswd [username] Change-Id: I02985fbb2d0727fae80447f6590836d38a70a094 --- .werks/4612 | 19 +++++++++++++++++++ web/plugins/userdb/htpasswd.py | 10 +++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.werks/4612 b/.werks/4612 new file mode 100644 index 0000000..de579c1 --- /dev/null +++ b/.werks/4612 @@ -0,0 +1,19 @@ +Title: Auth works now with $apr1$ prefixed passwords +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494235113 + +The default encryption algorithm of htpasswd stores passwords +in MD5 format. If you take a look at the file it prefixes the +password with $apr1$. This format was not handled by the Check_MK +GUI. If you set the prefix to $1$ it worked. + +The GUI has been changed to be able to work with both formats. +Passwords set with this command should now work out of the box: + +htpasswd -m $OMD_ROOT/etc/htpasswd [username] diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index 4265547..3c46989 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -27,11 +27,11 @@ import crypt import cmk.paths -def encrypt_password(password, salt = None): +def encrypt_password(password, salt=None, prefix="1"): import md5crypt if not salt: salt = "%06d" % (1000000 * (time.time() % 1.0)) - return md5crypt.md5crypt(password, salt, '$1$') + return md5crypt.md5crypt(password, salt, '$%s$' % prefix) class HtpasswdUserConnector(UserConnector): @@ -89,9 +89,9 @@ class HtpasswdUserConnector(UserConnector): # crypt() and md5 hashes. This should be the common cases in the # used htpasswd files. def password_valid(self, pwhash, password): - if pwhash[:3] == '$1$': - salt = pwhash.split('$', 3)[2] - return pwhash == encrypt_password(password, salt) + if pwhash.startswith('$1$') or pwhash.startswith('$apr1$'): + prefix, salt = pwhash.split('$', 3)[1:3] + return pwhash == encrypt_password(password, salt, prefix) else: return pwhash == crypt.crypt(password, pwhash[:2])

7 years, 4 months

4628 mk_jolokia: Bakery now allows to specify server to poll using FQDM instead of IPv4 address

by Konstantin Büttner

Module: check_mk Branch: master Commit: 023c8f8d7b23e6fbd14a885dfaf63252b4ffbf46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=023c8f8d7b23e6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon May 8 11:06:08 2017 +0200 4628 mk_jolokia: Bakery now allows to specify server to poll using FQDM instead of IPv4 address Change-Id: I8ebcb7312df4cba5be7cef37184587787ae5ee92 --- .werks/4628 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4628 b/.werks/4628 new file mode 100644 index 0000000..480e399 --- /dev/null +++ b/.werks/4628 @@ -0,0 +1,10 @@ +Title: mk_jolokia: Bakery now allows to specify server to poll using FQDM instead of IPv4 address +Level: 1 +Component: agents +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1494234196 +

7 years, 4 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 7a0e4bcd91070d0f767d1349aa180e88ce8ab559 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a0e4bcd91070d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 8 10:40:03 2017 +0200 Reserved 20 Werk IDS Change-Id: I2d4112ebdddc91387c84de02a852f3631d0becaf --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 432cde0..e8f0acd 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4646 +4666

7 years, 4 months

4610 FIX Fixed error in graph displaying views with invalid perfdata strings

by Lars Michelsen

Module: check_mk Branch: master Commit: fc16adf894af51d67cd805b6cbcc415f2694e17f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc16adf894af51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 16:20:28 2017 +0200 4610 FIX Fixed error in graph displaying views with invalid perfdata strings When a service had a performance data string set which was only containing spaces or a single space this lead to an exception in the GUI. Change-Id: I8943447b000fd824954dfd34d6891b2ee8ab4ffb --- .werks/4610 | 11 +++++++++++ web/htdocs/metrics.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/4610 b/.werks/4610 new file mode 100644 index 0000000..77a637b --- /dev/null +++ b/.werks/4610 @@ -0,0 +1,11 @@ +Title: Fixed error in graph displaying views with invalid perfdata strings +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493993956 +Class: fix + +When a service had a performance data string set which was only containing +spaces or a single space this lead to an exception in the GUI. diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 0754e4b..8dcf078 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -414,6 +414,9 @@ def parse_perf_data(perf_data_string, check_command=None): html.log("Failed to parse perfdata string: %s" % perf_data_string) return [], check_command + if not parts: + return [], check_command + # Try if check command is appended to performance data # in a PNP like style if parts[-1].startswith("[") and parts[-1].endswith("]"):

7 years, 4 months

Removed a few more global variables. Slightly improved types.

by Sven Panne

Module: check_mk Branch: master Commit: d8a325fa18dc77633fc49e5fd3787900a9ebda94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a325fa18dc77… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 5 11:40:29 2017 +0200 Removed a few more global variables. Slightly improved types. Change-Id: If9d462f6db2be4a551ee54a359a1b5d07664c14f --- livestatus/src/MonitoringCore.h | 4 ++++ livestatus/src/Query.cc | 9 ++++----- livestatus/src/Query.h | 3 ++- livestatus/src/Store.cc | 10 ++++------ livestatus/src/module.cc | 25 ++++++++++++++----------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 1c2bdbc..c950604 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -29,6 +29,7 @@ #include <chrono> #include <string> #include <vector> +#include "data_encoding.h" class Logger; struct Command { @@ -86,6 +87,9 @@ public: virtual std::string mkInventoryPath() = 0; virtual std::string pnpPath() = 0; virtual std::string logArchivePath() = 0; + virtual Encoding dataEncoding() = 0; + virtual size_t maxResponseSize() = 0; + virtual size_t maxCachedMessages() = 0; virtual Logger *loggerLivestatus() = 0; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 2f67923..3abae15 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -51,8 +51,6 @@ #include "nagios.h" #endif -extern unsigned long g_max_response_size; - using std::chrono::duration_cast; using std::chrono::milliseconds; using std::chrono::system_clock; @@ -68,8 +66,9 @@ using std::unique_ptr; using std::vector; Query::Query(const list<string> &lines, Table *table, Encoding data_encoding, - OutputBuffer &output) + size_t max_response_size, OutputBuffer &output) : _data_encoding(data_encoding) + , _max_response_size(max_response_size) , _output(output) , _table(table) , _keepalive(false) @@ -721,9 +720,9 @@ bool Query::timelimitReached() { } bool Query::processDataset(Row row) { - if (_renderer_query->size() > g_max_response_size) { + if (_renderer_query->size() > _max_response_size) { Informational(_logger) << "Maximum response size of " - << g_max_response_size << " bytes exceeded!"; + << _max_response_size << " bytes exceeded!"; // currently we only log an error into the log file and do // not abort the query. We handle it like Limit: return false; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index e723486..2609f50 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -54,7 +54,7 @@ class Table; class Query { public: Query(const std::list<std::string> &lines, Table *, Encoding data_encoding, - OutputBuffer &output); + size_t max_response_size, OutputBuffer &output); bool process(); @@ -76,6 +76,7 @@ public: private: const Encoding _data_encoding; + const size_t _max_response_size; OutputBuffer &_output; QueryRenderer *_renderer_query; Table *_table; diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 2678a57..d30b08e 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -39,12 +39,8 @@ #include "Query.h" #include "StringUtils.h" #include "Table.h" -#include "data_encoding.h" #include "mk_logwatch.h" -extern Encoding g_data_encoding; -extern unsigned long g_max_cached_messages; - using mk::lstrip; using mk::split; using mk::starts_with; @@ -55,7 +51,7 @@ using std::string; Store::Store(MonitoringCore *mc) : _mc(mc) - , _log_cache(mc, g_max_cached_messages) + , _log_cache(mc, mc->maxCachedMessages()) , _table_columns(mc) , _table_commands(mc) , _table_comments(mc) @@ -281,7 +277,9 @@ bool Store::answerGetRequest(const list<string> &lines, OutputBuffer &output, return false; } - return Query(lines, table, g_data_encoding, output).process(); + return Query(lines, table, _mc->dataEncoding(), _mc->maxResponseSize(), + output) + .process(); } Logger *Store::logger() const { return _mc->loggerLivestatus(); } diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 2b62e45..dd55075 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -118,14 +118,14 @@ struct ThreadInfo { static vector<ThreadInfo> fl_thread_info; static thread_local ThreadInfo *tl_info; -unsigned long g_max_cached_messages = 500000; +size_t fl_max_cached_messages = 500000; // do never read more than that number of lines from a logfile static uint32_t fl_max_lines_per_logfile = 1000000; -unsigned long g_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB +size_t fl_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB int g_thread_running = 0; AuthorizationKind g_service_authorization = AuthorizationKind::loose; AuthorizationKind g_group_authorization = AuthorizationKind::strict; -Encoding g_data_encoding = Encoding::utf8; +Encoding fl_data_encoding = Encoding::utf8; // Map to speed up access via name/alias/address unordered_map<string, host *> fl_hosts_by_designation; @@ -652,6 +652,9 @@ public: extern char *log_archive_path; return log_archive_path; } + Encoding dataEncoding() override { return fl_data_encoding; } + size_t maxResponseSize() override { return fl_max_response_size; } + size_t maxCachedMessages() override { return fl_max_cached_messages; } Logger *loggerLivestatus() override { return fl_logger_livestatus; } @@ -906,10 +909,10 @@ void livestatus_parse_arguments(const char *args_orig) { strncpy(fl_mkeventd_socket_path, right, sizeof(fl_mkeventd_socket_path)); } else if (strcmp(left, "max_cached_messages") == 0) { - g_max_cached_messages = strtoul(right, nullptr, 10); + fl_max_cached_messages = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting max number of cached log messages to " - << g_max_cached_messages; + << fl_max_cached_messages; } else if (strcmp(left, "max_lines_per_logfile") == 0) { fl_max_lines_per_logfile = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) @@ -920,11 +923,11 @@ void livestatus_parse_arguments(const char *args_orig) { Notice(fl_logger_nagios) << "setting size of thread stacks to " << g_thread_stack_size; } else if (strcmp(left, "max_response_size") == 0) { - g_max_response_size = strtoul(right, nullptr, 10); + fl_max_response_size = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting maximum response size to " - << g_max_response_size << " bytes (" - << (g_max_response_size / (1024.0 * 1024.0)) << " MB)"; + << fl_max_response_size << " bytes (" + << (fl_max_response_size / (1024.0 * 1024.0)) << " MB)"; } else if (strcmp(left, "num_client_threads") == 0) { int c = atoi(right); if (c <= 0 || c > 1000) { @@ -1014,11 +1017,11 @@ void livestatus_parse_arguments(const char *args_orig) { check_path("Check_MK logwatch directory", fl_mk_logwatch_path); } else if (strcmp(left, "data_encoding") == 0) { if (strcmp(right, "utf8") == 0) { - g_data_encoding = Encoding::utf8; + fl_data_encoding = Encoding::utf8; } else if (strcmp(right, "latin1") == 0) { - g_data_encoding = Encoding::latin1; + fl_data_encoding = Encoding::latin1; } else if (strcmp(right, "mixed") == 0) { - g_data_encoding = Encoding::mixed; + fl_data_encoding = Encoding::mixed; } else { Warning(fl_logger_nagios) << "invalid data_encoding " << right

7 years, 4 months

Improve visualization of agent listing in bakery

by Lars Michelsen

Module: check_mk Branch: master Commit: dab92f055544103ba47d279db6ca0fd900b3b7bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dab92f05554410… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 5 15:16:29 2017 +0200 Improve visualization of agent listing in bakery Change-Id: I728e6fac2db40ca188556e222611e40e6968cd13 --- web/htdocs/pages.css | 44 ++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/views.css | 3 ++- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0fa1320..da71d05 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1286,6 +1286,50 @@ a.element_dragger:hover { transform: scale(1.005); } +td.invtree table, +td.agent_config table.rulesets table { + border-collapse: collapse; + border: 0.5px solid black; + box-shadow: 0.5px 0.5px 1px #ccc; + margin-top: 3px; +} + +td.invtree table td, +td.agent_config table.rulesets table td, +td.invtree table th, +td.agent_config table.rulesets table td.title, +table.data.single tr.data td.invtree table td, +table.data.single tr.data td.invtree table th +{ + border: 1px solid #888; + padding: 1px 5px; + height: 14px; +} + +td.invtree table th, +td.agent_config table.rulesets table td.title { + text-align: left; +} +td.invtree table td, +td.agent_config table.rulesets table td { + background-color: #fff; +} + +td.agent_config table.rulesets table td.title { + background-color: #999; + color: #fff; +} + +table.agents tbody > tr.data > td { + vertical-align: top; + line-height: 20px; +} + +table.agents tbody > tr.data > td.agent_config { + vertical-align: middle; + line-height: normal; +} + /*-------------------------------------------------------------------------. | ____ _ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 631b655..55d2010 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3525,7 +3525,7 @@ class Dictionary(ValueSpec): s += ", " s += "%s: %s" % (vs.title(), text) else: - s += html.render_tr(html.render_td("%s: " % vs.title()) + html.render_td(text)) + s += html.render_tr(html.render_td("%s: " % vs.title(), class_="title") + html.render_td(text)) if not oneline: s = html.render_table(s) return "%s" % s diff --git a/web/htdocs/views.css b/web/htdocs/views.css index f374863..3c89fc7 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -733,7 +733,8 @@ td.invtree ul.treeangle { margin-bottom: 3px; } -td.invtree table { +td.invtree table, +td.agent_config table { border-collapse: collapse; border: 0.5px solid black; box-shadow: 0.5px 0.5px 1px #ccc;

7 years, 4 months

and removed useless print

by Marcel Arentz

Module: check_mk Branch: master Commit: 85e1be9ece6057a6a33891095314d52a54885108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e1be9ece6057… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri May 5 14:09:02 2017 +0200 and removed useless print Change-Id: I9065e8ced42890e63ae92942c13c64a5b05724a1 --- checks/mysql_capacity | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checks/mysql_capacity b/checks/mysql_capacity index b443389..818bba7 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -46,7 +46,6 @@ def parse_mysql_capacity(info): name = " ".join(line[:-2]) size = line[-2] avail = line[-1] - return name, size, avail parsed = {} @@ -70,9 +69,6 @@ def parse_mysql_capacity(info): def inventory_mysql_size(parsed): for instance, values in parsed.items(): - for line in values: - if len(line) == 4: - print line for dbname, used, avail in values: if dbname not in [ "information_schema", "mysql", "performance_schema" ] \ and used != 'NULL' and avail != 'NULL':

7 years, 4 months

moved fix into parse function

by Marcel Arentz

Module: check_mk Branch: master Commit: 64f08e47bc4977203cb4e5a64e532419253d29b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64f08e47bc4977… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri May 5 14:03:28 2017 +0200 moved fix into parse function Change-Id: I9ee9f59707953cb61f52a41d83adf9a5fbce9a27 --- checks/mysql_capacity | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/checks/mysql_capacity b/checks/mysql_capacity index ed64d87..b443389 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -42,6 +42,13 @@ # FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql_capacity(info): + def cut_spaces(line): + name = " ".join(line[:-2]) + size = line[-2] + avail = line[-1] + + return name, size, avail + parsed = {} instance = False for line in info: @@ -51,12 +58,12 @@ def parse_mysql_capacity(info): instance = "mysql" parsed[instance] = [] elif instance: - parsed[instance].append(line) + parsed[instance].append(cut_spaces(line)) if not instance: parsed['mysql'] = [] for line in info: - parsed['mysql'].append(line) + parsed['mysql'].append(cut_spaces(line)) return parsed @@ -64,10 +71,9 @@ def parse_mysql_capacity(info): def inventory_mysql_size(parsed): for instance, values in parsed.items(): for line in values: - dbname = " ".join(line[:-2]) - used = line[-2] - avail = line[-1] - + if len(line) == 4: + print line + for dbname, used, avail in values: if dbname not in [ "information_schema", "mysql", "performance_schema" ] \ and used != 'NULL' and avail != 'NULL': yield "%s:%s" % (instance, dbname), None @@ -84,11 +90,7 @@ def check_mysql_size(item, params, parsed): dbs = parsed[instance] # size and avail are given as bytes - for line in dbs: - db = " ".join(line[:-2]) - size = line[-2] - avail = line[-1] - + for db, size, avail in dbs: if db == dbname: if size == 'NULL': return 3, "Missing information - Size is reported as 'NULL'"

7 years, 4 months

4595 lnx_distro, lnx_packages: Both inventory plugins now support Gentoo Linux

by Simon Betz

Module: check_mk Branch: master Commit: 2b8e2c8ba34a0fa4fcf06275494d0969d24b3017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b8e2c8ba34a0f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 5 13:51:12 2017 +0200 4595 lnx_distro, lnx_packages: Both inventory plugins now support Gentoo Linux Change-Id: I5b7d8b45174731923403effebe1c92ecf3aeac65 --- .werks/4595 | 10 ++++++++++ agents/plugins/mk_inventory.linux | 8 +++++++- inventory/lnx_distro | 12 ++++++++++++ inventory/lnx_packages | 8 ++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.werks/4595 b/.werks/4595 new file mode 100644 index 0000000..7ed9df1 --- /dev/null +++ b/.werks/4595 @@ -0,0 +1,10 @@ +Title: lnx_distro, lnx_packages: Both inventory plugins now support Gentoo Linux +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493984967 +Class: feature + + diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 1dca0c8..8906739 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -50,9 +50,15 @@ then rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{SUMMARY}\t-\n' fi + # List Gentoo packages + if type equery >/dev/null; then + echo "<<<lnx_packages:sep(124):persist($UNTIL)>>>" + equery -C list --format '$category/$name|$fullversion|$mask2|ebuild|Repository $repo|installed' \* | head -n -1 + fi + # Information about distribution echo "<<<lnx_distro:sep(124):persist($UNTIL)>>>" - for f in {/etc/{oracle-release,debian_version,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do + for f in {/etc/{oracle-release,debian_version,gentoo-release,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do if [ -e $f ] ; then echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo break diff --git a/inventory/lnx_distro b/inventory/lnx_distro index df5e7d6..a8575de 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -51,6 +51,8 @@ def inv_lnx_distro(info): inv_lnx_parse_lsb_release(node, line[1:]) elif line[0] == '/etc/debian_version': inv_lnx_parse_debian(node, line[1]) + elif line[0] == '/etc/gentoo-release': + inv_lnx_parse_gentoo(node, line[1]) elif line[0] == '/etc/redhat-release': if line[1].startswith("Oracle"): inv_lnx_parse_oracle_vm_server_release(node, line[1]) @@ -168,6 +170,16 @@ def inv_lnx_parse_cma(node, line): del node["code_name"] +def inv_lnx_parse_gentoo(node, line): + node["type"] = "linux" + node["name"] = line + node["vendor"] = "Gentoo" + parts = line.split(" ") + node["version"] = parts.pop(-1) + if "code_name" in node: + del node["code_name"] + + inv_info['lnx_distro'] = { "inv_function" : inv_lnx_distro, } diff --git a/inventory/lnx_packages b/inventory/lnx_packages index a01fd40..8699018 100644 --- a/inventory/lnx_packages +++ b/inventory/lnx_packages @@ -30,6 +30,14 @@ # zlib1g:i386|1:1.2.7.dfsg-13|i386|deb|compression library - runtime|install ok installed # zlib1g-dev:amd64|1:1.2.7.dfsg-13|amd64|deb|compression library - development|install ok installed +# Example for Gentoo +# sys-libs/ncurses|6.0-r1|amd64|ebuild|Repository gentoo|installed +# sys-libs/pam|1.2.1|amd64|ebuild|Repository gentoo|installed +# sys-libs/readline|6.3_p8-r3|amd64|ebuild|Repository gentoo|installed +# sys-libs/slang|2.3.0|amd64|ebuild|Repository gentoo|installed +# sys-libs/timezone-data|2016h|amd64|ebuild|Repository gentoo|installed +# sys-libs/zlib|1.2.11|amd64|ebuild|Repository gentoo|installed + # Example for RPM # gpg-pubkey|307e3d54|(none)|rpm|gpg(SuSE Package Signing Key <build(a)suse.de>)| # gpg-pubkey|1d061a62|(none)|rpm|gpg(build(a)novell.com (Novell Linux Products) <support(a)novell.com>)|

7 years, 4 months

4641 FIX mysql_capacity: Fixed crash if schema contains spaces

by Marcel Arentz

Module: check_mk Branch: master Commit: b7229afe04206f53552986c5def53834b17f0c32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7229afe04206f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri May 5 13:32:50 2017 +0200 4641 FIX mysql_capacity: Fixed crash if schema contains spaces Change-Id: I7ba3fce4413c3531960b2f4cd6df3714f77f619a --- .werks/4641 | 10 ++++++++++ checks/mysql_capacity | 14 +++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/4641 b/.werks/4641 new file mode 100644 index 0000000..35b6f5f --- /dev/null +++ b/.werks/4641 @@ -0,0 +1,10 @@ +Title: mysql_capacity: Fixed crash if schema contains spaces +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493983948 +Class: fix + + diff --git a/checks/mysql_capacity b/checks/mysql_capacity index c17e63d..ed64d87 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -63,7 +63,11 @@ def parse_mysql_capacity(info): def inventory_mysql_size(parsed): for instance, values in parsed.items(): - for dbname, used, avail in values: + for line in values: + dbname = " ".join(line[:-2]) + used = line[-2] + avail = line[-1] + if dbname not in [ "information_schema", "mysql", "performance_schema" ] \ and used != 'NULL' and avail != 'NULL': yield "%s:%s" % (instance, dbname), None @@ -80,7 +84,11 @@ def check_mysql_size(item, params, parsed): dbs = parsed[instance] # size and avail are given as bytes - for db, size, avail in dbs: + for line in dbs: + db = " ".join(line[:-2]) + size = line[-2] + avail = line[-1] + if db == dbname: if size == 'NULL': return 3, "Missing information - Size is reported as 'NULL'" @@ -92,7 +100,7 @@ def check_mysql_size(item, params, parsed): warn_b = warn * 1024 crit_b = crit * 1024 perfdata = [("database_size", size, warn_b, crit_b)] - if size > crit_b: + if size > crit_b: state = 2 infotext += " (critical at %s)" % get_bytes_human_readable(crit_b) elif size > warn_b:

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017