Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Started implementing host label discovery using the HW/SW inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 131b0668f32744e9a553ac40bc3cf5cfbb5eeabb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=131b0668f32744… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 20:54:57 2019 +0200 Started implementing host label discovery using the HW/SW inventory * Implemented the basic mechanism for managing discovered host labels * The HW/SW inventory can now collect and write out discovered host labels * It is enabled by default once the HW/SW inventory is enabled. You may disable this feature using the HW/SW inventory ruleset. * Added a sample host label discovery to the lnx_distro inventory plugin * host_config.labels now contains the labels of all currently possible label sources (explicit config, ruleset, discovery) CMK-1818 Change-Id: Iffefb2d5aea0f3e598fbc6bc2ad7e573722cbdb7 --- cmk/gui/plugins/wato/inventory.py | 9 ++ cmk/utils/paths.py | 1 + cmk_base/config.py | 25 +++++- cmk_base/discovered_host_labels.py | 87 +++++++++++++++++++ cmk_base/inventory.py | 51 +++++++---- inventory/lnx_distro | 5 +- tests/unit/cmk_base/test_checks.py | 26 ++++++ tests/unit/cmk_base/test_config.py | 12 +++ tests/unit/cmk_base/test_discovered_host_labels.py | 98 ++++++++++++++++++++++ 9 files changed, 297 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=131b0668f3…

5 years, 6 months

Bump PyYAML version to 5.1

by Lars Michelsen

Module: check_mk Branch: master Commit: b71cf89b46f9cf4fb63bb48cf9eaa87fff9193a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b71cf89b46f9cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 21:26:14 2019 +0200 Bump PyYAML version to 5.1 This is done to cleanup potential vulnerability CVE-2017-18342 (https://nvd.nist.gov/vuln/detail/CVE-2017-18342). Our used components should not be affected at the moment. The update is applied just to be on the safe side. Change-Id: I18cb142f5c978c44718b39576836e747f763b5d4 --- Pipfile | 2 +- Pipfile.lock | 58 ++++++++++----------- omd/packages/python-modules/python-modules.make | 2 +- omd/packages/python-modules/src/PyYAML-3.13.tar.gz | Bin 270607 -> 0 bytes omd/packages/python-modules/src/PyYAML-5.1.tar.gz | Bin 0 -> 274244 bytes 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Pipfile b/Pipfile index 3ba135b..b0f9a28 100644 --- a/Pipfile +++ b/Pipfile @@ -106,7 +106,7 @@ boto3 = "==1.9.42" cachetools = "==3.0.0" rsa = "==4.0" google-auth = "==1.6.1" -PyYAML = "==3.13" +PyYAML = "==5.1" websocket_client = "==0.54.0" kubernetes = "==8.0.0" # Has been added for jira notification plugin diff --git a/Pipfile.lock b/Pipfile.lock index d90307e..8bf0f2f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b2579029f702ea256f34da7cabd1614cd4d548ff8e949f08c1ab4233e740fecb" + "sha256": "6261d8b61efc33482eeae3b31b4c22d29978667c28d7673e9b8983404cba8d70" }, "pipfile-spec": 6, "requires": { @@ -746,20 +746,20 @@ }, "pyyaml": { "hashes": [ - "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b", - "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf", - "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a", - "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3", - "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1", - "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1", - "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613", - "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04", - "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f", - "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537", - "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531" + "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", + "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", + "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", + "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", + "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", + "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", + "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", + "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", + "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", + "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", + "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" ], "index": "pypi", - "version": "==3.13" + "version": "==5.1" }, "reportlab": { "hashes": [ @@ -996,7 +996,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.4'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1139,7 +1139,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -1304,10 +1304,10 @@ }, "pdbpp": { "hashes": [ - "sha256:565a4ee4b54bd73310058ce439e245230c587774813e394c902a214c3e693d24" + "sha256:3936ed6c145d9bebad9f532a20796d7022fc251ad6b041adc56b67839efd5173" ], "index": "pypi", - "version": "==0.9.14" + "version": "==0.9.15" }, "pluggy": { "hashes": [ @@ -1410,20 +1410,20 @@ }, "pyyaml": { "hashes": [ - "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b", - "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf", - "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a", - "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3", - "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1", - "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1", - "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613", - "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04", - "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f", - "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537", - "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531" + "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", + "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", + "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", + "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", + "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", + "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", + "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", + "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", + "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", + "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", + "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" ], "index": "pypi", - "version": "==3.13" + "version": "==5.1" }, "requests": { "extras": [ diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index f5666ed..ac8ad90 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -188,7 +188,7 @@ PYTHON_MODULES_LIST += boto3-1.9.42.tar.gz PYTHON_MODULES_LIST += cachetools-3.0.0.tar.gz PYTHON_MODULES_LIST += rsa-4.0.tar.gz PYTHON_MODULES_LIST += google-auth-1.6.1.tar.gz -PYTHON_MODULES_LIST += PyYAML-3.13.tar.gz +PYTHON_MODULES_LIST += PyYAML-5.1.tar.gz PYTHON_MODULES_LIST += websocket_client-0.54.0.tar.gz PYTHON_MODULES_LIST += kubernetes-8.0.0.tar.gz # Added for jira notification script diff --git a/omd/packages/python-modules/src/PyYAML-3.13.tar.gz b/omd/packages/python-modules/src/PyYAML-3.13.tar.gz deleted file mode 100644 index f62eccd..0000000 Binary files a/omd/packages/python-modules/src/PyYAML-3.13.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/PyYAML-5.1.tar.gz b/omd/packages/python-modules/src/PyYAML-5.1.tar.gz new file mode 100644 index 0000000..91ba249 Binary files /dev/null and b/omd/packages/python-modules/src/PyYAML-5.1.tar.gz differ

5 years, 6 months

Synch order of methods with superclass.

by Sven Panne

Module: check_mk Branch: master Commit: dffa08cc2ca4739dac1699a7d94d379780524320 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dffa08cc2ca473… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 10:45:41 2019 +0200 Synch order of methods with superclass. Change-Id: Ifa52704d08f97a2853c492b4031312a91f862d80 --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/module.cc | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 36b3387..7262617 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -110,6 +110,7 @@ public: virtual std::string pnpPath() = 0; virtual std::string historyFilePath() = 0; virtual std::string logArchivePath() = 0; + virtual Encoding dataEncoding() = 0; virtual size_t maxResponseSize() = 0; virtual size_t maxCachedMessages() = 0; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index b8997e7..7093cbf 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -585,10 +585,6 @@ public: const_cast<char *>(service_description.c_str()))); } - bool host_has_contact(const Host *host, const Contact *contact) override { - return is_authorized_for(this, toImpl(contact), toImpl(host), nullptr); - } - ContactGroup *find_contactgroup(const std::string &name) override { // Older Nagios headers are not const-correct... :-P return fromImpl(::find_contactgroup(const_cast<char *>(name.c_str()))); @@ -599,6 +595,10 @@ public: return fromImpl(::find_contact(const_cast<char *>(name.c_str()))); } + bool host_has_contact(const Host *host, const Contact *contact) override { + return is_authorized_for(this, toImpl(contact), toImpl(host), nullptr); + } + bool is_contact_member_of_contactgroup(const ContactGroup *group, const Contact *contact) override { // Older Nagios headers are not const-correct... :-P @@ -614,6 +614,10 @@ public: return std::chrono::system_clock::from_time_t(last_log_rotation); } + size_t maxLinesPerLogFile() const override { + return fl_max_lines_per_logfile; + } + Command find_command(const std::string &name) const override { // Older Nagios headers are not const-correct... :-P if (command *cmd = ::find_command(const_cast<char *>(name.c_str()))) { @@ -622,10 +626,6 @@ public: return {"", ""}; } - size_t maxLinesPerLogFile() const override { - return fl_max_lines_per_logfile; - } - std::vector<Command> commands() const override { extern command *command_list; std::vector<Command> commands; @@ -676,6 +676,7 @@ 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; }

5 years, 6 months

Pass MonitoringCore through to CustomVariableExpander::expand.

by Sven Panne

Module: check_mk Branch: master Commit: 747403c359cafcb50f496da3f692094d6762df34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=747403c359cafc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 09:56:02 2019 +0200 Pass MonitoringCore through to CustomVariableExpander::expand. This is where we will need it later. Change-Id: I3af0cb7b29a210eac7a0c8b16bc830e7afaffa81 --- livestatus/src/OffsetStringHostMacroColumn.cc | 6 +++--- livestatus/src/OffsetStringHostMacroColumn.h | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 6 ++++-- livestatus/src/OffsetStringMacroColumn.h | 9 ++++++--- livestatus/src/OffsetStringServiceMacroColumn.cc | 9 +++++---- livestatus/src/OffsetStringServiceMacroColumn.h | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/livestatus/src/OffsetStringHostMacroColumn.cc b/livestatus/src/OffsetStringHostMacroColumn.cc index 659eef3..fe5ca07 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.cc +++ b/livestatus/src/OffsetStringHostMacroColumn.cc @@ -26,8 +26,8 @@ #include "Row.h" #include "nagios.h" -HostMacroExpander::HostMacroExpander(const host *hst) - : _hst(hst), _cve("_HOST", hst->custom_variables) {} +HostMacroExpander::HostMacroExpander(const host *hst, const MonitoringCore *mc) + : _hst(hst), _cve("_HOST", hst->custom_variables, mc) {} std::optional<std::string> HostMacroExpander::expand(const std::string &str) { if (str == "HOSTNAME") { @@ -64,6 +64,6 @@ std::optional<std::string> HostMacroExpander::expand(const std::string &str) { std::unique_ptr<MacroExpander> OffsetStringHostMacroColumn::getMacroExpander( Row row) const { return std::make_unique<CompoundMacroExpander>( - std::make_unique<HostMacroExpander>(columnData<host>(row)), + std::make_unique<HostMacroExpander>(columnData<host>(row), _mc), std::make_unique<UserMacroExpander>()); } diff --git a/livestatus/src/OffsetStringHostMacroColumn.h b/livestatus/src/OffsetStringHostMacroColumn.h index b1cef0f..23c6300 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.h +++ b/livestatus/src/OffsetStringHostMacroColumn.h @@ -36,7 +36,7 @@ class Row; class HostMacroExpander : public MacroExpander { public: - explicit HostMacroExpander(const host *hst); + HostMacroExpander(const host *hst, const MonitoringCore *mc); std::optional<std::string> expand(const std::string &str) override; private: diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index c96b7a0..59c36e8 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -59,11 +59,13 @@ std::optional<std::string> UserMacroExpander::expand(const std::string &str) { } CustomVariableExpander::CustomVariableExpander(std::string prefix, - const customvariablesmember *cvm) - : _prefix(std::move(prefix)), _cvm(cvm) {} + const customvariablesmember *cvm, + const MonitoringCore *mc) + : _prefix(std::move(prefix)), _mc(mc), _cvm(cvm) {} std::optional<std::string> CustomVariableExpander::expand( const std::string &str) { + (void)_mc; if (mk::starts_with(str, _prefix)) { RegExp regExp(str.substr(_prefix.size()), RegExp::Case::ignore, RegExp::Syntax::literal); diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index c46efcb..f1309ec 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -61,13 +61,14 @@ public: class CustomVariableExpander : public MacroExpander { public: - CustomVariableExpander(std::string prefix, - const customvariablesmember *cvm); + CustomVariableExpander(std::string prefix, const customvariablesmember *cvm, + const MonitoringCore *mc); std::optional<std::string> expand(const std::string &str) override; private: std::string _prefix; + const MonitoringCore *const _mc; const customvariablesmember *_cvm; }; @@ -86,8 +87,10 @@ public: virtual std::unique_ptr<MacroExpander> getMacroExpander(Row row) const = 0; -private: +protected: const MonitoringCore *const _mc; + +private: const int _string_offset; }; diff --git a/livestatus/src/OffsetStringServiceMacroColumn.cc b/livestatus/src/OffsetStringServiceMacroColumn.cc index 490f48b..6ec404c 100644 --- a/livestatus/src/OffsetStringServiceMacroColumn.cc +++ b/livestatus/src/OffsetStringServiceMacroColumn.cc @@ -28,8 +28,9 @@ #include "Row.h" #include "nagios.h" -ServiceMacroExpander::ServiceMacroExpander(const service *svc) - : _svc(svc), _cve("_SERVICE", svc->custom_variables) {} +ServiceMacroExpander::ServiceMacroExpander(const service *svc, + const MonitoringCore *mc) + : _svc(svc), _cve("_SERVICE", svc->custom_variables, mc) {} std::optional<std::string> ServiceMacroExpander::expand( const std::string &str) { @@ -62,8 +63,8 @@ std::unique_ptr<MacroExpander> OffsetStringServiceMacroColumn::getMacroExpander( Row row) const { auto svc = columnData<service>(row); return std::make_unique<CompoundMacroExpander>( - std::make_unique<HostMacroExpander>(svc->host_ptr), + std::make_unique<HostMacroExpander>(svc->host_ptr, _mc), std::make_unique<CompoundMacroExpander>( - std::make_unique<ServiceMacroExpander>(svc), + std::make_unique<ServiceMacroExpander>(svc, _mc), std::make_unique<UserMacroExpander>())); } diff --git a/livestatus/src/OffsetStringServiceMacroColumn.h b/livestatus/src/OffsetStringServiceMacroColumn.h index 4001f1a..590d347 100644 --- a/livestatus/src/OffsetStringServiceMacroColumn.h +++ b/livestatus/src/OffsetStringServiceMacroColumn.h @@ -36,7 +36,7 @@ class Row; class ServiceMacroExpander : public MacroExpander { public: - explicit ServiceMacroExpander(const service *svc); + ServiceMacroExpander(const service *svc, const MonitoringCore *mc); std::optional<std::string> expand(const std::string &str) override; private:

5 years, 6 months

Fix wrong "service labels" ruleset declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: a3338604524e312ac5e1c5265f0cf7d3b50ef771 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3338604524e31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 7 20:50:25 2019 +0200 Fix wrong "service labels" ruleset declaration Change-Id: I57c246d19504e11e9371e1a964b27f1415ce8da6 --- cmk/gui/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 1ce8637..bab398a 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -1334,11 +1334,11 @@ class RulespecServiceLabels(ServiceRulespec): @property def match_type(self): - return "all" + return "dict" @property def item_type(self): - return "dict" + return "service" @property def valuespec(self):

5 years, 6 months

GUI CSS: Deployed view styles for layouts (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 23633e885f8eae83fb84dbeab345523fff0385f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23633e885f8eae… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Apr 8 09:31:46 2019 +0200 GUI CSS: Deployed view styles for layouts (CMK-1171) Change-Id: I18900a693c600b99bfa1b3ba3327c3c4cf45345c --- web/htdocs/themes/facelift/scss/_main.scss | 111 ----- web/htdocs/themes/facelift/scss/_views.scss | 617 ++++++++++++++++++---------- 2 files changed, 398 insertions(+), 330 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=23633e885f…

5 years, 6 months

Refactored page registration to base on standard class registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e457acbf19f77a35363350b81f4696ba77e1e46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e457acbf19f77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 14:24:07 2019 +0200 Refactored page registration to base on standard class registry * All pages are registered using the previously existing register methods which act as compatibility layer for now * Add test for the new direct registration of classes to page_registry Next step is to replace all register_page_handler() calls Change-Id: I1b0d340df6a9a02fa982940ce9d74aefb30b2974 --- cmk/gui/pages.py | 118 ++++++++++++++++++++++++++----------- tests/unit/cmk/gui/test_pages.py | 23 ++++++-- tests/unit/cmk/gui/test_sidebar.py | 12 ---- 3 files changed, 101 insertions(+), 52 deletions(-) diff --git a/cmk/gui/pages.py b/cmk/gui/pages.py index 4672ad4..774cde3 100644 --- a/cmk/gui/pages.py +++ b/cmk/gui/pages.py @@ -26,57 +26,36 @@ import abc import json +import inspect +import cmk.utils.plugin_registry from cmk.gui.globals import html import cmk.gui.config as config from cmk.gui.exceptions import MKException from cmk.gui.log import logger -_pages = {} +class Page(object): + __metaclass__ = abc.ABCMeta -def register(path): - """Register a function to be called when the given URL is called. - - In case you need to register some callable like staticmethods or - classmethods, you will have to use register_page_handler() directly - because this decorator can not deal with them. - - It is essentially a decorator that calls register_page_handler(). - """ - - def wrap(page_func): - if isinstance(page_func, (staticmethod, classmethod)): - raise NotImplementedError() - - register_page_handler(path, page_func) - return page_func - - return wrap - - -def register_page_handler(path, page_func): - """Register a function to be called when the given URL is called.""" - _pages[path] = page_func - + @classmethod + #TODO: Use when we are using python3 abc.abstractmethod + def ident(cls): + raise NotImplementedError() -def get_page_handler(name, dflt=None): - """Returns either the page handler registered for the given name or None + def handle_page(self): + self.page() - In case dflt is given it returns dflt instead of None when there is no - page handler for the requested name.""" - return _pages.get(name, dflt) + @abc.abstractmethod + def page(self): + """Override this to implement the page functionality""" + raise NotImplementedError() # TODO: Clean up implicit _from_vars() procotocol -class AjaxPage(object): +class AjaxPage(Page): """Generic page handler that wraps page() calls into AJAX respones""" __metaclass__ = abc.ABCMeta - @abc.abstractmethod - def page(self): - """Override this to implement the page functionality""" - raise NotImplementedError() - def __init__(self): super(AjaxPage, self).__init__() self._from_vars() @@ -105,3 +84,70 @@ class AjaxPage(object): response = {"result_code": 1, "result": "%s" % e} html.write(json.dumps(response)) + + +class PageRegistry(cmk.utils.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return Page + + def plugin_name(self, plugin_class): + return plugin_class.ident() + + def register_page(self, path): + def wrap(plugin_class): + if not inspect.isclass(plugin_class): + raise NotImplementedError() + + plugin_class._ident = path + plugin_class.ident = classmethod(lambda cls: cls._ident) + + self.register(plugin_class) + return plugin_class + + return wrap + + +page_registry = PageRegistry() + + +# TODO: Refactor all call sites to sub classes of Page() and change the +# registration to page_registry.register("path") +def register(path): + """Register a function to be called when the given URL is called. + + In case you need to register some callable like staticmethods or + classmethods, you will have to use register_page_handler() directly + because this decorator can not deal with them. + + It is essentially a decorator that calls register_page_handler(). + """ + + def wrap(wrapped_callable): + cls_name = "PageClass%s" % path.title().replace(":", "") + LegacyPageClass = type(cls_name, (Page,), { + "_wrapped_callable": (wrapped_callable,), + "page": lambda self: self._wrapped_callable[0]() + }) + + page_registry.register_page(path)(LegacyPageClass) + return lambda: LegacyPageClass().handle_page() + + return wrap + + +# TODO: replace all call sites by directly calling page_registry.register_page("path") +def register_page_handler(path, page_func): + """Register a function to be called when the given URL is called.""" + wrap = register(path) + return wrap(page_func) + + +def get_page_handler(name, dflt=None): + """Returns either the page handler registered for the given name or None + + In case dflt is given it returns dflt instead of None when there is no + page handler for the requested name.""" + handle_class = page_registry.get(name, dflt) + if handle_class is None: + return None + return lambda: handle_class().handle_page() diff --git a/tests/unit/cmk/gui/test_pages.py b/tests/unit/cmk/gui/test_pages.py index 9bac39c..adb6e4a 100644 --- a/tests/unit/cmk/gui/test_pages.py +++ b/tests/unit/cmk/gui/test_pages.py @@ -6,7 +6,7 @@ import cmk.gui.pages @pytest.mark.usefixtures("load_plugins") def test_registered_pages(): - assert sorted(cmk.gui.pages._pages) == sorted([ + assert sorted(cmk.gui.pages.page_registry.keys()) == sorted([ 'add_bookmark', 'ajax_activation_state', 'ajax_add_visual', @@ -147,10 +147,10 @@ def test_registered_pages(): def test_pages_register(monkeypatch, capsys): - monkeypatch.setattr(cmk.gui.pages, "_pages", {}) + monkeypatch.setattr(cmk.gui.pages, "page_registry", cmk.gui.pages.PageRegistry()) @cmk.gui.pages.register("123handler") - def page_handler(): + def page_handler(): # pylint: disable=unused-variable sys.stdout.write("123") handler = cmk.gui.pages.get_page_handler("123handler") @@ -161,7 +161,7 @@ def test_pages_register(monkeypatch, capsys): def test_pages_register_handler(monkeypatch, capsys): - monkeypatch.setattr(cmk.gui.pages, "_pages", {}) + monkeypatch.setattr(cmk.gui.pages, "page_registry", cmk.gui.pages.PageRegistry()) class PageClass(object): def handle_page(self): @@ -174,3 +174,18 @@ def test_pages_register_handler(monkeypatch, capsys): handler() assert capsys.readouterr()[0] == "234" + + +def test_page_registry_register_page(monkeypatch, capsys): + page_registry = cmk.gui.pages.PageRegistry() + + @page_registry.register_page("234handler") + class PageClass(cmk.gui.pages.Page): + def page(self): + sys.stdout.write("234") + + handler = page_registry.get("234handler") + assert handler == PageClass + + handler().handle_page() + assert capsys.readouterr()[0] == "234" diff --git a/tests/unit/cmk/gui/test_sidebar.py b/tests/unit/cmk/gui/test_sidebar.py index e13e1f0..7e7b310 100644 --- a/tests/unit/cmk/gui/test_sidebar.py +++ b/tests/unit/cmk/gui/test_sidebar.py @@ -216,10 +216,6 @@ def test_save_user_config_allowed(mocker, monkeypatch): save_user_file_mock.assert_called_once_with("sidebar", {"fold": True, "snapins": []}) -def test_ajax_fold_page(): - assert cmk.gui.pages.get_page_handler("sidebar_fold") == sidebar.ajax_fold - - @pytest.mark.parametrize("origin_state,fold_var,set_state", [ (False, "yes", True), (True, "", False), @@ -247,10 +243,6 @@ def test_ajax_fold(register_builtin_html, mocker, origin_state, fold_var, set_st }) -def test_ajax_openclose_page(): - assert cmk.gui.pages.get_page_handler("sidebar_openclose") == sidebar.ajax_openclose - - @pytest.mark.parametrize("origin_state,set_state", [ ("open", "closed"), ("closed", "open"), @@ -295,10 +287,6 @@ def test_ajax_openclose_close(register_builtin_html, mocker, origin_state, set_s }) -def test_move_snapin_page(): - assert cmk.gui.pages.get_page_handler("sidebar_move_snapin") == sidebar.move_snapin - - def test_move_snapin_not_permitted(monkeypatch, mocker, register_builtin_html): monkeypatch.setattr(config.user, "may", lambda x: x != "general.configure_sidebar") m_load = mocker.patch.object(sidebar.UserSidebarConfig, "_load")

5 years, 6 months

Cleanup WATO API page registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 72ca6b84b4c8e67f961be4bbef2566e33cbdd917 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72ca6b84b4c8e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 12:51:25 2019 +0200 Cleanup WATO API page registration * Replace wato.utils.base_modes.WatoWebApi which was not really a WATO mode class but a general page handler with cmk.gui.pages.AjaxPage * This is essentially a relocationing and renaming of the class. More cleanups will follow later. * Change all call sites to the new class Change-Id: Ie50eed1d7f895cdd2570ee79a3871cea1f2f6a1a --- cmk/gui/pages.py | 47 ++++++++++++++++++++++++++++++++ cmk/gui/plugins/wato/__init__.py | 1 - cmk/gui/plugins/wato/utils/__init__.py | 4 +-- cmk/gui/plugins/wato/utils/base_modes.py | 42 ---------------------------- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/pages/activate_changes.py | 8 +++--- cmk/gui/wato/pages/automation.py | 7 ++--- cmk/gui/wato/pages/backup.py | 7 ++--- cmk/gui/wato/pages/folders.py | 8 +++--- cmk/gui/wato/pages/host_diagnose.py | 6 ++-- cmk/gui/wato/pages/services.py | 7 ++--- cmk/gui/wato/pages/sites.py | 7 +++-- cmk/gui/wato/user_profile.py | 7 ++--- 13 files changed, 76 insertions(+), 77 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=72ca6b84b4…

5 years, 6 months

Make all register_page_handler calls use handle_page()

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c061dcafdd0e20233840df8dabd052a0bad82d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c061dcafdd0e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 13:00:47 2019 +0200 Make all register_page_handler calls use handle_page() Next step is to replace cmk.gui.pages._pages it with a class registry. Change-Id: I722b5c01215c1460d2637b03e935ff96f6292228 --- cmk/gui/wato/__init__.py | 10 ++++++++-- cmk/gui/wato/pages/automation.py | 14 ++++++++++++-- cmk/gui/wato/pages/backup.py | 7 ++++++- cmk/gui/wato/pages/folders.py | 8 ++++++-- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 0269190..4507b96 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -625,6 +625,11 @@ class AgentOutputPage(object): self._job = FetchAgentOutputBackgroundJob(self._host.site_id(), self._host.name(), self._ty) + # TODO: Better use AjaxPage.handle_page() for standard AJAX call error handling. This + # would need larger refactoring of the generic html.popup_trigger() mechanism. + def handle_page(self): + self.page() + @abc.abstractmethod def page(self): pass @@ -684,7 +689,8 @@ class PageFetchAgentOutput(AgentOutputPage): # TODO: Clean this up! We would like to use the cmk.gui.pages.register() decorator instead # of this -cmk.gui.pages.register_page_handler("fetch_agent_output", lambda: PageFetchAgentOutput().page()) +cmk.gui.pages.register_page_handler( + "fetch_agent_output", lambda: PageFetchAgentOutput().handle_page()) @gui_background_job.job_registry.register @@ -740,7 +746,7 @@ class PageDownloadAgentOutput(AgentOutputPage): cmk.gui.pages.register_page_handler( - "download_agent_output", lambda: PageDownloadAgentOutput().page()) + "download_agent_output", lambda: PageDownloadAgentOutput().handle_page()) #. # .--Network Scan--------------------------------------------------------. diff --git a/cmk/gui/wato/pages/automation.py b/cmk/gui/wato/pages/automation.py index d9e3f24..919f50a 100644 --- a/cmk/gui/wato/pages/automation.py +++ b/cmk/gui/wato/pages/automation.py @@ -49,6 +49,11 @@ class ModeAutomationLogin(AjaxPage): done be exchanging a login secret. If such a secret is not yet present it is created on the fly.""" + # TODO: Better use AjaxPage.handle_page() for standard AJAX call error handling. This + # would need larger refactoring of the generic html.popup_trigger() mechanism. + def handle_page(self): + self.page() + def page(self): if not config.user.may("wato.automation"): raise MKAuthException(_("This account has no permission for automation.")) @@ -68,7 +73,7 @@ class ModeAutomationLogin(AjaxPage): html.write_html(repr(response)) -register_page_handler("automation_login", lambda: ModeAutomationLogin().page()) +register_page_handler("automation_login", lambda: ModeAutomationLogin().handle_page()) class ModeAutomation(AjaxPage): @@ -100,6 +105,11 @@ class ModeAutomation(AjaxPage): if secret != _get_login_secret(): raise MKAuthException(_("Invalid automation secret.")) + # TODO: Better use AjaxPage.handle_page() for standard AJAX call error handling. This + # would need larger refactoring of the generic html.popup_trigger() mechanism. + def handle_page(self): + self.page() + def page(self): # To prevent mixups in written files we use the same lock here as for # the normal WATO page processing. This might not be needed for some @@ -184,7 +194,7 @@ class ModeAutomation(AjaxPage): (e, traceback.format_exc())) -register_page_handler("noauth:automation", lambda: ModeAutomation().page()) +register_page_handler("noauth:automation", lambda: ModeAutomation().handle_page()) def _get_login_secret(create_on_demand=False): diff --git a/cmk/gui/wato/pages/backup.py b/cmk/gui/wato/pages/backup.py index 0f620b9..bd2fc33 100644 --- a/cmk/gui/wato/pages/backup.py +++ b/cmk/gui/wato/pages/backup.py @@ -180,6 +180,11 @@ class ModeBackupJobState(backup.PageBackupJobState, WatoMode): class ModeAjaxBackupJobState(AjaxPage): + # TODO: Better use AjaxPage.handle_page() for standard AJAX call error handling. This + # would need larger refactoring of the generic html.popup_trigger() mechanism. + def handle_page(self): + self.page() + def page(self): config.user.need_permission("wato.backups") if html.request.var("job") == "restore": @@ -189,7 +194,7 @@ class ModeAjaxBackupJobState(AjaxPage): page.show_job_details() -register_page_handler("ajax_backup_job_state", lambda: ModeAjaxBackupJobState().page()) +register_page_handler("ajax_backup_job_state", lambda: ModeAjaxBackupJobState().handle_page()) class SiteBackupKeypairStore(backup.BackupKeypairStore): diff --git a/cmk/gui/wato/pages/folders.py b/cmk/gui/wato/pages/folders.py index 492f4af..7176eb2 100644 --- a/cmk/gui/wato/pages/folders.py +++ b/cmk/gui/wato/pages/folders.py @@ -778,8 +778,11 @@ class ModeAjaxPopupMoveToFolder(AjaxPage): if not self._back_url or not self._back_url.startswith("wato.py"): raise MKUserError("back_url", _("Invalid back URL provided.")) - # TODO: Better use handle_page() for standard AJAX call error handling. This + # TODO: Better use AjaxPage.handle_page() for standard AJAX call error handling. This # would need larger refactoring of the generic html.popup_trigger() mechanism. + def handle_page(self): + self.page() + def page(self): html.span(self._move_title()) @@ -821,7 +824,8 @@ class ModeAjaxPopupMoveToFolder(AjaxPage): return choices -register_page_handler("ajax_popup_move_to_folder", lambda: ModeAjaxPopupMoveToFolder().page()) +register_page_handler( + "ajax_popup_move_to_folder", lambda: ModeAjaxPopupMoveToFolder().handle_page()) class FolderMode(WatoMode):

5 years, 6 months

Limit width of tag / label columns by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d101b3b8c09abb9f996c61ac097d480d98e706a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d101b3b8c09ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 23:09:47 2019 +0200 Limit width of tag / label columns by default CMK-1934 Change-Id: I2d9df08f3e87f7b65a3cd45baeeaeccbfa150cab --- cmk/gui/wato/pages/folders.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cmk/gui/wato/pages/folders.py b/cmk/gui/wato/pages/folders.py index dffa6d9..8e58c1a 100644 --- a/cmk/gui/wato/pages/folders.py +++ b/cmk/gui/wato/pages/folders.py @@ -569,17 +569,28 @@ class ModeFolder(WatoMode): if not config.wato_hide_hosttags: table.cell(_("Tags"), css="tag-ellipsis") - html.write( - cmk.gui.view_utils.render_tag_groups(host.tag_groups(), "host", with_links=False)) + tag_groups, show_all_code = self._limit_labels(host.tag_groups()) + html.write(cmk.gui.view_utils.render_tag_groups(tag_groups, "host", with_links=False)) + html.write(show_all_code) table.cell(_("Explicit labels"), css="tag-ellipsis") - html.write(cmk.gui.view_utils.render_labels(host.labels(), "host", with_links=False)) + labels, show_all_code = self._limit_labels(host.labels()) + html.write(cmk.gui.view_utils.render_labels(labels, "host", with_links=False)) + html.write(show_all_code) # Located in folder if self._folder.is_search_folder(): table.cell(_("Folder")) html.a(host.folder().alias_path(), href=host.folder().url()) + def _limit_labels(self, labels): + show_all, limit = "", 3 + if len(labels) > limit and html.request.var("_show_all") != "1": + show_all = " %s" % html.render_a( + "... (%s)" % _("show all"), href=html.makeuri([("_show_all", "1")])) + labels = dict(sorted(labels.items())[:limit]) + return labels, show_all + def _render_contact_group(self, contact_group_names, c): display_name = contact_group_names.get(c, {'alias': c})['alias'] return html.render_a(display_name, "wato.py?mode=edit_contact_group&edit=%s" % c)

5 years, 6 months

← Newer
1
...
38
39
40
41
42
43
44
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019