Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

Improved naming and signature of a helper function.

by Sven Panne

Module: check_mk Branch: master Commit: 7e796373ae0256557f3891fa4f335ebefe4cdc67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e796373ae0256… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 30 16:55:32 2018 +0200 Improved naming and signature of a helper function. Change-Id: If87df6da79e5da3420640a086b0ba40df0439f34 --- livestatus/src/LogCache.cc | 10 +++++----- livestatus/src/LogCache.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index ec0358a..2506863 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -26,6 +26,7 @@ #include <sstream> #include <string> #include <utility> +#include "FileSystem.h" #include "LogEntry.h" // IWYU pragma: keep #include "Logfile.h" #include "Logger.h" @@ -80,20 +81,19 @@ void LogCache::updateLogfileIndex() { _last_index_update = std::chrono::system_clock::now(); // We need to find all relevant logfiles. This includes directory, the // current nagios.log and all files in the archive. - scanLogfile(_mc->historyFilePath(), true); + addToIndex(std::make_unique<Logfile>(_mc, _mc->historyFilePath(), true)); fs::path dirpath = _mc->logArchivePath(); try { for (const auto &entry : fs::directory_iterator(dirpath)) { - scanLogfile(entry.path(), false); + addToIndex(std::make_unique<Logfile>(_mc, entry.path(), false)); } } catch (const fs::filesystem_error &e) { Warning(logger()) << "updating log file index: " << e.what(); } } -void LogCache::scanLogfile(const fs::path &path, bool watch) { - auto logfile = std::make_unique<Logfile>(_mc, path, watch); +void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { time_t since = logfile->since(); if (since == 0) { return; @@ -102,7 +102,7 @@ void LogCache::scanLogfile(const fs::path &path, bool watch) { // circumstances this never happens, but the user might have copied files // around. if (_logfiles.find(since) != _logfiles.end()) { - Warning(logger()) << "ignoring duplicate log file " << path; + Warning(logger()) << "ignoring duplicate log file " << logfile->path(); return; } diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 2031b63..84e9ceb 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -31,7 +31,6 @@ #include <map> #include <memory> #include <mutex> -#include "FileSystem.h" class Logfile; class Logger; class MonitoringCore; @@ -59,7 +58,7 @@ private: logfiles_t _logfiles; std::chrono::system_clock::time_point _last_index_update; - void scanLogfile(const fs::path &path, bool watch); + void addToIndex(std::unique_ptr<Logfile> logfile); Logger *logger() const; };

6 years, 1 month

Removed unused parameters.

by Sven Panne

Module: check_mk Branch: master Commit: 4b127bbec45fa05bc811a2b54f42c9ae2a043455 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b127bbec45fa0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 30 16:17:53 2018 +0200 Removed unused parameters. Change-Id: I0b84755320b724ac60b68dbb68ed26989a64043e --- livestatus/src/LogCache.cc | 3 +-- livestatus/src/LogCache.h | 3 +-- livestatus/src/Logfile.cc | 21 +++++++++------------ livestatus/src/Logfile.h | 9 ++++----- livestatus/src/TableStateHistory.cc | 12 ++++++------ 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 68d41fe..8a0ce98 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -119,8 +119,7 @@ void LogCache::scanLogfile(const fs::path &path, bool watch) { The parameters to this method reflect the current query, not the messages that just has been loaded. */ -void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, - time_t /*unused*/, unsigned logclasses) { +void LogCache::handleNewMessage(Logfile *logfile, unsigned logclasses) { if (static_cast<unsigned long>(++num_cached_log_messages) <= _max_cached_messages) { return; // current message count still allowed, everything ok diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 5044512..2031b63 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -46,8 +46,7 @@ public: #ifdef CMC void setMaxCachedMessages(unsigned long m); #endif - void handleNewMessage(Logfile *logfile, time_t since, time_t until, - unsigned logclasses); + void handleNewMessage(Logfile *logfile, unsigned logclasses); logfiles_t *logfiles() { return &_logfiles; }; void forgetLogfiles(); void updateLogfileIndex(); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 584c8bb..dc162ec 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -83,8 +83,7 @@ void Logfile::flush() { _logclasses_read = 0; } -void Logfile::load(LogCache *logcache, time_t since, time_t until, - unsigned logclasses) { +void Logfile::load(LogCache *logcache, unsigned logclasses) { unsigned missing_types = logclasses & ~_logclasses_read; FILE *file = nullptr; // The current logfile has the _watch flag set to true. @@ -107,14 +106,13 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, // have read to the end of the file if (_logclasses_read != 0u) { fsetpos(file, &_read_pos); // continue at previous end - loadRange(file, _logclasses_read, logcache, since, until, - logclasses); + loadRange(file, _logclasses_read, logcache, logclasses); fgetpos(file, &_read_pos); } if (missing_types != 0u) { fseek(file, 0, SEEK_SET); _lineno = 0; - loadRange(file, missing_types, logcache, since, until, logclasses); + loadRange(file, missing_types, logcache, logclasses); _logclasses_read |= missing_types; fgetpos(file, &_read_pos); // remember current end of file } @@ -132,14 +130,14 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, } _lineno = 0; - loadRange(file, missing_types, logcache, since, until, logclasses); + loadRange(file, missing_types, logcache, logclasses); fclose(file); _logclasses_read |= missing_types; } } void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, - time_t since, time_t until, unsigned logclasses) { + unsigned logclasses) { std::vector<char> linebuffer(65536); // TODO(sp) We should really use C++ I/O here... while (fgets(&linebuffer[0], static_cast<int>(linebuffer.size()), file) != @@ -158,7 +156,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, } } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { - logcache->handleNewMessage(this, since, until, logclasses); + logcache->handleNewMessage(this, logclasses); } } } @@ -205,12 +203,11 @@ bool Logfile::processLogLine(size_t lineno, std::string line, logfile_entries_t *Logfile::getEntriesFromQuery(const Query * /*unused*/, LogCache *logcache, - time_t since, time_t until, unsigned logclasses) { // Make sure existing references to objects point to correct world updateReferences(); // make sure all messages are present - load(logcache, since, until, logclasses); + load(logcache, logclasses); return &_entries; } @@ -219,7 +216,7 @@ bool Logfile::answerQuery(Query *query, LogCache *logcache, time_t since, // Make sure existing references to objects point to correct world updateReferences(); // make sure all messages are present - load(logcache, since, until, logclasses); + load(logcache, logclasses); uint64_t sincekey = makeKey(since, 0); for (auto it = _entries.lower_bound(sincekey); it != _entries.end(); ++it) { // end found or limit exceeded? @@ -236,7 +233,7 @@ bool Logfile::answerQueryReverse(Query *query, LogCache *logcache, time_t since, // Make sure existing references to objects point to correct world updateReferences(); // make sure all messages are present - load(logcache, since, until, logclasses); + load(logcache, logclasses); uint64_t untilkey = makeKey(until, 999999999); auto it = _entries.upper_bound(untilkey); while (it != _entries.begin()) { diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 1877b93..05db416 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -70,15 +70,14 @@ public: // character at both ends. std::unique_ptr<std::vector<char>> readIntoBuffer(); #endif - void load(LogCache *logcache, time_t since, time_t until, - unsigned logclasses); + void load(LogCache *logcache, unsigned logclasses); void flush(); time_t since() { return _since; } unsigned classesRead() { return _logclasses_read; } size_t size() { return _entries.size(); } logfile_entries_t *getEntriesFromQuery(const Query *query, - LogCache *logcache, time_t since, - time_t until, unsigned logclasses); + LogCache *logcache, + unsigned logclasses); bool answerQuery(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses); bool answerQueryReverse(Query *query, LogCache *logcache, time_t since, @@ -91,7 +90,7 @@ public: private: void loadRange(FILE *file, unsigned missing_types, LogCache *logcache, - time_t since, time_t until, unsigned logclasses); + unsigned logclasses); bool processLogLine(size_t lineno, std::string line, unsigned logclasses); uint64_t makeKey(time_t t, size_t lineno); Logger *logger() const; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 53385bf..e0d6162 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -212,8 +212,8 @@ void TableStateHistory::getPreviousLogentry() { return; } --_it_logs; - _entries = _it_logs->second->getEntriesFromQuery( - _query, _log_cache, _since, _until, classmask_statehist); + _entries = _it_logs->second->getEntriesFromQuery(_query, _log_cache, + classmask_statehist); _it_entries = _entries->end(); } --_it_entries; @@ -230,8 +230,8 @@ LogEntry *TableStateHistory::getNextLogentry() { return nullptr; } ++_it_logs; - _entries = _it_logs->second->getEntriesFromQuery( - _query, _log_cache, _since, _until, classmask_statehist); + _entries = _it_logs->second->getEntriesFromQuery(_query, _log_cache, + classmask_statehist); _it_entries = _entries->begin(); } return _it_entries->second.get(); @@ -331,8 +331,8 @@ void TableStateHistory::answerQuery(Query *query) { } // Determine initial logentry - _entries = _it_logs->second->getEntriesFromQuery( - query, _log_cache, _since, _until, classmask_statehist); + _entries = _it_logs->second->getEntriesFromQuery(query, _log_cache, + classmask_statehist); if (!_entries->empty() && _it_logs != newest_log) { _it_entries = _entries->end(); // Check last entry. If it's younger than _since -> use this logfile too

6 years, 1 month

6217 FIX mgmt_ipmi_sensors: Fix wrong state for IPMI Sensor warnings

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0d6e828d1ecdc364b92d653c6b4f674f864cdd99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d6e828d1ecdc3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Aug 30 15:46:46 2018 +0200 6217 FIX mgmt_ipmi_sensors: Fix wrong state for IPMI Sensor warnings Previously IPMI Sensors have been mapped to CRIT when they where above the "non-critical" but below the "critical" threshold. This as been fixed to WARN. FEED-943 Change-Id: I25e52b2c405b8386d6471f8217e925956ed5f5ca --- .werks/6217 | 12 ++++++++++++ checks/ipmi_sensors.include | 13 +++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/6217 b/.werks/6217 new file mode 100644 index 0000000..418c056 --- /dev/null +++ b/.werks/6217 @@ -0,0 +1,12 @@ +Title: mgmt_ipmi_sensors: Fix wrong state for IPMI Sensor warnings +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535636520 +Class: fix + +Previously IPMI Sensors have been mapped to CRIT when they where +above the "non-critical" but below the "critical" threshold. +This as been fixed to WARN. diff --git a/checks/ipmi_sensors.include b/checks/ipmi_sensors.include index 9930d54..7b36483 100644 --- a/checks/ipmi_sensors.include +++ b/checks/ipmi_sensors.include @@ -189,8 +189,17 @@ def inventory_freeipmi(parsed): def freeipmi_status_txt_mapping(status_txt): if status_txt is None: return 3 - elif status_txt in [ - "OK", "Entity Present", "battery presence detected", + + state = {"ok": 0, + "warning": 1, + "critical": 2, "failed": 2, + "unknown": 3, + }.get(status_txt.lower()) + if state is not None: + return state + + if status_txt in [ + "Entity Present", "battery presence detected", "Drive Presence", "transition to Running", "Device Enabled", "System full operational, working", "System Restart", ] or \

6 years, 1 month

6516 SEC Fixed stored XSS using alert handler config

by Lars Michelsen

Module: check_mk Branch: master Commit: 489f235273865a05dfd0ee12c825575ddb6ef20b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=489f235273865a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 30 16:47:31 2018 +0200 6516 SEC Fixed stored XSS using alert handler config A user with permission to the alert handler administration could use an alert rule to store arbitrary javascript code which would then be executed in the context of the browser of another user with permission to the alert handler administration when viewing the list of alert handlers. Change-Id: Iac9e1891ea9a0166f7347d6e7349c3f610b190e6 --- .werks/6516 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6516 b/.werks/6516 new file mode 100644 index 0000000..ecbabc5 --- /dev/null +++ b/.werks/6516 @@ -0,0 +1,14 @@ +Title: Fixed stored XSS using alert handler config +Level: 1 +Component: alerts +Class: security +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1535639159 + +A user with permission to the alert handler administration could use an alert rule to +store arbitrary javascript code which would then be executed in the context of the browser +of another user with permission to the alert handler administration when viewing the list +of alert handlers.

6 years, 1 month

6472 FIX zpool: Fixed title and units of graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: 91752a5d7f6f1f60f71aebf2509415c5b4d45f72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91752a5d7f6f1f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 29 13:10:28 2018 +0200 6472 FIX zpool: Fixed title and units of graphs The check plugin has never used the unified definition for filesystem graphs. Change-Id: I7c2b60323a0687f83afaca1044a9f0cbcecfb241 --- .werks/6472 | 10 ++++++++++ cmk/gui/plugins/metrics/check_mk.py | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/6472 b/.werks/6472 new file mode 100644 index 0000000..64c364d --- /dev/null +++ b/.werks/6472 @@ -0,0 +1,10 @@ +Title: zpool: Fixed title and units of graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535540812 +Class: fix + +The check plugin has never used the unified definition for filesystem graphs. diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 3a4f4a6..3577894 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4782,6 +4782,7 @@ check_metrics["check_mk-3par_volumes"] = df_translation check_metrics["check_mk-storeonce_clusterinfo.space"] = df_translation check_metrics["check_mk-storeonce_servicesets.capacity"] = df_translation check_metrics["check_mk-numble_volumes"] = df_translation +check_metrics["check_mk-zpool"] = df_translation df_netapp_perfvarnames = list(df_basic_perfvarnames) for protocol in [ "nfs", "cifs", "san", "fcp", "iscsi", "nfsv4", "nfsv4_1"]:

6 years, 1 month

6474 FIX aix_diskiod: Fixed style of graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: 3a4fdb41cf4e37ecc4ccd473bf732e13cc2d7807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a4fdb41cf4e37… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 29 14:58:49 2018 +0200 6474 FIX aix_diskiod: Fixed style of graphs The graph is now similar to other disk I/O graphs. Change-Id: Ib1ba0de3457bb2d5da899b36081594f0edcd49ee --- .werks/6474 | 10 ++++++++++ cmk/gui/plugins/metrics/check_mk.py | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/.werks/6474 b/.werks/6474 new file mode 100644 index 0000000..4a8c19c --- /dev/null +++ b/.werks/6474 @@ -0,0 +1,10 @@ +Title: aix_diskiod: Fixed style of graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535547479 +Class: fix + +The graph is now similar to other disk I/O graphs. diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 3577894..f2ea171 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4929,6 +4929,12 @@ check_metrics["check_mk-diskstat"] = { "disk_utilization" : { "scale" : 100.0 }, } +check_metrics["check_mk-aix_diskiod"] = { + "read" : { "name" : "disk_read_throughput" }, + "write": { "name" : "disk_write_throughput" }, + "disk_utilization" : { "scale" : 100.0 }, +} + check_metrics["check_mk-ibm_svc_systemstats.iops"] = { "read" : { "name" : "disk_read_ios" }, "write" : { "name" : "disk_write_ios" }

6 years, 1 month

CMK-846 Added structured_status column to host table.

by Sven Panne

Module: check_mk Branch: master Commit: 36e4855b65735ab537e8e8b929a57e270d807b0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36e4855b65735a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 30 09:34:01 2018 +0200 CMK-846 Added structured_status column to host table. This new column returns the contents of tmp/check_mk/status_data/<hostname>. Change-Id: Id35bcaf53e23436b6491e6d9ba423bee400a3b35 --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/TableHosts.cc | 12 ++++++++---- livestatus/src/module.cc | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 9cc4c45..8ed4e80 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -98,6 +98,7 @@ public: virtual std::string mkeventdSocketPath() = 0; virtual std::string mkLogwatchPath() = 0; virtual std::string mkInventoryPath() = 0; + virtual std::string structuredStatusPath() = 0; virtual std::string pnpPath() = 0; virtual std::string logArchivePath() = 0; virtual Encoding dataEncoding() = 0; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index fb5c515..793abb5 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -591,14 +591,18 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, HostSpecialIntColumn::Type::mk_inventory_last)); table->addColumn(std::make_unique<HostFileColumn>( prefix + "mk_inventory", - "The file content content of the Check_MK HW/SW-Inventory", - indirect_offset, extra_offset, -1, 0, table->core()->mkInventoryPath(), - "")); + "The file content of the Check_MK HW/SW-Inventory", indirect_offset, + extra_offset, -1, 0, table->core()->mkInventoryPath(), "")); table->addColumn(std::make_unique<HostFileColumn>( prefix + "mk_inventory_gz", - "The gzipped file content content of the Check_MK HW/SW-Inventory", + "The gzipped file content of the Check_MK HW/SW-Inventory", indirect_offset, extra_offset, -1, 0, table->core()->mkInventoryPath(), ".gz")); + table->addColumn(std::make_unique<HostFileColumn>( + prefix + "structured_status", + "The file content of the structured status of the Check_MK HW/SW-Inventory", + indirect_offset, extra_offset, -1, 0, + table->core()->structuredStatusPath(), "")); table->addColumn(std::make_unique<LogwatchListColumn>( prefix + "mk_logwatch_files", diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5745f88..afe5e8c 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -97,6 +97,7 @@ int g_max_fd_ever = 0; static char fl_socket_path[4096]; static char fl_pnp_path[4096]; static char fl_mk_inventory_path[4096]; +static char fl_structured_status_path[4096]; static char fl_mk_logwatch_path[4096]; static char fl_logfile_path[4096]; static char fl_mkeventd_socket_path[4096]; @@ -647,6 +648,9 @@ public: } std::string mkLogwatchPath() override { return fl_mk_logwatch_path; } std::string mkInventoryPath() override { return fl_mk_inventory_path; } + std::string structuredStatusPath() override { + return fl_structured_status_path; + } std::string pnpPath() override { return fl_pnp_path; } std::string logArchivePath() override { extern char *log_archive_path; @@ -1042,6 +1046,17 @@ void livestatus_parse_arguments(const char *args_orig) { } check_path("Check_MK Inventory directory", fl_mk_inventory_path); + } else if (strcmp(left, "structured_status_path") == 0) { + strncpy(fl_structured_status_path, right, + sizeof(fl_structured_status_path) - 1); + if (right[strlen(right) - 1] != '/') { + strncat(fl_structured_status_path, "/", + sizeof(fl_structured_status_path) - + strlen(fl_structured_status_path) - + 1); // make sure, that trailing slash is there + } + check_path("Check_MK structured status directory", + fl_structured_status_path); } else if (strcmp(left, "mk_logwatch_path") == 0) { strncpy(fl_mk_logwatch_path, right, sizeof(fl_mk_logwatch_path) - 1);

6 years, 1 month

6509 Pasting with automatic text splitting in list of input elements

by Lars Michelsen

Module: check_mk Branch: master Commit: 392b3da42ecede93621bc7048f8710231f896d5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=392b3da42ecede… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 07:47:52 2018 +0200 6509 Pasting with automatic text splitting in list of input elements When a dialog is using a self extending list of input elements, like e.g. the host- and service input fields at the bottom of the "hosts & service parameters" rule editor, a text can be pasted into the last input field which is then split by ";" separators. Each of the resulting parts is then added to a dedicated input field. This is only active for the last (empty) input field. This makes it a lot easier to populate such dialogs with a longer list of items. Change-Id: I66c5901f41a1db064e4686bf33d32dcd643efc1d --- .werks/6509 | 16 +++++++ cmk/gui/valuespec.py | 26 +++++++---- web/htdocs/js/checkmk.js | 112 ++++++++++++++++++++++++++++++++--------------- 3 files changed, 110 insertions(+), 44 deletions(-) diff --git a/.werks/6509 b/.werks/6509 new file mode 100644 index 0000000..b991362 --- /dev/null +++ b/.werks/6509 @@ -0,0 +1,16 @@ +Title: Pasting with automatic text splitting in list of input elements +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535521285 +Class: feature + +When a dialog is using a self extending list of input elements, like e.g. the +host- and service input fields at the bottom of the "hosts & service parameters" +rule editor, a text can be pasted into the last input field which is then split +by ";" separators. Each of the resulting parts is then added to a dedicated input +field. This is only active for the last (empty) input field. + +This makes it a lot easier to populate such dialogs with a longer list of items. diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 4c550c0..858c463 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1080,17 +1080,23 @@ class ListOfStrings(ValueSpec): self._max_entries = kwargs.get("max_entries") self._separator = kwargs.get("separator", "") # in case of float + self._split_on_paste = kwargs.get("split_on_paste", True) + self._split_separators = kwargs.get("split_separators", ";") + def help(self): - help_text = ValueSpec.help(self) + help_texts = [ + ValueSpec.help(self), + self._valuespec.help(), + ] - field_help = self._valuespec.help() - if help_text and field_help: - return help_text + " " + field_help - elif field_help: - return field_help - else: - return help_text + if self._split_on_paste: + help_texts.append(_("You may paste a text from your clipboard which contains several " + "parts separated by \"%s\" characters into the last input field. The text will " + "then be split by these separators and the single parts are added into dedicated " + "input fields.") % self._split_separators) + + return " ".join([ t for t in help_texts if t ]) def render_input(self, varprefix, value): @@ -1123,7 +1129,9 @@ class ListOfStrings(ValueSpec): html.close_div() html.div('', style="clear:left;") html.help(self.help()) - html.javascript("list_of_strings_init('%s');" % varprefix) + html.javascript("list_of_strings_init(%s, %s, %s);" % + (json.dumps(varprefix), json.dumps(self._split_on_paste), + json.dumps(self._split_separators))) def canonical_value(self): return [] diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c18a388..6a781c4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2004,63 +2004,105 @@ function valuespec_toggle_dropdownn(oDropdown, divid) { has been rendered. It attaches the onFocus-function to the last of the input elements. That function will append another input field as soon as the user focusses the last field. */ -function list_of_strings_init(divid) { - var oContainer = document.getElementById(divid); - var oDivChildren = oContainer.getElementsByTagName("div"); - var oLastChild = oDivChildren[oDivChildren.length-1]; - list_of_strings_add_focus(oLastChild); -} - -function list_of_strings_add_focus(oLastChild) { - /* look for <input> in last child node and attach focus handler to it. */ - var input = oLastChild.getElementsByTagName("input"); - if (input.length == 1) { - var handler_func = function(e) { - if (this.value != "") { - return list_of_strings_extend(this); +function list_of_strings_init(divid, split_on_paste, split_separators) { + var container = document.getElementById(divid); + var children = container.getElementsByTagName("div"); + var last_input = children[children.length-1].getElementsByTagName("input")[0]; + list_of_strings_add_event_handlers(last_input, split_on_paste, split_separators); +} + +function list_of_strings_add_event_handlers(input, split_on_paste, split_separators) { + var handler_func = function(e) { + if (this.value != "") { + return list_of_strings_extend(this, split_on_paste, split_separators); + } + }; + + input.onfocus = handler_func; + input.oninput = handler_func; + + if (split_on_paste) { + input.onpaste = function(e) { + // Get pasted data via clipboard API + var clipboard_data = e.clipboardData || window.clipboardData; + var pasted = clipboard_data.getData('Text'); + + if (this.value != "") + return true; // The field had a value before: Don't do custom stuff + + // When pasting a string, trim separators and then split by the given separators + var stripped = pasted.replace(new RegExp("^["+split_separators+"]+|["+split_separators+"]+$", "g"), ""); + if (stripped == "") + return true; // Only separators in clipboard: Don't do custom stuff + var splitted = stripped.split(new RegExp("["+split_separators+"]+")); + + // Add splitted parts to the input fields + var last_input = this; + for (var i = 0; i < splitted.length; i++) { + // Put the first item to the current field + if (i != 0) + last_input = list_of_strings_add_new_field(last_input); + + last_input.value = splitted[i]; } - }; - input[0].onfocus = handler_func; - input[0].oninput = handler_func; + // Focus the last populated field + last_input.focus(); + + // And finally add a new empty field to the end (with attached handlers) + list_of_strings_extend(last_input, split_on_paste, split_separators); + + // Stop original data actually being pasted + return prevent_default_events(e); + }; } } +function list_of_strings_remove_event_handlers(input) { + input.oninput = null; + input.onfocus = null; + input.onpaste = null; +} + /* Is called when the last input field in a ListOfString gets focus. In that case a new input field is being appended. */ -function list_of_strings_extend(oInput, j) { +function list_of_strings_extend(input, split_on_paste, split_separators) { + var new_input = list_of_strings_add_new_field(input); + /* Move focus function from old last to new last input field */ + list_of_strings_add_event_handlers(new_input, split_on_paste, split_separators); + list_of_strings_remove_event_handlers(input); +} + + +function list_of_strings_add_new_field(input) { /* The input field has a unique name like "extra_emails_2" for the field with the index 2. We need to convert this into "extra_emails_3". */ - var oldName = oInput.name; - var splitted = oldName.split("_"); + var old_name = input.name; + var splitted = old_name.split("_"); var num = 1 + parseInt(splitted[splitted.length-1]); splitted[splitted.length-1] = "" + num; - var newName = splitted.join("_"); + var new_name = splitted.join("_"); /* Now create a new <div> element as a copy from the current one and replace this name. We do this by simply copying the HTML code. The last field is always empty. Remember: ListOfStrings() always renders one exceeding empty element. */ - var oDiv = oInput.parentNode; - while (oDiv.parentNode.classList && !oDiv.parentNode.classList.contains("listofstrings")) - oDiv = oDiv.parentNode; - var oContainer = oDiv.parentNode; + var div = input.parentNode; + while (div.parentNode.classList && !div.parentNode.classList.contains("listofstrings")) + div = div.parentNode; + var container = div.parentNode; - var oNewDiv = document.createElement("DIV"); - oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); + var new_div = document.createElement("DIV"); + new_div.innerHTML = div.innerHTML.replace('"' + old_name + '"', '"' + new_name + '"'); // IE7 does not have quotes in innerHTML, trying to workaround this here. - oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' '); - oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + '>', '=' + newName + '>'); - oContainer.appendChild(oNewDiv); - - /* Move focus function from old last to new last input field */ - list_of_strings_add_focus(oNewDiv); + new_div.innerHTML = new_div.innerHTML.replace('=' + old_name + ' ', '=' + new_name + ' '); + new_div.innerHTML = new_div.innerHTML.replace('=' + old_name + '>', '=' + new_name + '>'); + container.appendChild(new_div); - oInput.oninput = null; - oInput.onfocus = null; + return new_div.getElementsByTagName("input")[0]; } function valuespec_cascading_change(oSelect, varprefix, count) {

6 years, 1 month

agent_3par: Fixed missing newline in case of HTTP communication problems

by Lars Michelsen

Module: check_mk Branch: master Commit: 59c3bbf508597efef73503b0acf060b9f39d2b7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59c3bbf508597e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 17:12:01 2018 +0200 agent_3par: Fixed missing newline in case of HTTP communication problems Change-Id: I8cb8e2a0a662b8a4ec13108b610669a9c0c04edd --- agents/special/agent_3par | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_3par b/agents/special/agent_3par index bf7f8e2..3cf8ccb 100755 --- a/agents/special/agent_3par +++ b/agents/special/agent_3par @@ -126,7 +126,7 @@ try: verify=opt_verify) except requests.exceptions.RequestException as e: - sys.stderr.write("Error: {}".format(e)) + sys.stderr.write("Error: %s\n" % e) sys.exit(1) # Status code should be 201.

6 years, 1 month

6453 FIX LDAP: Users with non-ASCII characters in uid could be created incorrectly

by Lars Michelsen

Module: check_mk Branch: master Commit: 56b059ad1c99ba08a2bc964b51453ecd14ad15ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56b059ad1c99ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 16:48:04 2018 +0200 6453 FIX LDAP: Users with non-ASCII characters in uid could be created incorrectly When LDAP users with non-ASCII characters in their user ID are not created by the LDAP sync but during first login, the user data set was stored in a wrong way (wrong encoded user ID). This could lead to exceptions when the user tried to login or when an admin tried to work with the user database. Change-Id: Iea9ba97ec3146435640341e469cc93226fcfce41 --- .werks/6453 | 14 ++++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 2 +- cmk/gui/userdb.py | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/6453 b/.werks/6453 new file mode 100644 index 0000000..2b1558f --- /dev/null +++ b/.werks/6453 @@ -0,0 +1,14 @@ +Title: LDAP: Users with non-ASCII characters in uid could be created incorrectly +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535275947 + +When LDAP users with non-ASCII characters in their user ID are not created by the +LDAP sync but during first login, the user data set was stored in a wrong way +(wrong encoded user ID). This could lead to exceptions when the user tried to +login or when an admin tried to work with the user database. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index ffa0d47..bed2629 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -957,7 +957,7 @@ class LDAPUserConnector(UserConnector): # authentication which should be rebound again after trying this. try: self.bind(user_dn, password) - result = user_id.encode('utf-8') + result = user_id except: self._logger.exception(" Exception during authentication (User: %s)", user_id) result = False diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index f63b282..108e01b 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -586,6 +586,10 @@ def load_users(lock = False): # will be added later as normal users. result = {} for id, user in users.items(): + # Transform user IDs which were stored with a wrong type + if isinstance(id, str): + id = id.decode("utf-8") + profile = contacts.get(id, {}) profile.update(user) result[id] = profile @@ -598,6 +602,10 @@ def load_users(lock = False): # contacts.mk manually. But we want to support that as # far as possible. for id, contact in contacts.items(): + # Transform user IDs which were stored with a wrong type + if isinstance(id, str): + id = id.decode("utf-8") + if id not in result: result[id] = contact result[id]["roles"] = [ "user" ]

6 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018