Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cc51fa3ea03e1a5f48975fe2e718c21cd722a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cc51fa3ea03e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 14:19:07 2015 +0100 Added edition text to sidebar header --- web/htdocs/images/sidebar_top.png | Bin 17744 -> 18195 bytes web/htdocs/sidebar.css | 2 +- web/htdocs/sidebar.py | 17 ++++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index e367ab7..43fa2ab 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 7e9da2d..b7f96dd 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -96,7 +96,7 @@ body.side.screenshotmode { #side_version { position: absolute; - top: 24px; + top: 12px; right: 20px; z-index: 54; color: #fff; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index f5c94c0..f69b141 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -151,19 +151,34 @@ def load_user_config(): return user_config + def save_user_config(user_config): if config.may("general.configure_sidebar"): config.save_user_file("sidebar", user_config) + +def get_check_mk_edition_title(): + if not defaults.omd_root: + return "Raw" + version_link = os.readlink("/omd/sites/heute/version") + if version_link.endswith(".cee.demo"): + return "Enterprise (Demo)" + elif "cee" in version_link: + return "Enterprise" + else: + return "Raw" + + def sidebar_head(): html.write('<div id="side_header">') html.write('<div id="side_fold"></div>') html.write('<a title="%s" target="main" href="%s">' '<img id="side_bg" src="images/sidebar_top.png">' - '<div id="side_version"><a href="version.py" target="main">%s</a></div>' + '<div id="side_version"><a href="version.py" target="main">%s<br>%s</a></div>' '</a>' '</div>\n' % (_("Go to main overview"), html.attrencode(config.user.get("start_url") or config.start_url), + get_check_mk_edition_title(), defaults.check_mk_version)) def render_messages():

8 years, 11 months

Embrace C++ strings in pnp4nagios. Scope helpers locally. Don't use "using " in header.

by Sven Panne

Module: check_mk Branch: master Commit: 35bf9c37a8ad6fb8001089b69d0fbf708c8d3f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35bf9c37a8ad6f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 29 13:38:29 2015 +0100 Embrace C++ strings in pnp4nagios. Scope helpers locally. Don't use "using" in header. --- livestatus/src/HostSpecialIntColumn.cc | 2 +- livestatus/src/pnp4nagios.cc | 107 +++++++++++--------------------- livestatus/src/pnp4nagios.h | 12 ++-- 3 files changed, 44 insertions(+), 77 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index 61b9da4..dad38ba 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -43,7 +43,7 @@ int32_t HostSpecialIntColumn::getValue(void *data, Query *) return hst->last_hard_state; case HSIC_PNP_GRAPH_PRESENT: - return pnpgraph_present(hst->name, 0); + return pnpgraph_present(hst->name); case HSIC_MK_INVENTORY_LAST: return mk_inventory_last(hst->name); diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index fee674f..7bc0340 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -22,96 +22,59 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#include <stdlib.h> #include <string.h> -#include <sys/stat.h> #include <sys/types.h> -#include <unistd.h> +#include <sys/stat.h> #include <unistd.h> #include "pnp4nagios.h" - -extern char *g_pnp_path; - -char *cleanup_pnpname(char *name) -{ - char *p = name; - while (*p) { - if (*p == ' ' || *p == '/' || *p == '\\' || *p == ':') - *p = '_'; - p++; - } - return name; -} +using namespace std; -int pnpgraph_present(const char *host, const char *service) -{ - if (!g_pnp_path[0]) - return -1; +// Note: If the path is not empty, it always ends with '/', see +// livestatus_parse_arguments. +extern char* g_pnp_path; - char path[4096]; - size_t needed_size = strlen(g_pnp_path) + strlen(host) + 16; - if (service) - needed_size += strlen(service); - if (needed_size > sizeof(path)) - return -1; +namespace { - strcpy(path, g_pnp_path); - char *end = path + strlen(path); - strcpy(end, host); - cleanup_pnpname(end); - strcat(end, "/"); - end = end + strlen(end); - if (service) { - strcat(end, service); - cleanup_pnpname(end); - strcat(end, ".xml"); +string replace_all(const string& str, const string& chars, char replacement) { + string result(str); + size_t i = 0; + while ((i = result.find_first_of(chars, i)) != string::npos) { + result[i++] = replacement; } - else - strcat(end, "_HOST_.xml"); - - if (0 == access(path, R_OK)) - return 1; - else - return 0; + return result; } -// Determines if a RRD database is existent and returns its path name. -// Returns an empty string otherwise. -// This assumes paths created in the PNP4Nagios style with storage type MULTIPLE. -string rrd_path(const char *host, const char *service, const char *varname) -{ - if (!g_pnp_path[0]) - return ""; - - string path = g_pnp_path; - path += "/"; +string cleanup(const string& name) { return replace_all(name, " /\\:", '_'); } - char *cleaned_up; - cleaned_up = cleanup_pnpname(strdup(host)); - path += cleaned_up; - free(cleaned_up); +} // namespace - path += "/"; - cleaned_up = cleanup_pnpname(strdup(service)); - path += cleaned_up; - free(cleaned_up); - - path += "_"; - - cleaned_up = cleanup_pnpname(strdup(varname)); - path += cleaned_up; - free(cleaned_up); +int pnpgraph_present(const std::string& host, const std::string& service) { + string pnp_path(g_pnp_path); + if (pnp_path.empty()) return -1; + string path(pnp_path.append(cleanup(host)) + .append("/") + .append(cleanup(service)) + .append(".xml")); + return access(path.c_str(), R_OK) == 0 ? 1 : 0; +} - path += ".rrd"; +string rrd_path(const string& host, const string& service, + const string& varname) { + string pnp_path(g_pnp_path); + if (pnp_path.empty()) return ""; + string path(pnp_path.append("/") + .append(cleanup(host)) + .append("/") + .append(cleanup(service)) + .append("_") + .append(cleanup(varname)) + .append(".rrd")); struct stat st; - if (0 == stat(path.c_str(), &st)) - return path; - else - return ""; + return stat(path.c_str(), &st) == 0 ? path : ""; } diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 6434d73..7f2595e 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -26,10 +26,14 @@ #define pnp4nagios_h #include <string> -using namespace std; -int pnpgraph_present(const char *host, const char *service); -string rrd_path(const char *host, const char *service, const char *varname); +int pnpgraph_present(const std::string& host, + const std::string& service = "_HOST_"); -#endif // pnp4nagios_h +// Determines if a RRD database exists and returns its path name. Returns an +// empty string otherwise. This assumes paths created in the PNP4Nagios style +// with storage type MULTIPLE. +std::string rrd_path(const std::string& host, const std::string& service, + const std::string& varname); +#endif // pnp4nagios_h

8 years, 11 months

Added new Check_MK logo

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bd4faec596f3c27789a1d078183982fd862c11c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bd4faec596f3c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 13:27:42 2015 +0100 Added new Check_MK logo --- web/htdocs/images/sidebar_top.png | Bin 5219 -> 17744 bytes web/htdocs/sidebar.css | 33 +++++++++++++++++++++------------ web/htdocs/sidebar.py | 5 ++++- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index 35cc74e..e367ab7 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b395f90..7e9da2d 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -53,14 +53,22 @@ body.side.screenshotmode { /* Top logo part */ #side_header { - position: absolute; + position: relative; top: 0px; left: 0px; width: 100%; height: 55px; z-index: 10; background-repeat: no-repeat; - background-image: url("images/sidebar_top.png"); +} + +#side_bg { + position: absolute; + top: 0; + left: 0; + width: 280px; + height: 55px; + z-index: 10; } #side_header > a { @@ -71,20 +79,13 @@ body.side.screenshotmode { margin-left: 10px; /* space for sidebar folding */ } -#side_version a { - text-decoration: none; -} - -#side_version a:hover { - text-decoration: underline; -} - #side_fold { position: absolute; left: 0px; top: 0px; width: 10px; height: 55px; + z-index: 15; } #side_fold:hover { background-repeat: no-repeat; @@ -96,12 +97,20 @@ body.side.screenshotmode { #side_version { position: absolute; top: 24px; - left: 64px; + right: 20px; z-index: 54; color: #fff; text-align: right; - width: 200px; font-size: 8pt; + max-width: 150px; +} + +#side_version a { + text-decoration: none; +} + +#side_version a:hover { + text-decoration: underline; } /* Scrolling part with snapins */ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index cc72fc0..f5c94c0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -159,9 +159,12 @@ def sidebar_head(): html.write('<div id="side_header">') html.write('<div id="side_fold"></div>') html.write('<a title="%s" target="main" href="%s">' + '<img id="side_bg" src="images/sidebar_top.png">' '<div id="side_version"><a href="version.py" target="main">%s</a></div>' '</a>' - '</div>\n' % (_("Go to main overview"), html.attrencode(config.user.get("start_url") or config.start_url), defaults.check_mk_version)) + '</div>\n' % (_("Go to main overview"), + html.attrencode(config.user.get("start_url") or config.start_url), + defaults.check_mk_version)) def render_messages(): for msg in notify.get_gui_messages():

8 years, 11 months

#1299 FIX BI: Fixed recently introduced bug when editing BI Rules

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4066fd75bed1a584bf796864cd5ff4039b2111f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4066fd75bed1a5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 30 11:52:53 2015 +0100 #1299 FIX BI: Fixed recently introduced bug when editing BI Rules The BI edit has always overwritten the last rule with the information from the rule before when editing rules in series. --- .werks/1299 | 11 +++++++++++ ChangeLog | 3 ++- web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1299 b/.werks/1299 new file mode 100644 index 0000000..bc56de9 --- /dev/null +++ b/.werks/1299 @@ -0,0 +1,11 @@ +Title: BI: Fixed recently introduced bug when editing BI Rules +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446202185 + +The BI edit has always overwritten the last rule with the information from the rule before when editing rules in series. + diff --git a/ChangeLog b/ChangeLog index fc334c7..bf984d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,8 +48,9 @@ WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor - * 1298 FIX: Fixed broken WebAPI * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages + * 1298 FIX: Fixed broken WebAPI... + * 1299 FIX: BI: Fixed recently introduced bug when editing BI Rules... HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2de4314..23e4e87 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17561,7 +17561,7 @@ def render_bi_rules(title, aggregations, aggregation_rules, only_unused): if not only_unused or refs == 0: table.row() table.cell(_("Actions"), css="buttons") - edit_url = html.makeuri([("mode", "bi_edit_rule"), ("id", ruleid)]) + edit_url = html.makeuri_contextless([("mode", "bi_edit_rule"), ("id", ruleid)]) html.icon_button(edit_url, _("Edit this rule"), "edit") if rule_refs == 0: tree_url = html.makeuri([("mode", "bi_rule_tree"), ("id", ruleid)])

8 years, 11 months

#1298 FIX Fixed broken WebAPI

by Bastian Kuhn

Module: check_mk Branch: master Commit: 286d8670e101728525d02fbe000e60231c3da20d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=286d8670e10172… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 30 10:50:21 2015 +0100 #1298 FIX Fixed broken WebAPI The WebAPI was broken due to a Typo. It was not possible to edit or add hosts. --- .werks/1298 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1298 b/.werks/1298 new file mode 100644 index 0000000..55bd9f5 --- /dev/null +++ b/.werks/1298 @@ -0,0 +1,11 @@ +Title: Fixed broken WebAPI +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446198542 + +The WebAPI was broken due to a Typo. It was not possible to edit or add hosts. + diff --git a/ChangeLog b/ChangeLog index 12497f6..4ecd5f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor + * 1298 FIX: Fixed broken WebAPI... HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 66164e0..2de4314 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -19307,7 +19307,7 @@ def activate_changes(): # Checks if the given host_tags are all in known host tag groups and have a valid value def check_host_tags(host_tags): for key, value in host_tags.items(): - for group_entry in configured_host_tags: + for group_entry in configured_host_tags(): if group_entry[0] == key: for value_entry in group_entry[2]: if value_entry[0] == value:

8 years, 11 months

merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 86e1c7902ccdde1059b283613e8d2537ea903656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86e1c7902ccdde… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 30 10:51:52 2015 +0100 merge conflict ---

8 years, 11 months

#2717 FIX Fixed broken webserver level authentication integration ( e.g. basic, kerberos)

by Lars Michelsen

Module: check_mk Branch: master Commit: 818dde7d778908c514ed360fc437ee15f39658d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=818dde7d778908… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 30 10:44:40 2015 +0100 #2717 FIX Fixed broken webserver level authentication integration (e.g. basic, kerberos) Fixed a regression which broke the integration of the Check_MK GUI into an authentication which is done by the web server. This is for example a basic or kerberos authentication. --- .werks/2717 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2717 b/.werks/2717 new file mode 100644 index 0000000..92aa61c --- /dev/null +++ b/.werks/2717 @@ -0,0 +1,11 @@ +Title: Fixed broken webserver level authentication integration (e.g. basic, kerberos) +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446198173 + +Fixed a regression which broke the integration of the Check_MK GUI into an authentication +which is done by the web server. This is for example a basic or kerberos authentication. diff --git a/ChangeLog b/ChangeLog index 587d7b2..84e30ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 2438 FIX: Manpage icons: fixed manpage links for active checks * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites * 2670 FIX: Fix problem that no site is configured when user has deleted only site... + * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 1cd3406..d2ae6ca 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -123,7 +123,9 @@ class html_mod_python(htmllib.html): def is_logged_in(self): - return self.user and type(self.user) == unicode + # Form based authentication always provides unicode strings, but the basic + # authentication of mod_python provides regular strings. + return self.user and type(self.user) in [ str, unicode ] def load_help_visible(self):

8 years, 11 months

Updated bug entries #2383

by Mathias Kettner

Module: check_mk Branch: master Commit: a3c14644338cbb7cdcce767cfc5b1d1b04bc1c36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3c14644338cbb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 30 10:18:04 2015 +0100 Updated bug entries #2383 --- .bugs/2383 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.bugs/2383 b/.bugs/2383 new file mode 100644 index 0000000..91cf8c1 --- /dev/null +++ b/.bugs/2383 @@ -0,0 +1,21 @@ +Title: WATO dialog for host creation shows folder contact group attributes +Component: wato +State: open +Date: 2015-10-30 10:16:25 +Targetversion: future +Class: bug + +Permissions.. + +[ ] Everybody +[ ] Gruppe A +[ ] Gruppe B + +[ ] Give these groups also permission on all subfolders +[ ] Add these groups as contacts to all hosts in this folder +[ ] Add these groups as contacts in all subfolders + +But this was the dialog of a new *host*, not folder. + +In *edit*-Mode of a host this is OK and the correct check +boxes are being displayed.

8 years, 11 months

EC: Renamed button images

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9dbed7b32bf21138fd40f2297a60a138c9973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9dbed7b32bf2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 09:51:43 2015 +0100 EC: Renamed button images --- .../web/htdocs/images/{button_mkeventd_lo.png => button_mkeventd.png} | Bin 4609 -> 4609 bytes mkeventd/web/htdocs/images/button_mkeventd_hi.png | Bin 4021 -> 0 bytes .../images/{button_mkeventd_rules_lo.png => button_mkeventd_rules.png} | Bin 2203 -> 2203 bytes mkeventd/web/htdocs/images/button_mkeventd_rules_hi.png | Bin 1685 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mkeventd/web/htdocs/images/button_mkeventd_lo.png b/mkeventd/web/htdocs/images/button_mkeventd.png similarity index 100% rename from mkeventd/web/htdocs/images/button_mkeventd_lo.png rename to mkeventd/web/htdocs/images/button_mkeventd.png diff --git a/mkeventd/web/htdocs/images/button_mkeventd_hi.png b/mkeventd/web/htdocs/images/button_mkeventd_hi.png deleted file mode 100644 index e53839d..0000000 Binary files a/mkeventd/web/htdocs/images/button_mkeventd_hi.png and /dev/null differ diff --git a/mkeventd/web/htdocs/images/button_mkeventd_rules_lo.png b/mkeventd/web/htdocs/images/button_mkeventd_rules.png similarity index 100% rename from mkeventd/web/htdocs/images/button_mkeventd_rules_lo.png rename to mkeventd/web/htdocs/images/button_mkeventd_rules.png diff --git a/mkeventd/web/htdocs/images/button_mkeventd_rules_hi.png b/mkeventd/web/htdocs/images/button_mkeventd_rules_hi.png deleted file mode 100644 index 9f75e7d..0000000 Binary files a/mkeventd/web/htdocs/images/button_mkeventd_rules_hi.png and /dev/null differ

8 years, 11 months

Updated bug entries #2319

by Lars Michelsen

Module: check_mk Branch: master Commit: 4164868a5ce5675aeb59a2a6fffe02554ac7b800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4164868a5ce567… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 09:46:30 2015 +0100 Updated bug entries #2319 --- .bugs/2319 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2319 b/.bugs/2319 new file mode 100644 index 0000000..c520aba --- /dev/null +++ b/.bugs/2319 @@ -0,0 +1,9 @@ +Title: Event Console actions fail on non printable chars in event +Component: ec +State: open +Date: 2015-10-29 09:45:52 +Targetversion: 1.2.6 +Class: bug + +When e.g. a trap contains a \0, eventually raised script +actions fail with an exception in the event console.

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015