Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

fixed wrong number of stale services in tactical overview after fixing stale services view

by Simon Betz

Module: check_mk Branch: master Commit: 9e91f249cf2457833fbf01a33df4e03d9257956e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e91f249cf2457… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 9 14:12:01 2016 +0200 fixed wrong number of stale services in tactical overview after fixing stale services view --- web/plugins/sidebar/shipped.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 39fa1c4..a40de4a 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -578,6 +578,8 @@ def get_tactical_overview_data(extra_filter_headers): "Stats: host_state = 0\n" \ "StatsAnd: 5\n" \ "Stats: service_staleness >= %s\n" % configured_staleness_threshold + \ + "Stats: service_scheduled_downtime_depth = 0\n" \ + "StatsAnd: 2\n" \ "Filter: host_custom_variable_names < _REALNAME\n" + \ extra_filter_headers

8 years

3871 FIX stale services view: excluded services in downtime per default

by Simon Betz

Module: check_mk Branch: master Commit: 0ec4e6fa3fb52040ae87b397e6d378271f552089 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec4e6fa3fb520… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 9 13:50:17 2016 +0200 3871 FIX stale services view: excluded services in downtime per default --- .werks/3871 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3871 b/.werks/3871 new file mode 100644 index 0000000..5a4bd21 --- /dev/null +++ b/.werks/3871 @@ -0,0 +1,10 @@ +Title: stale services view: excluded services in downtime per default +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1473421765 + + diff --git a/ChangeLog b/ChangeLog index 536a105..4f63b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -484,6 +484,7 @@ * 3779 FIX: availability: added validation of availability options * 3767 FIX: Fixed possible UnicodeDecodeError when having users with umlauts in the user ID * 3850 FIX: Fixed JS error when quicksearch snapin not in sidebar + * 3871 FIX: stale services view: excluded services in downtime per default WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index deeeaf1..b7f3c76 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1690,8 +1690,9 @@ multisite_builtin_views.update({ 'datasource': 'services', 'description': _('Services that have not been checked for too long according to their configured check intervals.'), 'group_painters': [('host', 'host', '')], - 'hard_filters': ['service_staleness'], - 'hard_filtervars': [('is_service_staleness', '1')], + 'hard_filters': [ 'service_staleness', 'service_scheduled_downtime_depth' ], + 'hard_filtervars': [('is_service_staleness', '1'), + ('is_service_scheduled_downtime_depth', '0')], 'hidden': False, 'hide_filters': [], 'hidebutton': False,

8 years

Fixed html_mod_python constructor

by Lars Michelsen

Module: check_mk Branch: master Commit: 827e1266984f9f11f21b5abb3ecdc00d3ceed9bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=827e1266984f9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 13:49:03 2016 +0200 Fixed html_mod_python constructor --- web/htdocs/html_mod_python.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index e642932..6dad47c 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -43,6 +43,8 @@ class html_mod_python(htmllib.html): # is not loaded yet. Earliest place is self.init_modes() where config # is loaded. def __init__(self, req, fields): + htmllib.html.__init__(self) + req.content_type = "text/html; charset=UTF-8" req.header_sent = False @@ -51,7 +53,6 @@ class html_mod_python(htmllib.html): self.myfile = req.uri.split("/")[-1][:-3] self.req = req - htmllib.html.__init__(self) self.user = req.user if fields: self.fields = fields

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b0c3d5af89f1af5b0b39f55afcdc80a70a17f6fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0c3d5af89f1af… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 9 11:11:30 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/LogCache.cc | 49 ++++++++++++---------------------------------- livestatus/src/Query.cc | 2 +- livestatus/src/Store.cc | 5 ++--- livestatus/src/module.cc | 10 +++++----- 4 files changed, 21 insertions(+), 45 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 85a93d5..1f25359 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -25,7 +25,6 @@ #include "LogCache.h" #include <dirent.h> #include <unistd.h> -#include <cstdarg> #include <cstddef> #include <cstdio> #include <cstdlib> @@ -53,25 +52,6 @@ extern char *log_file; int num_cached_log_messages = 0; -// Debugging logging is hard if debug messages are logged themselves... -void debug(const char *loginfo, ...) { - // Disable debugging, if not working in code. This can result in - // a symlink attack otherwise... - return; - - if (g_debug_level >= 3) { - return; - } - - FILE *x = fopen("/tmp/livestatus.log", "a+"); - va_list ap; - va_start(ap, loginfo); - vfprintf(x, loginfo, ap); - fputc('\n', x); - va_end(ap); - fclose(x); -} - LogCache::LogCache(const CommandsHolder &commands_holder, unsigned long max_cached_messages) : _commands_holder(commands_holder) @@ -83,7 +63,8 @@ LogCache::LogCache(const CommandsHolder &commands_holder, #ifdef CMC void LogCache::setMaxCachedMessages(unsigned long m) { if (m != _max_cached_messages) { - Notice() << "Logfile cache: Changing max messages to " << m; + Notice() << "changing maximum number of messages for log file cache to " + << m; _max_cached_messages = m; } } @@ -99,7 +80,7 @@ bool LogCache::logCachePreChecks( // Do we have any logfiles (should always be the case, but we don't want to // crash... if (_logfiles.empty()) { - Informational() << "Warning: no logfile found, not even " << log_file; + Informational() << "no log file found, not even " << log_file; return false; } // Has Nagios rotated logfiles? => Update our file index. And delete all @@ -111,7 +92,7 @@ bool LogCache::logCachePreChecks( if (last_log_rotation > _last_index_update) { #endif Informational() - << "Core has rotated logfiles. Rebuilding logfile index"; + << "core has rotated log files, rebuilding log file index"; forgetLogfiles(); updateLogfileIndex(); } @@ -119,7 +100,7 @@ bool LogCache::logCachePreChecks( } void LogCache::forgetLogfiles() { - Informational() << "Logfile cache: flushing complete cache."; + Informational() << "flushing complete log file cache."; for (auto &logfile : _logfiles) { delete logfile.second; } @@ -154,8 +135,7 @@ void LogCache::updateLogfileIndex() { free(ent); closedir(dir); } else { - Informational() << "Cannot open log archive '" << log_archive_path - << "'"; + Informational() << "cannot open log archive " << log_archive_path; } } @@ -169,7 +149,7 @@ void LogCache::scanLogfile(char *path, bool watch) { if (_logfiles.find(since) == _logfiles.end()) { _logfiles.emplace(since, logfile); } else { - Warning() << "Ignoring duplicate logfile " << path; + Warning() << "ignoring duplicate log file " << path; delete logfile; } } else { @@ -236,10 +216,8 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, for (; it != _logfiles.end(); ++it) { Logfile *log = it->second; if (log->numEntries() > 0 && (log->classesRead() & ~logclasses) != 0) { - if (g_debug_level > 2) { - debug("Freeing classes 0x%02x of file %s", ~logclasses, - log->path().c_str()); - } + Debug() << "freeing classes " << ~logclasses << " of file " + << log->path(); long freed = log->freeMessages(~logclasses); // flush only messages // not needed for // current query @@ -259,7 +237,8 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, for (it = ++queryit; it != _logfiles.end(); ++it) { Logfile *log = it->second; if (log->numEntries() > 0) { - debug("Flush newer log, msgs %d", log->numEntries()); + Debug() << "flush newer log, " << log->numEntries() + << " number of entries"; num_cached_log_messages -= log->numEntries(); log->flush(); if (static_cast<unsigned long>(num_cached_log_messages) <= @@ -274,8 +253,6 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, // despite the fact that there are still too many messages // loaded. - if (g_debug_level > 2) { - debug("Cannot unload more messages. Still %d loaded (max is %d)", - num_cached_log_messages, _max_cached_messages); - } + Debug() << "cannot unload more messages, still " << num_cached_log_messages + << " loaded (max is " << _max_cached_messages << ")"; } diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 32d1f2e..4b02939 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -100,7 +100,7 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding, line_copy.push_back('\0'); char *buffer = &line_copy[0]; rstrip(buffer); - if (_debug_level > 0) { + if (_debug_level >= 1) { Informational() << "Query: " << buffer; } if (strncmp(buffer, "Filter:", 7) == 0) { diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 70329b3..a51e244 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <memory> #include "Store.h" #include <chrono> #include <cstring> @@ -134,7 +133,7 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } string l = input->nextLine(); const char *line = l.c_str(); - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "Query: " << line; } if (strncmp(line, "GET ", 4) == 0) { @@ -214,7 +213,7 @@ void Store::answerGetRequest(const list<string> &lines, OutputBuffer *output, auto start = system_clock::now(); Query(lines, table, g_data_encoding, g_debug_level).process(output); - if (g_debug_level > 0) { + if (g_debug_level >= 1) { auto elapsed = duration_cast<microseconds>(system_clock::now() - start); Informational() << "Time to process request: " << elapsed.count() << "us. Size of answer: " << output->size() << " bytes"; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index d47a8cb..e0eea10 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -330,7 +330,7 @@ void start_threads() { Warning() << ex; } - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "starting " << g_num_clientthreads << " client threads"; } @@ -377,7 +377,7 @@ void terminate_threads() { Informational() << "could not join thread no. " << t; } } - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "main thread + " << g_num_clientthreads << " client threads have finished"; } @@ -441,7 +441,7 @@ int open_unix_socket() { return false; } - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "opened UNIX socket at " << g_socket_path; } return true; @@ -919,7 +919,7 @@ void livestatus_parse_arguments(const char *args_orig) { void omd_advertize() { char *omd_site = getenv("OMD_SITE"); if (omd_site != nullptr) { - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "running on OMD site " << omd_site << ", cool."; } } else { @@ -954,7 +954,7 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, << event_broker_options << ", try setting it to -1."; return 1; } - if (g_debug_level > 0) { + if (g_debug_level >= 1) { Informational() << "your event_broker_options are sufficient for livestatus.."; }

8 years

Fixed missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c83f19cfe19ba77c133edc221ef21e369b370b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c83f19cfe19ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 11:01:51 2016 +0200 Fixed missing import --- web/htdocs/valuespec.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 45b33ac..dc87769 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -34,6 +34,7 @@ import math, os, time, re, sre_constants, urlparse, forms, tempfile import socket from lib import * +import cmk.defines as defines def type_name(v): try: @@ -2041,14 +2042,14 @@ class RelativeDate(OptionalDropdownChoice): weekday = time.localtime(today()).tm_wday for w in range(2, 7): wd = (weekday + w) % 7 - choices.append((w, weekday_name(wd))) + choices.append((w, defines.weekday_name(wd))) for w in range(0, 7): wd = (weekday + w) % 7 if w < 2: title = _(" next week") else: title = _(" in %d days") % (w + 7) - choices.append((w + 7, weekday_name(wd) + title)) + choices.append((w + 7, defines.weekday_name(wd) + title)) kwargs['choices'] = choices kwargs['explicit'] = Integer()

8 years

Added missing myfile attribute declaration in constructor

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b2589c400ad889209efc06692db1e165c6e653a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b2589c400ad88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 10:51:00 2016 +0200 Added missing myfile attribute declaration in constructor --- web/htdocs/htmllib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9507d2b..c911e1a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -92,6 +92,7 @@ __builtin__.HTML = HTML class html(object): def __init__(self): super(html, self).__init__() + self.myfile = None self.cookies = {} self.user = None self.user_errors = {}

8 years

htmllib can now be imported without lib/defaults

by Lars Michelsen

Module: check_mk Branch: master Commit: ab09b3d9837dcedba33f3ff5c5e63ac7b37d81c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab09b3d9837dce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 10:18:38 2016 +0200 htmllib can now be imported without lib/defaults --- lib/defines.py | 104 +++++++++++++++++++++++++++++++++++ lib/exceptions.py | 9 ++- web/htdocs/availability.py | 9 +-- web/htdocs/forms.py | 4 +- web/htdocs/html_mod_python.py | 7 ++- web/htdocs/htmllib.py | 36 +++++++----- web/htdocs/index.py | 4 +- web/htdocs/lib.py | 68 +++++++++-------------- web/htdocs/table.py | 2 +- web/htdocs/valuespec.py | 8 +-- web/htdocs/views.py | 4 +- web/htdocs/wato.py | 21 +++---- web/plugins/views/bi.py | 3 +- web/plugins/views/inventory.py | 4 +- web/plugins/views/mkeventd.py | 3 +- web/plugins/views/painters.py | 9 ++- web/plugins/visuals/inventory.py | 5 +- web/plugins/wato/check_parameters.py | 6 +- 18 files changed, 210 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ab09b3d983…

8 years

added compiled files.. .. .. ..

by Andreas Boesl

Module: check_mk Branch: master Commit: 3bca71ce18256ac4c5ded41fa06ea8c1cb268754 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bca71ce18256a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 9 09:52:02 2016 +0200 added compiled files.. .. .. .. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15356869 -> 15356869 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent.exe | Bin 1297920 -> 1297920 bytes agents/windows/check_mk_agent.msi | Bin 248320 -> 2891264 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13279233 -> 13279233 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297920 -> 1297920 bytes agents/windows/install_agent-64.exe | Bin 584444 -> 584441 bytes agents/windows/install_agent.exe | Bin 581134 -> 581128 bytes 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a9c7a68..1296a95 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2078 +2081 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e4f5a20..cb7539f 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 9299e8a..5bfc1e9 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 6800c6e..337f707 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a7b42a3..97de829 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 3f0c3fc..f53f6ac 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 1439a3c..e1709e5 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 93452df..ea3e09d 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 86e78fc..e61b1ab 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 61c2294..2e8443a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years

3799 agent_netapp: No longer requires the files NaServer/

by Andreas Boesl

NaElements. Reduced CPU usage by 2/3 Message-ID: <57d266b1.vOLGDdgnTjjDxuo+%ab(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: 66fe3bca45018a3515a1e0fb6f25689f46c151d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66fe3bca45018a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 9 09:33:49 2016 +0200 3799 agent_netapp: No longer requires the files NaServer/NaElements. Reduced CPU usage by 2/3 It now also uses persistent connections when querying the NetApp server. --- .werks/3799 | 9 + ChangeLog | 1 + agents/special/agent_netapp | 1294 +++++++++++++++++++++++++++---------------- 3 files changed, 825 insertions(+), 479 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66fe3bca45…

8 years

Removed Check_MK GUI specific things to html_mod_python

by Lars Michelsen

Module: check_mk Branch: master Commit: cc437176612088cc968d4fb4fdcd9e5e606ac49c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc437176612088… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 18:48:01 2016 +0200 Removed Check_MK GUI specific things to html_mod_python --- web/htdocs/html_mod_python.py | 54 +++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 59 ++++++++----------------------------------- 2 files changed, 65 insertions(+), 48 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index bc8a346..448babf 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -309,3 +309,57 @@ class html_mod_python(htmllib.html): if fn.endswith(".css"): plugin_stylesheets.add(fn) return plugin_stylesheets + + + def css_filename_for_browser(self, css): + if not defaults.omd_root: + return '%s.css' % css + + rel_path = "/share/check_mk/web/htdocs/" + css + ".css" + if os.path.exists(defaults.omd_root + rel_path) or \ + os.path.exists(defaults.omd_root + "/local" + rel_path): + return '%s-%s.css' % (css, defaults.check_mk_version) + + + # Make the browser load specified javascript files. We have some special handling here: + # a) files which can not be found shal not be loaded + # b) in OMD environments, add the Check_MK version to the version (prevents update problems) + # c) load the minified javascript when not in debug mode + def javascript_filename_for_browser(self, jsname): + if not defaults.omd_root: + return jsname + + filename_for_browser = None + rel_path = "/share/check_mk/web/htdocs/js" + if self.enable_debug: + min_parts = [ "", "_min" ] + else: + min_parts = [ "_min", "" ] + + for min_part in min_parts: + path_pattern = defaults.omd_root + "%s" + rel_path + "/" + jsname + min_part + ".js" + if os.path.exists(path_pattern % "") or os.path.exists(path_pattern % "/local"): + filename_for_browser = '%s%s-%s' % (jsname, min_part, defaults.check_mk_version) + break + + return filename_for_browser + + + def detect_icon_path(self, icon_name): + # Detect whether or not the icon is available as images/icon_*.png + # or images/icons/*.png. When an icon is available as internal icon, + # always use this one + is_internal = False + if defaults.omd_root: + rel_path = "share/check_mk/web/htdocs/images/icon_"+icon_name+".png" + if os.path.exists(defaults.omd_root+"/"+rel_path): + is_internal = True + elif os.path.exists(defaults.omd_root+"/local/"+rel_path): + is_internal = True + elif os.path.exists(defaults.web_dir+"/htdocs/images/icon_"+icon_name+".png"): + is_internal = True + + if is_internal: + return "images/icon_%s.png" % icon_name + else: + return "images/icons/%s.png" % icon_name diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a424e02..8fb1605 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -55,7 +55,8 @@ try: except ImportError: import json -from lib import * +from cmk.exceptions import MKGeneralException +from lib import MKUserError # Only parse variable adhering to the following regular expressions # TODO: Fix this regex. +-\ selects all from + to \, not +, - and \! @@ -833,24 +834,9 @@ class html(GUITester): if not self.mobile: self.write('</label>') + def detect_icon_path(self, icon_name): - # Detect whether or not the icon is available as images/icon_*.png - # or images/icons/*.png. When an icon is available as internal icon, - # always use this one - is_internal = False - if defaults.omd_root: - rel_path = "share/check_mk/web/htdocs/images/icon_"+icon_name+".png" - if os.path.exists(defaults.omd_root+"/"+rel_path): - is_internal = True - elif os.path.exists(defaults.omd_root+"/local/"+rel_path): - is_internal = True - elif os.path.exists(defaults.web_dir+"/htdocs/images/icon_"+icon_name+".png"): - is_internal = True - - if is_internal: - return "images/icon_%s.png" % icon_name - else: - return "images/icons/%s.png" % icon_name + raise NotImplementedError() def icon(self, help, icon, **kwargs): @@ -1391,15 +1377,9 @@ class html(GUITester): # Load all specified style sheets and all user style sheets in htdocs/css for css in self._default_stylesheets + stylesheets + [ 'ie' ]: - if defaults.omd_root: - rel_path = "/share/check_mk/web/htdocs/" + css + ".css" - if os.path.exists(defaults.omd_root + rel_path) or \ - os.path.exists(defaults.omd_root + "/local" + rel_path): - fname = '%s-%s.css' % (css, defaults.check_mk_version) - else: - continue - else: - fname = '%s.css' % css + fname = self.css_filename_for_browser(css) + if fname == None: + continue if css == 'ie': self.write('<!--[if IE]>\n') @@ -1430,33 +1410,16 @@ class html(GUITester): self.write('<link rel="shortcut icon" href="images/favicon.ico" type="image/ico">\n') - # TODO: Rename. Also rename in CMA! def add_custom_style_sheet(self): raise NotImplementedError() - # Make the browser load specified javascript files. We have some special handling here: - # a) files which can not be found shal not be loaded - # b) in OMD environments, add the Check_MK version to the version (prevents update problems) - # c) load the minified javascript when not in debug mode - def javascript_filename_for_browser(self, jsname): - if not defaults.omd_root: - return jsname - - filename_for_browser = None - rel_path = "/share/check_mk/web/htdocs/js" - if self.enable_debug: - min_parts = [ "", "_min" ] - else: - min_parts = [ "_min", "" ] + def css_filename_for_browser(self, css): + raise NotImplementedError() - for min_part in min_parts: - path_pattern = defaults.omd_root + "%s" + rel_path + "/" + jsname + min_part + ".js" - if os.path.exists(path_pattern % "") or os.path.exists(path_pattern % "/local"): - filename_for_browser = '%s%s-%s' % (jsname, min_part, defaults.check_mk_version) - break - return filename_for_browser + def javascript_filename_for_browser(self, jsname): + raise NotImplementedError() def html_foot(self):

8 years

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016