Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

6525 FIX Raw Edition: Graphing pages are now themed correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: ee0f4279ce493a4e4ce9317d9c228ffc72a8b68c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee0f4279ce493a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 17:08:34 2018 +0200 6525 FIX Raw Edition: Graphing pages are now themed correctly The graphing pages of the Raw Edition were always rendered in the classic theme style. The pages are now rendered in either the classic or the modern style depending on the choose theme. CMK-806 Change-Id: I2325de379079b16b152fbc4d3911613abca3dafe --- .werks/6525 | 13 + cmk/gui/htmllib.py | 6 + cmk/gui/metrics.py | 8 +- cmk/gui/plugins/views/painters.py | 8 +- cmk/gui/plugins/views/utils.py | 7 +- omd/packages/pnp4nagios/Makefile | 5 + .../ui-facelift/images/contentframe_background.jpg | Bin 0 -> 98551 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_flat_75_6da1b8_40x100.png | Bin 0 -> 182 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../images/ui-bg_glass_65_88b9ce_1x400.png | Bin 0 -> 125 bytes .../images/ui-bg_glass_75_6da1b8_1x400.png | Bin 0 -> 136 bytes .../images/ui-bg_glass_75_94cde6_1x400.png | Bin 0 -> 177 bytes .../ui-bg_highlight-soft_75_274554_1x100.png | Bin 0 -> 132 bytes .../ui-bg_highlight-soft_75_6da1b8_1x100.png | Bin 0 -> 130 bytes .../images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 0 -> 123 bytes .../ui-facelift/images/ui-icons_000000_256x240.png | Bin 0 -> 4369 bytes .../ui-facelift/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../ui-facelift/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../ui-facelift/images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../ui-facelift/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes omd/packages/pnp4nagios/ui-facelift/jquery-ui.css | 856 +++++++++++++++++++++ web/htdocs/js/checkmk.js | 6 +- 23 files changed, 900 insertions(+), 9 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ee0f4279ce…

5 years, 9 months

6526 FIX LDAP: Fixed another "ValueError: option error"

by Lars Michelsen

exception when using LDAP over SSL on some distros Message-ID: <5b895a66.QwoCcTjISYNP8aqa%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: 43fe038a43feb1b15b8c38067f45611a12cabd64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43fe038a43feb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 16:06:39 2018 +0200 6526 FIX LDAP: Fixed another "ValueError: option error" exception when using LDAP over SSL on some distros This addition to werk #6424 fixes another case where ValueErrors could occur while setting up LDAP connections over SSL. Change-Id: Ia41d687def304d64094ffa6aff8c8f4d9b1dc9a5 --- .werks/6526 | 12 ++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/6526 b/.werks/6526 new file mode 100644 index 0000000..f51598a --- /dev/null +++ b/.werks/6526 @@ -0,0 +1,12 @@ +Title: LDAP: Fixed another "ValueError: option error" exception when using LDAP over SSL on some distros +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535725756 + +This addition to werk #6424 fixes another case where ValueErrors could occur while setting up LDAP connections +over SSL. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index bed2629..5e7c836 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -237,7 +237,15 @@ class LDAPUserConnector(UserConnector): conn.set_option(ldap.OPT_X_TLS_CACERTFILE, "%s/var/ssl/ca-certificates.crt" % cmk.paths.omd_root) - conn.set_option(ldap.OPT_X_TLS_NEWCTX, 0) + # Caused trouble on older systems or systems with some special configuration or set of + # libraries. For example we saw a Ubuntu 17.10 system with libldap 2.4.45+dfsg-1ubuntu1 and + # libgnutls30 3.5.8-6ubuntu3 raising "ValueError: option error" while another system with + # the exact same liraries did not. Try to do this on systems that support this call and ignore + # the errors on other systems. + try: + conn.set_option(ldap.OPT_X_TLS_NEWCTX, 0) + except ValueError: + pass self.default_bind(conn) return conn, None

5 years, 9 months

6218 FIX mgmt_ipmi_sensors: Wrong battery / power supply WARN state

by Moritz Kiemer

Module: check_mk Branch: master Commit: be5fbb1e34cbc625553ebf9c717cd4f7fe4e3fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5fbb1e34cbc6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Aug 31 13:49:33 2018 +0200 6218 FIX mgmt_ipmi_sensors: Wrong battery / power supply WARN state Due to a bug in pyghmi (https://bugs.launchpad.net/pyghmi/+bug/1790120) a WARN state was reported for sensors of type "battery" and "power supply". A workaroud has been added to mitigate this problem. FEED-943 Change-Id: I9af116870b977706305ab9ae6253b8c0d61d7893 --- .werks/6218 | 12 ++++++++++++ checks/ipmi_sensors.include | 8 ++++---- cmk_base/data_sources/ipmi.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/.werks/6218 b/.werks/6218 new file mode 100644 index 0000000..81c0695 --- /dev/null +++ b/.werks/6218 @@ -0,0 +1,12 @@ +Title: mgmt_ipmi_sensors: Wrong battery / power supply WARN state +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535715823 +Class: fix + +Due to a bug in pyghmi (https://bugs.launchpad.net/pyghmi/+bug/1790120) +a WARN state was reported for sensors of type "battery" and "power supply". +A workaroud has been added to mitigate this problem. diff --git a/checks/ipmi_sensors.include b/checks/ipmi_sensors.include index 7b36483..adaf1d2 100644 --- a/checks/ipmi_sensors.include +++ b/checks/ipmi_sensors.include @@ -198,10 +198,10 @@ def freeipmi_status_txt_mapping(status_txt): 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", + if status_txt.lower() in [ + "entity present", "battery presence detected", + "drive presence", "transition to running", "device enabled", + "system full operational, working", "system restart", "present", ] or \ status_txt.startswith("Fully Redundant") or \ status_txt.endswith("is connected") or \ diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 4b09bcc..1f23c93 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -37,6 +37,38 @@ from cmk_base.exceptions import MKAgentError from .abstract import CheckMKAgentDataSource, ManagementBoardDataSource +def _handle_false_positive_warnings(reading): + """This is a workaround for a pyghmi bug + (bug report: https://bugs.launchpad.net/pyghmi/+bug/1790120) + + For some sensors undefined states are looked up, which results in readings of the form + {'states': ['Present', + 'Unknown state 8 for reading type 111/sensor type 8', + 'Unknown state 9 for reading type 111/sensor type 8', + 'Unknown state 10 for reading type 111/sensor type 8', + 'Unknown state 11 for reading type 111/sensor type 8', + 'Unknown state 12 for reading type 111/sensor type 8', ...], + 'health': 1, 'name': 'PS Status', 'imprecision': None, 'units': '', + 'state_ids': [552704, 552712, 552713, 552714, 552715, 552716, 552717, 552718], + 'type': 'Power Supply', 'value': None, 'unavailable': 0} + + The health warning is set, but only due to the lookup errors. We remove the lookup + errors, and see whether the remaining states are meaningful. + """ + states = [s for s in reading.states if not s.startswith("Unknown state ")] + + if not states: + return "no state reported" + + if any("non-critical" in s for s in states): + return "WARNING" + + # just keep all the available info. It should be dealt with in + # ipmi_sensors.include (freeipmi_status_txt_mapping), + # where it will default to 2(CRIT) + return ', '.join(states) + + class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataSource): def id(self): @@ -126,6 +158,8 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS health_txt = "CRITICAL" elif reading.health >= ipmi_const.Health.Warning: health_txt = "WARNING" + # workaround for pyghmi bug: https://bugs.launchpad.net/pyghmi/+bug/1790120 + health_txt = _handle_false_positive_warnings(reading) elif reading.health == ipmi_const.Health.Ok: health_txt = "OK"

5 years, 9 months

6407 FIX mk_postgres, postgres_instances: output missing instance data

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9945220123e104d6c1a8a6459d70f2a46bdf114e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9945220123e104… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Aug 31 11:44:17 2018 +0200 6407 FIX mk_postgres, postgres_instances: output missing instance data In the agent plugin mk_postgres a command line option for the output of the postgres_instances check was missing. This resulted in missing data for the postgres_instances checks. To apply this fix the mk_postgres plugin on the affected hosts has to be updated. Change-Id: I10b8f84103c6f7cdc98571f11e8fc9cd87041190 --- .werks/6407 | 15 +++++++++++++++ agents/plugins/mk_postgres | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6407 b/.werks/6407 new file mode 100644 index 0000000..049fa41 --- /dev/null +++ b/.werks/6407 @@ -0,0 +1,15 @@ +Title: mk_postgres, postgres_instances: output missing instance data +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535708395 + +In the agent plugin mk_postgres a command line option for the output +of the postgres_instances check was missing. This resulted in missing +data for the postgres_instances checks. +To apply this fix the mk_postgres plugin on the affected hosts has to +be updated. diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index 7d5dd08..f981bdf 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -67,7 +67,7 @@ function postgres_instances() { if [ ! -z "${1}" ]; then echo "[[[${1}]]]" fi - pgrep -lf bin/postgres + pgrep -laf bin/postgres }

5 years, 9 months

6408 FIX blade_health: The state "degraded (non critical)" is now treated as WARN instead of CRIT

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1c01952ba8b6098ab754501f175559a8c6cbc00a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c01952ba8b609… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Aug 31 11:56:34 2018 +0200 6408 FIX blade_health: The state "degraded (non critical)" is now treated as WARN instead of CRIT Change-Id: Ic470a3f470f059272b6d7a6dcc3d1baacd3956f5 --- .werks/6408 | 11 +++++++++++ checks/blade_health | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6408 b/.werks/6408 new file mode 100644 index 0000000..223f501 --- /dev/null +++ b/.werks/6408 @@ -0,0 +1,11 @@ +Title: blade_health: The state "degraded (non critical)" is now treated as WARN instead of CRIT +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535709342 + + diff --git a/checks/blade_health b/checks/blade_health index 4705959..e752806 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -43,7 +43,7 @@ def check_blade_health(_no_item, _no_params, info): if state == "255": return (0, "State is good") elif state == "2": - return (2, "State is degraded (non critical)" + descr) + return (1, "State is degraded (non critical)" + descr) elif state == "4": return (1, "State is degraded (system level)" + descr) elif state == "0":

5 years, 9 months

Each Logfile is owned by exactly one LogCache.

by Sven Panne

Module: check_mk Branch: master Commit: 2598a91fb54a1e182fa8c2eb5e1b0fa4eafdcea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2598a91fb54a1e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 11:28:58 2018 +0200 Each Logfile is owned by exactly one LogCache. This fact can be used to avoid threading through a LogCache parameter. Change-Id: Iabe795d80fa86c2410845457866ffc1b376a0175 --- livestatus/src/LogCache.cc | 6 ++++-- livestatus/src/Logfile.cc | 25 +++++++++++++------------ livestatus/src/Logfile.h | 13 ++++++------- livestatus/src/TableLog.cc | 3 +-- livestatus/src/TableStateHistory.cc | 12 ++++++------ 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index f14380a..14afde4 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -74,12 +74,14 @@ 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. - addToIndex(std::make_unique<Logfile>(_mc, _mc->historyFilePath(), true)); + addToIndex( + std::make_unique<Logfile>(_mc, this, _mc->historyFilePath(), true)); fs::path dirpath = _mc->logArchivePath(); try { for (const auto &entry : fs::directory_iterator(dirpath)) { - addToIndex(std::make_unique<Logfile>(_mc, entry.path(), false)); + addToIndex( + std::make_unique<Logfile>(_mc, this, entry.path(), false)); } } catch (const fs::filesystem_error &e) { Warning(logger()) << "updating log file index: " << e.what(); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index be24cec..f24d108 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -44,8 +44,10 @@ #include <vector> #endif -Logfile::Logfile(MonitoringCore *mc, fs::path path, bool watch) +Logfile::Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, + bool watch) : _mc(mc) + , _logcache(logcache) , _path(std::move(path)) , _since(0) , _watch(watch) @@ -83,7 +85,7 @@ void Logfile::flush() { _logclasses_read = 0; } -void Logfile::load(LogCache *logcache, unsigned logclasses) { +void Logfile::load(unsigned logclasses) { unsigned missing_types = logclasses & ~_logclasses_read; FILE *file = nullptr; // The current logfile has the _watch flag set to true. @@ -106,13 +108,13 @@ void Logfile::load(LogCache *logcache, unsigned logclasses) { // 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, logclasses); + loadRange(file, _logclasses_read, logclasses); fgetpos(file, &_read_pos); } if (missing_types != 0u) { fseek(file, 0, SEEK_SET); _lineno = 0; - loadRange(file, missing_types, logcache, logclasses); + loadRange(file, missing_types, logclasses); _logclasses_read |= missing_types; fgetpos(file, &_read_pos); // remember current end of file } @@ -130,13 +132,13 @@ void Logfile::load(LogCache *logcache, unsigned logclasses) { } _lineno = 0; - loadRange(file, missing_types, logcache, logclasses); + loadRange(file, missing_types, logclasses); fclose(file); _logclasses_read |= missing_types; } } -void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, +void Logfile::loadRange(FILE *file, unsigned missing_types, unsigned logclasses) { std::vector<char> linebuffer(65536); // TODO(sp) We should really use C++ I/O here... @@ -156,7 +158,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, } } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { - logcache->logLineHasBeenAdded(this, logclasses); + _logcache->logLineHasBeenAdded(this, logclasses); } } } @@ -202,21 +204,20 @@ bool Logfile::processLogLine(size_t lineno, std::string line, } logfile_entries_t *Logfile::getEntriesFromQuery(const Query * /*unused*/, - LogCache *logcache, unsigned logclasses) { // Make sure existing references to objects point to correct world updateReferences(); // make sure all messages are present - load(logcache, logclasses); + load(logclasses); return &_entries; } -bool Logfile::answerQueryReverse(Query *query, LogCache *logcache, time_t since, - time_t until, unsigned logclasses) { +bool Logfile::answerQueryReverse(Query *query, 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, logclasses); + load(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 08e4dd7..062f04d 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -49,7 +49,7 @@ using logfile_entries_t = std::map<uint64_t, std::unique_ptr<LogEntry>>; class Logfile { public: - Logfile(MonitoringCore *mc, fs::path path, bool watch); + Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, bool watch); std::string path() { return _path; } #ifdef CMC @@ -67,15 +67,15 @@ public: // for TableStateHistory logfile_entries_t *getEntriesFromQuery(const Query *query, - LogCache *logcache, unsigned logclasses); // for TableLog::answerQuery - bool answerQueryReverse(Query *query, LogCache *logcache, time_t since, - time_t until, unsigned logclasses); + bool answerQueryReverse(Query *query, time_t since, time_t until, + unsigned logclasses); private: MonitoringCore *_mc; + LogCache *const _logcache; fs::path _path; time_t _since; // time of first entry bool _watch; // true only for current logfile @@ -87,9 +87,8 @@ private: #endif unsigned _logclasses_read; // only these types have been read - void load(LogCache *logcache, unsigned logclasses); - void loadRange(FILE *file, unsigned missing_types, LogCache *logcache, - unsigned logclasses); + void load(unsigned logclasses); + void loadRange(FILE *file, unsigned missing_types, unsigned logclasses); bool processLogLine(size_t lineno, std::string line, unsigned logclasses); uint64_t makeKey(time_t t, size_t lineno); void updateReferences(); diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index bb23e12..b7097cf 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -166,8 +166,7 @@ void TableLog::answerQuery(Query *query) { } while (true) { - if (!it->second->answerQueryReverse(query, _log_cache, since, until, - classmask)) { + if (!it->second->answerQueryReverse(query, since, until, classmask)) { break; // end of time range found } if (it == _log_cache->begin()) { diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 86b98ff..8ead016 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, - classmask_statehist); + _entries = + _it_logs->second->getEntriesFromQuery(_query, 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, - classmask_statehist); + _entries = + _it_logs->second->getEntriesFromQuery(_query, classmask_statehist); _it_entries = _entries->begin(); } return _it_entries->second.get(); @@ -330,8 +330,8 @@ void TableStateHistory::answerQuery(Query *query) { } // Determine initial logentry - _entries = _it_logs->second->getEntriesFromQuery(query, _log_cache, - classmask_statehist); + _entries = + _it_logs->second->getEntriesFromQuery(query, 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

5 years, 9 months

6520 FIX akcp_sensor_temp: Add missing reference to check default levels

by Lars Michelsen

Module: check_mk Branch: master Commit: 769ecd29e4d0c061f92962622e5ad32a06a1e84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=769ecd29e4d0c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 10:14:20 2018 +0200 6520 FIX akcp_sensor_temp: Add missing reference to check default levels FEED-933 Change-Id: I91fd8df2a4854c98366efcb02f3c459dc5b8f7cc --- .werks/6520 | 11 +++++++++++ checks/akcp_sensor_temp | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6520 b/.werks/6520 new file mode 100644 index 0000000..fd53b0e --- /dev/null +++ b/.werks/6520 @@ -0,0 +1,11 @@ +Title: akcp_sensor_temp: Add missing reference to check default levels +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535703236 + + diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index 23a0985..49beaf9 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -34,6 +34,7 @@ check_info["akcp_sensor_temp"] = { "inventory_function" : inventory_akcp_sensor_temp, "service_description" : "Temperature %s", "has_perfdata" : True, + "default_levels_variable" : "akcp_temp_default_levels", "snmp_scan_function" : snmp_scan_akcp_sensor, "snmp_info" : ( ".1.3.6.1.4.1.3854.1.2.2.1.16.1", [ 1, # SPAGENT-MIB::sensorProbeTempDescription

5 years, 9 months

6523 FIX nginx_status: Fixed discovery of running instances on Ubuntu

by Lars Michelsen

Module: check_mk Branch: master Commit: 0839c528842ffa70aeaed5cd63c1dc3cea45ee70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0839c528842ffa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 10:31:28 2018 +0200 6523 FIX nginx_status: Fixed discovery of running instances on Ubuntu Nginx instances on Ubuntu based on the official packages were not detected correctly. To apply this fix you need to update the nginx_status agent plugin. FEED-834 Change-Id: I5ec539abcc143157980ecffc224608429da1cdac --- .werks/6523 | 12 ++++++++++++ agents/plugins/nginx_status | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6523 b/.werks/6523 new file mode 100644 index 0000000..99179fd --- /dev/null +++ b/.werks/6523 @@ -0,0 +1,12 @@ +Title: nginx_status: Fixed discovery of running instances on Ubuntu +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535704132 + +Nginx instances on Ubuntu based on the official packages were not detected correctly. +To apply this fix you need to update the nginx_status agent plugin. diff --git a/agents/plugins/nginx_status b/agents/plugins/nginx_status index becd540..c952783 100755 --- a/agents/plugins/nginx_status +++ b/agents/plugins/nginx_status @@ -69,7 +69,7 @@ def try_detect_servers(): to_replace = re.compile('^.*/') proc = to_replace.sub('', proc) - procs = [ 'nginx', 'nginx:' ] + procs = [ 'nginx', 'nginx:', 'nginx.conf' ] # the pid/proc field length is limited to 19 chars. Thus in case of # long PIDs, the process names are stripped of by that length. # Workaround this problem here

5 years, 9 months

6522 FIX if_fortigate: Add perfometer

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f35465528986ab4c8a83562fc43285f9097bbbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f35465528986a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 10:21:51 2018 +0200 6522 FIX if_fortigate: Add perfometer FEED-957 Change-Id: Ib1a1a705c6f6c1554c09a80e4a48e3efcdc1afb0 --- .werks/6522 | 11 +++++++++++ cmk/gui/plugins/views/perfometers/check_mk.py | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6522 b/.werks/6522 new file mode 100644 index 0000000..7f7e8bb --- /dev/null +++ b/.werks/6522 @@ -0,0 +1,11 @@ +Title: if_fortigate: Add perfometer +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535703663 + +FEED-957 diff --git a/cmk/gui/plugins/views/perfometers/check_mk.py b/cmk/gui/plugins/views/perfometers/check_mk.py index 6b65c83..d022d96 100644 --- a/cmk/gui/plugins/views/perfometers/check_mk.py +++ b/cmk/gui/plugins/views/perfometers/check_mk.py @@ -395,6 +395,7 @@ perfometers["check_mk-netapp_api_if"] = perfometer_check_mk_if perfometers["check_mk-if_brocade"] = perfometer_check_mk_if perfometers["check_mk-ucs_bladecenter_if"] = perfometer_check_mk_if perfometers["check_mk-aix_if"] = perfometer_check_mk_if +perfometers["check_mk-if_fortigate"] = perfometer_check_mk_if def perfometer_check_mk_fc_port(row, check_command, perf_data): unit = "B"

5 years, 9 months

6518 FIX Fixed sorting of dual list choices (like network interface types)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8976c77dbeee44370c08e1dab63d0502bcca1f11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8976c77dbeee44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 09:45:03 2018 +0200 6518 FIX Fixed sorting of dual list choices (like network interface types) When e.g. editing the network interface port types to discovery in the "Network Interface and Switch Port Discovery" ruleset, the list of port types was initially not sorted correctly. Even when the list was sorted correctly, the sorting was not kept when moving options between both fields. Both issues have now been fixed. Change-Id: Id4a44498c156dbe1fde70dcdb3dba43583c68831 --- .werks/6518 | 13 ++++++++++++ web/htdocs/js/checkmk.js | 52 +++++++++++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/.werks/6518 b/.werks/6518 new file mode 100644 index 0000000..a7935af --- /dev/null +++ b/.werks/6518 @@ -0,0 +1,13 @@ +Title: Fixed sorting of dual list choices (like network interface types) +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535701338 + +When e.g. editing the network interface port types to discovery in the "Network Interface and Switch Port Discovery" ruleset, +the list of port types was initially not sorted correctly. Even when the list was sorted correctly, the sorting was not kept +when moving options between both fields. Both issues have now been fixed. diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 6a781c4..2238a60 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -235,6 +235,28 @@ function mouse_offset_to_middle(obj, event){ }; } +function sort_select(select, cmp_func) { + var choices = []; + for (var i = 0; i < select.options.length;i++) { + choices[i] = []; + choices[i][0] = select.options[i].text; + choices[i][1] = select.options[i].value; + } + + choices.sort(cmp_func); + while (select.options.length > 0) { + select.options[0] = null; + } + + for (var i = 0; i < choices.length;i++) { + var op = new Option(choices[i][0], choices[i][1]); + select.options[i] = op; + } + + return; +} + + //#. //# .-Events-------------------------------------------------------------. //# | _____ _ | @@ -2408,30 +2430,20 @@ function vs_duallist_switch(field_suffix, varprefix, keeporder) { for (var i = 0; i < selected.length; i++) { // remove option from origin field.removeChild(selected[i]); - - // Determine the correct child to insert. If keeporder is being set, - // then new elements will aways be appended. That way the user can - // create an order of his choice. This is being used if DualListChoice - // has the option custom_order = True - var sibling = false; - - if (!keeporder) { - sibling = other_field.children[0]; - while (sibling != null) { - if (sibling.nodeType == 1 && sibling.label.toLowerCase() > selected[i].label.toLowerCase()) - break; - sibling = sibling.nextSibling; - } - } - - if (sibling) - other_field.insertBefore(selected[i], sibling); - else - other_field.appendChild(selected[i]); + other_field.appendChild(selected[i]); selected[i].selected = false; } + // Determine the correct child to insert. If keeporder is being set, + // then new elements will aways be appended. That way the user can + // create an order of his choice. This is being used if DualListChoice + // has the option custom_order = True + if (!keeporder) { + var collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'}); + sort_select(other_field, collator.compare); + } + // Update internal helper field which contains a list of all selected keys var pos_field = positive ? other_field : field;

5 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018