Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6415 FIX Make custom attributes of a host available for the core

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2ff226d3a0b04a8388c3624baf5be91bc269e8cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ff226d3a0b04a… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 7 17:59:27 2018 +0100 6415 FIX Make custom attributes of a host available for the core Fixes a bug that made custom attributes of a host inaccessible for the core. Therefore, e.g. the rulset "Individual program call instead of agent access" could not resolve these values. Change-Id: I06263168b445492953bcf716ac56a0dcd2169eaf --- .werks/6415 | 13 +++++++++++++ cmk_base/config.py | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6415 b/.werks/6415 new file mode 100644 index 0000000..8a0e816 --- /dev/null +++ b/.werks/6415 @@ -0,0 +1,13 @@ +Title: Make custom attributes of a host available for the core +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541609874 + +Fixes a bug that made custom attributes of a host inaccessible for the core. +Therefore, e.g. the rulset "Individual program call instead of agent access" +could not resolve these values. diff --git a/cmk_base/config.py b/cmk_base/config.py index ac72b63..96233f5 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -462,7 +462,6 @@ class PackedConfig(object): "host_paths", "timeperiods", "extra_service_conf", - "extra_host_conf", "extra_nagios_conf", ]

5 years, 7 months

Fixed a few potential problems with long pathnames for UNIX domain sockets.

by Sven Panne

Module: check_mk Branch: master Commit: 5b10ce9f0322026b03fa9d9fe345295f6257b30d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b10ce9f032202… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 8 16:11:29 2018 +0100 Fixed a few potential problems with long pathnames for UNIX domain sockets. Found by -Wstringop-truncation. Change-Id: I65c4a01af54b1d4102dc1cd862c486ba9cc1fe32 --- active_checks/check_mkevents.cc | 15 ++++++++------- livestatus/api/c++/Livestatus.cc | 11 ++++++----- livestatus/src/module.cc | 3 ++- livestatus/src/unixcat.cc | 3 ++- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc index cef9ee6..eb18419 100644 --- a/active_checks/check_mkevents.cc +++ b/active_checks/check_mkevents.cc @@ -71,7 +71,7 @@ std::ostream &operator<<(std::ostream &os, const State &state) { exit(static_cast<int>(state)); } -[[noreturn]] void ioError(const std::string &message) { + [[noreturn]] void ioError(const std::string &message) { reply(State::unknown, message + " (" + strerror(errno) + ")"); } @@ -200,13 +200,14 @@ int main(int argc, char **argv) { tv.tv_sec = 3; setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval)); - struct sockaddr_un addr; - memset(&addr, 0, sizeof(struct sockaddr_un)); - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, unixsocket_path.c_str(), sizeof(addr.sun_path)); + struct sockaddr_un sockaddr; + sockaddr.sun_family = AF_UNIX; + strncpy(sockaddr.sun_path, unixsocket_path.c_str(), + sizeof(sockaddr.sun_path) - 1); + sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; - if (0 > connect(sock, reinterpret_cast<struct sockaddr *>(&addr), - sizeof(struct sockaddr_un))) { + if (0 > connect(sock, reinterpret_cast<struct sockaddr *>(&sockaddr), + sizeof(struct sockaddr))) { ioError("Cannot connect to event daemon via UNIX socket " + unixsocket_path); } diff --git a/livestatus/api/c++/Livestatus.cc b/livestatus/api/c++/Livestatus.cc index 58193f6..782a044 100644 --- a/livestatus/api/c++/Livestatus.cc +++ b/livestatus/api/c++/Livestatus.cc @@ -31,11 +31,12 @@ void Livestatus::connectUNIX(const char *socket_path) { _connection = socket(PF_LOCAL, SOCK_STREAM, 0); - struct sockaddr_un sa; - sa.sun_family = AF_LOCAL; - strncpy(sa.sun_path, socket_path, sizeof(sa.sun_path)); - if (0 > connect(_connection, (const struct sockaddr *)&sa, - sizeof(sockaddr_un))) { + struct sockaddr_un sockaddr; + sockaddr.sun_family = AF_UNIX; + strncpy(sockaddr.sun_path, socket_path, sizeof(sockaddr.sun_path) - 1); + sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; + if (0 > connect(_connection, (const struct sockaddr *)&sockaddr, + sizeof(sockaddr))) { close(_connection); _connection = -1; } else diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 365875d..3764223 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -408,7 +408,8 @@ bool open_unix_socket() { struct sockaddr_un sockaddr; sockaddr.sun_family = AF_UNIX; strncpy(sockaddr.sun_path, fl_socket_path.c_str(), - sizeof(sockaddr.sun_path)); + sizeof(sockaddr.sun_path) - 1); + sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; if (bind(g_unix_socket, reinterpret_cast<struct sockaddr *>(&sockaddr), sizeof(sockaddr)) < 0) { generic_error ge("cannot bind UNIX socket to address " + diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index dcfb9c4..714fa4c 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -131,7 +131,8 @@ int main(int argc, char **argv) { /* Connect */ struct sockaddr_un sockaddr; sockaddr.sun_family = AF_UNIX; - strncpy(sockaddr.sun_path, unixpath.c_str(), sizeof(sockaddr.sun_path)); + strncpy(sockaddr.sun_path, unixpath.c_str(), sizeof(sockaddr.sun_path) - 1); + sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; if (connect(sock, reinterpret_cast<struct sockaddr *>(&sockaddr), sizeof(sockaddr)) != 0) { printErrno("Couldn't connect to UNIX-socket at " + unixpath);

5 years, 7 months

drop 32bit support for navicli

by Alex Zurhake

Module: check_mk Branch: master Commit: a7d175c576d355c2dd4410c827cc43ad0ba92ebf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7d175c576d355… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 8 14:25:10 2018 +0100 drop 32bit support for navicli Change-Id: Ibd7d6fb9a411f2612c19b0cd2c3f86ba301c0e4b --- omd/packages/navicli/Makefile | 11 - omd/packages/navicli/navisphere-32/bin/admsnap | Bin 531406 -> 0 bytes omd/packages/navicli/navisphere-32/bin/naviseccli | Bin 13063801 -> 0 bytes .../navicli/navisphere-32/bin/setlevel_cli.sh | 108 ----- .../navisphere-32/lib/seccli/libCSP-CertService.so | Bin 328724 -> 0 bytes .../lib/seccli/libCSP-Configuration.so | Bin 168696 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libCSP-RT.so | Bin 298444 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libCSP-SM.so | Bin 700156 -> 0 bytes .../navisphere-32/lib/seccli/libCSP-Security.so | Bin 650600 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libCSP-lb.so | Bin 128508 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libCSP.so | Bin 456504 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libCSPI.so | Bin 336536 -> 0 bytes .../navisphere-32/lib/seccli/libCST-Admin.so | Bin 221980 -> 0 bytes .../lib/seccli/libNonFipsUtilities.so | Bin 462623 -> 0 bytes .../navisphere-32/lib/seccli/libccme_base.so | Bin 1291556 -> 0 bytes .../navisphere-32/lib/seccli/libcryptocme2.sig | 31 -- .../navisphere-32/lib/seccli/libcryptocme2.so | Bin 736716 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libexpat.so | Bin 111488 -> 0 bytes .../navicli/navisphere-32/lib/seccli/libosysrt.so | Bin 249060 -> 0 bytes .../navisphere-32/lib/seccli/libosysrtxml.so | Bin 110916 -> 0 bytes .../navicli/navisphere-32/seccli/CST/CSP-Admin.xml | 86 ---- .../navicli/navisphere-32/seccli/CST/CSP-Authn.xml | 82 ---- .../navisphere-32/seccli/CST/CSP-CatalogPosix.xml | 29 -- .../seccli/CST/CSP-CatalogService.xml | 21 - .../seccli/CST/CSP-CatalogWindows.xml | 29 -- .../seccli/CST/CSP-CertificateManagement.xml | 37 -- .../navisphere-32/seccli/CST/CSP-Config.xml | 29 -- .../seccli/CST/CSP-DestinationAlert.xml | 22 - .../seccli/CST/CSP-DestinationEventLog.xml | 34 -- .../seccli/CST/CSP-DestinationFile.xml | 35 -- .../seccli/CST/CSP-DestinationODBC.xml | 34 -- .../seccli/CST/CSP-DestinationSyslog.xml | 32 -- .../navicli/navisphere-32/seccli/CST/CSP-LDAP.xml | 85 ---- .../navisphere-32/seccli/CST/CSP-LayoutFlat.xml | 21 - .../navisphere-32/seccli/CST/CSP-LayoutRaw.xml | 21 - .../navisphere-32/seccli/CST/CSP-LayoutXML.xml | 21 - .../seccli/CST/CSP-LocalDirectory.xml | 54 --- .../seccli/CST/CSP-LocalizationService.xml | 21 - .../navisphere-32/seccli/CST/CSP-Logging.xml | 63 --- .../navisphere-32/seccli/CST/CSP-OSLogin.xml | 1 - .../navicli/navisphere-32/seccli/CST/CSP-PAM.xml | 29 -- .../seccli/CST/CSP-PositionalFormatter.xml | 21 - .../seccli/CST/CSP-RoleManagement.xml | 43 -- .../navicli/navisphere-32/seccli/CST/CSP-SM.xml | 18 - .../navisphere-32/seccli/CST/CSP-SecurID.xml | 46 -- .../seccli/CST/CSP-SprintfFormatter.xml | 21 - .../navisphere-32/seccli/CST/CSP-TrustedUser.xml | 26 -- .../seccli/CST/CSP-UserManagement.xml | 36 -- .../seccli/CST/CSP-saml-schema-assertion-1.1.xsd | 201 --------- .../seccli/CST/CSP-saml-schema-assertion-2.0.xsd | 283 ------------- .../navisphere-32/seccli/CST/CSP-xenc-schema.xsd | 146 ------- .../navicli/navisphere-32/seccli/CST/CSP.xml | 56 --- .../navisphere-32/seccli/CST/Config-Template.xml | 458 -------------------- .../navicli/navisphere-32/seccli/CST/Config.xml | 469 --------------------- .../navicli/navisphere-32/seccli/CST/csp-app.xml | 45 -- .../seccli/CST/xmldsig-core-schema.xsd | 318 -------------- 56 files changed, 3123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a7d175c576…

5 years, 7 months

Make GCC 8 a even more happy, fixing some more -Wstringop-truncation warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 9faf8d4495d8df1677336baf54931792ba78c2ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9faf8d4495d8df… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 8 14:15:05 2018 +0100 Make GCC 8 a even more happy, fixing some more -Wstringop-truncation warnings. Change-Id: I353212845b4dd73ae37ec051e9596d3b7b8c919b --- livestatus/src/module.cc | 71 +++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index ef72d05..365875d 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -94,13 +94,13 @@ size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ void *g_nagios_handle; int g_unix_socket = -1; int g_max_fd_ever = 0; -static char fl_socket_path[4096]; +static std::string fl_socket_path; 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]; +static std::string fl_logfile_path; +static std::string fl_mkeventd_socket_path; static bool fl_should_terminate = false; struct ThreadInfo { @@ -376,13 +376,12 @@ void terminate_threads() { bool open_unix_socket() { struct stat st; - if (stat(fl_socket_path, &st) == 0) { - if (unlink(fl_socket_path) == 0) { + if (stat(fl_socket_path.c_str(), &st) == 0) { + if (unlink(fl_socket_path.c_str()) == 0) { Debug(fl_logger_nagios) << "removed old socket file " << fl_socket_path; } else { - generic_error ge("cannot remove old socket file " + - std::string(fl_socket_path)); + generic_error ge("cannot remove old socket file " + fl_socket_path); Alert(fl_logger_nagios) << ge; return false; } @@ -408,11 +407,12 @@ bool open_unix_socket() { // fl_socket_path struct sockaddr_un sockaddr; sockaddr.sun_family = AF_UNIX; - strncpy(sockaddr.sun_path, fl_socket_path, sizeof(sockaddr.sun_path)); + strncpy(sockaddr.sun_path, fl_socket_path.c_str(), + sizeof(sockaddr.sun_path)); if (bind(g_unix_socket, reinterpret_cast<struct sockaddr *>(&sockaddr), sizeof(sockaddr)) < 0) { generic_error ge("cannot bind UNIX socket to address " + - std::string(fl_socket_path)); + fl_socket_path); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; @@ -420,17 +420,16 @@ bool open_unix_socket() { // Make writable group members (fchmod didn't do nothing for me. Don't know // why!) - if (0 != chmod(fl_socket_path, 0660)) { + if (0 != chmod(fl_socket_path.c_str(), 0660)) { generic_error ge("cannot change file permissions for UNIX socket at " + - std::string(fl_socket_path) + " to 0660"); + fl_socket_path + " to 0660"); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; } if (0 != listen(g_unix_socket, 3 /* backlog */)) { - generic_error ge("cannot listen to UNIX socket at " + - std::string(fl_socket_path)); + generic_error ge("cannot listen to UNIX socket at " + fl_socket_path); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; @@ -442,7 +441,7 @@ bool open_unix_socket() { } void close_unix_socket() { - unlink(fl_socket_path); + unlink(fl_socket_path.c_str()); if (g_unix_socket >= 0) { close(g_unix_socket); g_unix_socket = -1; @@ -901,20 +900,16 @@ void check_path(const char *name, char *path) { } void livestatus_parse_arguments(const char *args_orig) { - /* set default socket path */ - strncpy(fl_socket_path, default_socket_path, sizeof(fl_socket_path)); - - /* set default path to our logfile to be in the same path as nagios.log */ - strncpy(fl_logfile_path, log_file, - sizeof(fl_logfile_path) - 16 /* len of "livestatus.log" */); - char *slash = strrchr(fl_logfile_path, '/'); - if (slash == nullptr) { - strncpy(fl_logfile_path, "/tmp/livestatus.log", 20); - } else { - strncpy(slash + 1, "livestatus.log", 15); - } + fl_socket_path = default_socket_path; + + // set default path to our logfile to be in the same path as nagios.log + std::string lf{log_file}; + auto slash = lf.rfind('/'); + fl_logfile_path = + (slash == std::string::npos ? "/tmp/" : lf.substr(0, slash + 1)) + + "livestatus.log"; - fl_mkeventd_socket_path[0] = 0; + fl_mkeventd_socket_path = ""; /* there is no default PNP path */ fl_pnp_path[0] = 0; @@ -932,7 +927,7 @@ void livestatus_parse_arguments(const char *args_orig) { char *left = next_token(&part, '='); char *right = next_token(&part, 0); if (right == nullptr) { - strncpy(fl_socket_path, left, sizeof(fl_socket_path)); + fl_socket_path = left; } else { if (strcmp(left, "debug") == 0) { int debug_level = atoi(right); @@ -946,10 +941,9 @@ void livestatus_parse_arguments(const char *args_orig) { Notice(fl_logger_nagios) << "setting debug level to " << fl_livestatus_log_level; } else if (strcmp(left, "log_file") == 0) { - strncpy(fl_logfile_path, right, sizeof(fl_logfile_path)); + fl_logfile_path = right; } else if (strcmp(left, "mkeventd_socket_path") == 0) { - strncpy(fl_mkeventd_socket_path, right, - sizeof(fl_mkeventd_socket_path)); + fl_mkeventd_socket_path = right; } else if (strcmp(left, "max_cached_messages") == 0) { fl_max_cached_messages = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) @@ -1093,15 +1087,12 @@ void livestatus_parse_arguments(const char *args_orig) { } } - if (fl_mkeventd_socket_path[0] == 0) { - strncpy(fl_mkeventd_socket_path, fl_socket_path, - sizeof(fl_mkeventd_socket_path)); - char *slash = strrchr(fl_mkeventd_socket_path, '/'); - char *pos = slash == nullptr ? fl_mkeventd_socket_path : (slash + 1); - strncpy( - pos, "mkeventd/status", - &fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path)] - pos); - fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path) - 1] = 0; + if (fl_mkeventd_socket_path.empty()) { + std::string sp{fl_socket_path}; + auto slash = sp.rfind('/'); + fl_mkeventd_socket_path = + (slash == std::string::npos ? "" : sp.substr(0, slash + 1)) + + "mkeventd/status"; } Warning(fl_logger_nagios) << "fl_socket_path=[" << fl_socket_path

5 years, 7 months

Typecheck idiom fix cmk/gui/plugins/wato

by Óscar Nájera

Module: check_mk Branch: master Commit: 1dd0bf2b37bbc4ee10bd6e1e9ec5b379f25d7254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd0bf2b37bbc4… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 13:40:53 2018 +0100 Typecheck idiom fix cmk/gui/plugins/wato CMK-837 Change-Id: Ib724e148e82031e1ab9c045b36a6eab3523a4d95 --- cmk/gui/plugins/wato/active_checks.py | 13 ++++-- cmk/gui/plugins/wato/bi.py | 8 ++-- cmk/gui/plugins/wato/check_mk_configuration.py | 6 +-- cmk/gui/plugins/wato/check_parameters.py | 58 +++++++++++++------------- cmk/gui/plugins/wato/datasource_programs.py | 4 +- cmk/gui/plugins/wato/notifications.py | 8 ++-- 6 files changed, 52 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1dd0bf2b37…

5 years, 7 months

nsca-2.9.1 is used, version 2.7.1 is not needed anymore

by Alex Zurhake

Module: check_mk Branch: master Commit: 74aa979c75c9b6c9e50e1b27a80b63016756509c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74aa979c75c9b6… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 8 11:59:10 2018 +0100 nsca-2.9.1 is used, version 2.7.1 is not needed anymore Change-Id: Ibcbd065e85a7ec617a3b1c598485a53104deec10 --- omd/packages/nsca/nsca-2.7.2.tar.gz | Bin 104953 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/nsca/nsca-2.7.2.tar.gz b/omd/packages/nsca/nsca-2.7.2.tar.gz deleted file mode 100644 index 724997e..0000000 Binary files a/omd/packages/nsca/nsca-2.7.2.tar.gz and /dev/null differ

5 years, 7 months

Moved server_time from shipped.py to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: 9c22a30e191c41fe370ed9caf0eca736785bafcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c22a30e191c41… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 26 15:32:40 2018 +0200 Moved server_time from shipped.py to dedicated module Change-Id: I5d604c8e9006d05fb9979246376207f06f6c321f --- cmk/gui/plugins/sidebar/server_time.py | 60 ++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 35 -------------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/cmk/gui/plugins/sidebar/server_time.py b/cmk/gui/plugins/sidebar/server_time.py new file mode 100644 index 0000000..b4f2559 --- /dev/null +++ b/cmk/gui/plugins/sidebar/server_time.py @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import time + +from cmk.gui.i18n import _ +from cmk.gui.globals import html + +from cmk.gui.plugins.sidebar import ( + sidebar_snapins, + snapin_width, +) + + +def render_current_time(): + html.div(time.strftime("%H:%M"), class_="time") + +sidebar_snapins["time"] = { + "title" : _("Server Time"), + "description" : _("A large clock showing the current time of the web server"), + "refresh" : True, + "render" : render_current_time, + "allowed" : [ "user", "admin", "guest", ], + "styles" : """ +div.time { + text-align: center; + font-size: 18pt; + font-weight: bold; + /* The border needs to be substracted from the width */ + border: 1px solid #8cc; + -moz-border-radius: 10px; + background-color: #588; + color: #aff; + width: %dpx; +} +""" % (snapin_width - 2) +} diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 3b06247..54424f7 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -29,7 +29,6 @@ # TODO: Refactor all snapins to the new snapin API and move page handlers # from sidebar.py to the snapin objects that need these pages. -import time import re import cmk.paths @@ -407,40 +406,6 @@ table.performance td.right { } #. -# .--Server Time---------------------------------------------------------. -# | ____ _____ _ | -# | / ___| ___ _ ____ _____ _ __ |_ _(_)_ __ ___ ___ | -# | \___ \ / _ \ '__\ \ / / _ \ '__| | | | | '_ ` _ \ / _ \ | -# | ___) | __/ | \ V / __/ | | | | | | | | | | __/ | -# | |____/ \___|_| \_/ \___|_| |_| |_|_| |_| |_|\___| | -# | | -# '----------------------------------------------------------------------' - -def render_current_time(): - html.div(time.strftime("%H:%M"), class_="time") - -sidebar_snapins["time"] = { - "title" : _("Server Time"), - "description" : _("A large clock showing the current time of the web server"), - "refresh" : True, - "render" : render_current_time, - "allowed" : [ "user", "admin", "guest", ], - "styles" : """ -div.time { - text-align: center; - font-size: 18pt; - font-weight: bold; - /* The border needs to be substracted from the width */ - border: 1px solid #8cc; - -moz-border-radius: 10px; - background-color: #588; - color: #aff; - width: %dpx; -} -""" % (snapin_width - 2) -} - -#. # .--Nagios--------------------------------------------------------------. # | _ _ _ | # | | \ | | __ _ __ _(_) ___ ___ |

5 years, 7 months

Refactored snapin server_time to new snapin API

by Kenneth Okoh

Module: check_mk Branch: master Commit: 8434a1c8cc0d7ca471a2da6568b940fc638045a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8434a1c8cc0d7c… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 26 15:59:38 2018 +0200 Refactored snapin server_time to new snapin API Change-Id: Id0c87f40741562f484f846cd67de6589dc5f9bee --- cmk/gui/plugins/sidebar/server_time.py | 39 +++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/cmk/gui/plugins/sidebar/server_time.py b/cmk/gui/plugins/sidebar/server_time.py index b4f2559..602c251 100644 --- a/cmk/gui/plugins/sidebar/server_time.py +++ b/cmk/gui/plugins/sidebar/server_time.py @@ -28,23 +28,33 @@ import time from cmk.gui.i18n import _ from cmk.gui.globals import html +from . import SidebarSnapin, snapin_registry +from cmk.gui.plugins.sidebar import snapin_width -from cmk.gui.plugins.sidebar import ( - sidebar_snapins, - snapin_width, -) +(a)snapin_registry.register +class CurrentTime(SidebarSnapin): + @staticmethod + def type_name(): + return "time" + @classmethod + def title(cls): + return _("Server Time") -def render_current_time(): - html.div(time.strftime("%H:%M"), class_="time") + @classmethod + def description(cls): + return _("A large clock showing the current time of " + "the web server"), -sidebar_snapins["time"] = { - "title" : _("Server Time"), - "description" : _("A large clock showing the current time of the web server"), - "refresh" : True, - "render" : render_current_time, - "allowed" : [ "user", "admin", "guest", ], - "styles" : """ + def show(self): + html.div(time.strftime("%H:%M"), class_="time") + + @classmethod + def allowed_roles(cls): + return [ "admin", "user", "guest" ] + + def styles(self): + return """ div.time { text-align: center; font-size: 18pt; @@ -56,5 +66,4 @@ div.time { color: #aff; width: %dpx; } -""" % (snapin_width - 2) -} +""" % (snapin_width - 2)

5 years, 7 months

Semi-automatic yapf for cmk/gui/plugins/wato

by Óscar Nájera

Module: check_mk Branch: master Commit: 5caf55b20ed4df6cac21de3dde66cbaa9e3b01d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5caf55b20ed4df… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 17:00:31 2018 +0100 Semi-automatic yapf for cmk/gui/plugins/wato CMK-1180 Change-Id: I7d44a59a2616eaf046c369177998aab6644a272d --- cmk/gui/plugins/wato/ac_tests.py | 366 +- cmk/gui/plugins/wato/active_checks.py | 3849 ++-- cmk/gui/plugins/wato/background_job.py | 35 +- cmk/gui/plugins/wato/backup_domains.py | 93 +- cmk/gui/plugins/wato/bi.py | 1336 +- cmk/gui/plugins/wato/builtin_attributes.py | 684 +- cmk/gui/plugins/wato/builtin_modules.py | 100 +- cmk/gui/plugins/wato/check_mk_configuration.py | 4074 ++-- cmk/gui/plugins/wato/check_parameters.py | 24307 +++++++++++------------ cmk/gui/plugins/wato/datasource_programs.py | 2146 +- cmk/gui/plugins/wato/globals_notification.py | 186 +- cmk/gui/plugins/wato/inventory.py | 236 +- cmk/gui/plugins/wato/nagvis_auth.py | 22 +- cmk/gui/plugins/wato/notifications.py | 872 +- cmk/gui/plugins/wato/omd_configuration.py | 428 +- 15 files changed, 18597 insertions(+), 20137 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5caf55b20e…

5 years, 7 months

fixed recently introduced bug on merging WK6676

by Andreas Boesl

Module: check_mk Branch: master Commit: e20681320b0ef7cc72bdb148462ae2e7c0795b68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e20681320b0ef7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 8 11:48:03 2018 +0100 fixed recently introduced bug on merging WK6676 Change-Id: Ic3fdb4cb3611c0e08ff7425e79615110d22910c9 --- cmk/gui/plugins/webapi/webapi.py | 2 +- cmk/gui/watolib.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py index eaa4c54..31a52ff 100644 --- a/cmk/gui/plugins/webapi/webapi.py +++ b/cmk/gui/plugins/webapi/webapi.py @@ -782,7 +782,7 @@ class APICallHosttags(APICallCollection): def _get_builtin_tags_configuration(self): builtin_tags_config = watolib.BuiltinHosttagsConfiguration() - builtin_tags_config.parse_config((watolib.builtin_host_tags, watolib.builtin_aux_tags)) + builtin_tags_config.load() return builtin_tags_config.get_dict_format() def _set(self, request): diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index aa77d87..a0c73f4 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -7317,6 +7317,10 @@ class BuiltinHosttagsConfiguration(HosttagsConfiguration): def insert_tag_group(self, tag_group): self._insert_tag_group(tag_group) + def load(self): + builtin_tags = config.BuiltinTags() + self._parse_legacy_format(builtin_tags.host_tags(), builtin_tags.aux_tags()) + #. # .--Hooks---------------------------------------------------------------. # | _ _ _ |

5 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018