Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

Fixed shipped configuration after sample config removal

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a5f788ace90ece85c2179cdb14ca32058de4c59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a5f788ace90ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 09:43:56 2016 +0100 Fixed shipped configuration after sample config removal Change-Id: I0287d6992f04a6196dd3319f1dfc0168c34f9dc6 --- web/plugins/config/builtin.py | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c9b82ae..b5e9a9b 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -37,7 +37,7 @@ debug = False screenshotmode = False profile = False users = [] -admin_users = [] +admin_users = ["omdadmin"] guest_users = [] default_user_role = "user" save_user_access_times = False @@ -114,7 +114,7 @@ view_option_refreshes = [ 30, 60, 90, 0 ] view_option_columns = [ 1, 2, 3, 4, 5, 6, 8, 10, 12 ] # MISC -doculink_urlformat = "http://mathias-kettner.de/checkmk_%s.html"; +doculink_urlformat = "http://mathias-kettner.com/checkmk_%s.html"; view_action_defaults = { "ack_sticky" : True, @@ -132,6 +132,36 @@ view_action_defaults = { custom_links = {} +# Links for everyone +custom_links['guest'] = [ + ( "Classical Nagios GUI", "../nagios/", "icon_home.png" ), + ( "Addons", True, [ + ( "NagVis", "../nagvis/", "icon_nagvis.png" ), + ]), +] + +# The members of the role 'user' get the same links as the guests +# but some in addition +custom_links['user'] = custom_links['guest'] + [ + ( "Open Source Components", False, [ + ( "Check_MK", "http://mathias-kettner.com/check_mk.html", None, "_blank"), + ( "Nagios", "http://www.nagios.org/", None, "_blank"), + ( "PNP4Nagios", "http://pnp4nagios.org/", None, "_blank"), + ( "NagVis", "http://nagvis.org/", None, "_blank"), + ( "RRDTool", "http://oss.oetiker.ch/rrdtool/", None, "_blank"), + ]) +] + +# The admins yet get further links +custom_links['admin'] = custom_links['user'] + [ + ( "Support", False, [ + ( "Mathias Kettner", "http://mathias-kettner.com/" ), + ( "Check_MK Mailinglists", "http://mathias-kettner.com/check_mk_lists.html" ), + ( "Check_MK Exchange", "http://exchange.check-mk.org/", None, "_blank" ), + ( "Monitoring Portal (German)", "http://monitoring-portal.org", None, "_blank"), + ]) +] + # __ __ _ # \ \ / /_ _ _ __(_) ___ _ _ ___ # \ \ / / _` | '__| |/ _ \| | | / __|

7 years, 9 months

Print info about top10 page sizes

by Lars Michelsen

Module: check_mk Branch: master Commit: 537e4779b88c36767b0f755ee0ef03f307be950c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=537e4779b88c36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 20:27:20 2016 +0100 Print info about top10 page sizes Change-Id: I0ee7015598399018475e0566830a11322f3a3623 --- tests/crawl-stats | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tests/crawl-stats b/tests/crawl-stats index 1067144..dcb7824 100755 --- a/tests/crawl-stats +++ b/tests/crawl-stats @@ -11,11 +11,20 @@ def print_url(title, entry): print "Duration: %0.2f sec (Avg. %0.2f sec of %d tries)" % \ (entry["last_duration"], entry["avg_duration"], entry["num_visited"]) + print "Size: %0.2f KBytes (Avg. %0.2f KBytes of %d tries)" % \ + (entry["last_content_size"]/1024.0, + entry["avg_content_size"]/1024.0, + entry["num_visited"]) print "Total:", stats["_TOTAL_"] -slowest = None +print "" +print "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +print "+ SLOWEST PAGES +" +print "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +print "" + for num, (key, val) in enumerate(sorted(stats.items(), key=lambda x: "avg_duration" in x[1] \ and x[1]["avg_duration"] @@ -24,3 +33,18 @@ for num, (key, val) in enumerate(sorted(stats.items(), continue print_url("%02d Slowest" % num, val) + +print "" +print "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +print "+ LARGEST PAGES +" +print "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +print "" + +for num, (key, val) in enumerate(sorted(stats.items(), + key=lambda x: "avg_content_size" in x[1] \ + and x[1]["avg_content_size"] + or 0, reverse=True)[:10]): + if key == "_TOTAL_": + continue + + print_url("%02d Largest" % num, val)

7 years, 9 months

4143 FIX Fixed possible log spam "MKAuthException: Invalid credentials" in web.log

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c9ecbff3dc93627e449b0731aef1832db2c9d6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c9ecbff3dc936… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 20:34:07 2016 +0100 4143 FIX Fixed possible log spam "MKAuthException: Invalid credentials" in web.log When having multiple independent sites on one system, a log flood (one entry for each request) may happen when having cookies from both sites to var/log/web.log. Change-Id: Ie6863b2f527952421b2db5fc767638ca5e3106ee --- .werks/4143 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/login.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/4143 b/.werks/4143 new file mode 100644 index 0000000..82b0d8d --- /dev/null +++ b/.werks/4143 @@ -0,0 +1,10 @@ +Title: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482175956 +Class: fix + +When having multiple independent sites on one system, a log flood (one entry +for each request) may happen when having cookies from both sites to var/log/web.log. diff --git a/ChangeLog b/ChangeLog index 44bf361..fc25104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... + * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 70e86bd..3ba592c 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -313,6 +313,11 @@ def check_auth_by_cookie(): try: set_auth_type("cookie") return check_auth_cookie(cookie_name) + except MKAuthException: + # Suppress cookie validation errors from other sites cookies + if config.debug: + logger(LOG_ERR, 'Exception while checking cookie %s: %s' % + (cookie_name, traceback.format_exc())) except Exception, e: logger(LOG_ERR, 'Exception while checking cookie %s: %s' % (cookie_name, traceback.format_exc()))

7 years, 9 months

Fixed login page redirect detection in GUI crawl test

by Lars Michelsen

Module: check_mk Branch: master Commit: 18104dd0cc24f89e9ae226c6e540161fe51e07b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18104dd0cc24f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 08:35:29 2016 +0100 Fixed login page redirect detection in GUI crawl test Change-Id: If738785b9c85a4d14edda922a9a06669c6f0c24e --- tests/testlib/__init__.py | 22 +++++++-- tests/web/test_crawl.py | 119 +++++++++++++++++++++++++++++++++------------- tests/web/test_login.py | 4 +- 3 files changed, 106 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18104dd0cc…

7 years, 9 months

Unbreak configuration files.

by Sven Panne

Module: check_mk Branch: master Commit: 1e246379fa59f294e0fcad2680d79e0a54e6de66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e246379fa59f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 20 08:00:12 2016 +0100 Unbreak configuration files. Change-Id: I277202d086847aea55f56d1d81400e7a1a2fb4e3 --- scripts/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 51dc654..61fa0c6 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -804,9 +804,9 @@ do chgrp $wwwgroup $DESTDIR$confdir/conf.d/distributed_wato.mk && chmod 664 $DESTDIR$confdir/conf.d/distributed_wato.mk fi && - echo -e "# Main configuration file of Check_MK\nWe highly recommend to use WATO to configure Check_MK these days." \ + echo -e "# Main configuration file of Check_MK\n#We highly recommend to use WATO to configure Check_MK these days." \ > $DESTDIR$confdir/main.mk-$VERSION && - echo -e "# Main configuration file of the Check_MK GUI\nWe highly recommend to use WATO to configure Check_MK these days." \ + echo -e "# Main configuration file of the Check_MK GUI\n#We highly recommend to use WATO to configure Check_MK these days." \ > $DESTDIR$confdir/multisite.mk-$VERSION && if [ -e $DESTDIR$confdir/check_mk.cfg -a ! -e $DESTDIR$confdir/main.mk ] ; then mv -v $DESTDIR$confdir/check_mk.cfg $DESTDIR$confdir/main.mk

7 years, 9 months

Reduced load caused by GUI crawl tests; made test more reliable

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a528b3c0d25addcc138c75a1b735b348331080d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a528b3c0d25ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 20:13:48 2016 +0100 Reduced load caused by GUI crawl tests; made test more reliable Change-Id: I8d8367a3749df569150c714397ffcc25c28378fe --- tests/testlib/__init__.py | 45 +++++++++++++++++++-------------------------- tests/web/test_crawl.py | 28 ++++++++++------------------ 2 files changed, 29 insertions(+), 44 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 201934e..aef8123 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -434,6 +434,8 @@ class Site(object): class WebSession(requests.Session): def __init__(self): self.transids = [] + # Resources are + self.verified_resources = set() super(WebSession, self).__init__() @@ -541,50 +543,41 @@ class WebSession(requests.Session): def _check_html_page_resources(self, response): soup = BeautifulSoup(response.text, "lxml") - parsed_url = urlparse(response.url) - - base_url = parsed_url.path - if ".py" in base_url: - base_url = os.path.dirname(base_url) - # There might be other resources like iframe, audio, ... but we don't care about them - for img_url in self._find_resource_urls("img", "src", soup): - assert not img_url.startswith("/"), "%s starts with /" % img_url - req = self.get(base_url + "/" + img_url, proto=parsed_url.scheme, verify=False) - - mime_type = self._get_mime_type(req) - assert mime_type in [ "image/png" ] + self._check_resources(soup, response, "img", "src", [ "image/png"]) + self._check_resources(soup, response, "script", "src", [ "application/javascript"]) + self._check_resources(soup, response, "link", "href", [ "text/css"], filters=[("rel", "stylesheet")]) + self._check_resources(soup, response, "link", "href", [ "image/vnd.microsoft.icon"], filters=[("rel", "shortcut icon")]) - for script_url in self._find_resource_urls("script", "src", soup): - assert not script_url.startswith("/") - req = self.get(base_url + "/" + script_url, proto=parsed_url.scheme, verify=False) - mime_type = self._get_mime_type(req) - assert mime_type in [ "application/javascript" ] + def _check_resources(self, soup, response, tag, attr, allowed_mime_types, filters=None): + parsed_url = urlparse(response.url) - for css_url in self._find_resource_urls("link", "href", soup, filters=[("rel", "stylesheet")]): - assert not css_url.startswith("/") - req = self.get(base_url + "/" + css_url, proto=parsed_url.scheme, verify=False) + base_url = parsed_url.path + if ".py" in base_url: + base_url = os.path.dirname(base_url) - mime_type = self._get_mime_type(req) - assert mime_type in [ "text/css" ] + for url in self._find_resource_urls(tag, attr, soup, filters): + # Only check resources once per session + if url in self.verified_resources: + continue + self.verified_resources.add(url) - for url in self._find_resource_urls("link", "href", soup, filters=[("rel", "shortcut icon")]): assert not url.startswith("/") req = self.get(base_url + "/" + url, proto=parsed_url.scheme, verify=False) mime_type = self._get_mime_type(req) - assert mime_type in [ "image/vnd.microsoft.icon" ] + assert mime_type in allowed_mime_types - def _find_resource_urls(self, tag, attribute, soup, filters=[]): + def _find_resource_urls(self, tag, attribute, soup, filters=None): urls = [] for element in soup.findAll(tag): try: skip = False - for attr, val in filters: + for attr, val in filters or []: if element[attr] != val: skip = True break diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 7af4a68..5876d6a 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -61,9 +61,9 @@ class Worker(threading.Thread): except Exception, e: self.error(url, "Failed to visit: %s\n%s" % (e, traceback.format_exc())) - self.idle = True self.crawler.todo.task_done() except Queue.Empty: + self.idle = True time.sleep(0.5) @@ -82,7 +82,7 @@ class Worker(threading.Thread): started = time.time() try: - #print url.url_without_host() + #print "FETCH", url.url_without_host() response = self.crawler.client.get(url.url_without_host()) except AssertionError, e: if "This view can only be used in mobile mode" in "%s" % e: @@ -142,10 +142,9 @@ class Worker(threading.Thread): def check_response(self, url, response): soup = BeautifulSoup(response.text, "lxml") + # The referenced resources (images, stylesheets, javascript files) are checked by + # the generic web client handler. This only needs to reaslize the crawling. self.check_content(url, response, soup) - self.check_images(url, soup) - self.check_styles(url, soup) - self.check_scripts(url, soup) self.check_links(url, soup) self.check_frames(url, soup) self.check_iframes(url, soup) @@ -181,10 +180,6 @@ class Worker(threading.Thread): self.check_referenced(url, soup, "a", "href") - def check_images(self, url, soup): - self.check_referenced(url, soup, "img", "src") - - def check_referenced(self, referer_url, soup, tag, attr): elements = soup.find_all(tag) @@ -193,17 +188,10 @@ class Worker(threading.Thread): url = self.normalize_url(self.crawler.site.internal_url, orig_url) if url is not None and self.is_valid_url(url) \ - and url not in self.crawler.visited: + and url not in self.crawler.handled: #file("/tmp/todo", "a").write("%s (%s)\n" % (url, referer_url.url)) self.crawler.todo.put(Url(url, orig_url=orig_url, referer_url=referer_url.url)) - - - def check_styles(self, url, soup): - pass # TODO - - - def check_scripts(self, url, soup): - pass # TODO + self.crawler.handled.add(url) def is_valid_url(self, url): @@ -276,6 +264,9 @@ class TestCrawler(object): self.todo = SetQueue() self.started = time.time() self.visited = [] + # Contains all already seen and somehow handled URLs. Something like the + # summary of self.todo and self.handled but todo contains Url() objects. + self.handled = set() self.errors = [] self.site = site self.client = web @@ -284,6 +275,7 @@ class TestCrawler(object): self.load_stats() self.todo.put(Url(site.internal_url)) + self.handled.add(site.internal_url) self.crawl()

7 years, 9 months

3652 FIX Unbreak PDF exports

by Sven Panne

Module: check_mk Branch: master Commit: f93a3eef6c1df00b8a128ec4367542748d971da0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f93a3eef6c1df0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 19 16:27:12 2016 +0100 3652 FIX Unbreak PDF exports Previously most PDF exports rendered Python stacktraces instead of graphs, this has been fixed. Change-Id: Ib1a41ab65d2cd3c62a8973ca3125ad035f1a95bb --- .werks/3652 | 12 ++++++++++++ ChangeLog | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/3652 b/.werks/3652 new file mode 100644 index 0000000..f86159d --- /dev/null +++ b/.werks/3652 @@ -0,0 +1,12 @@ +Title: Unbreak PDF exports +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482161159 + +Previously most PDF exports rendered Python stacktraces instead of graphs, +this has been fixed. + diff --git a/ChangeLog b/ChangeLog index bc6ac3f..44bf361 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ Notifications: * 4197 FIX: Fix sending notification to global fallback email address + Reporting & Availability: + * 3652 FIX: Unbreak PDF exports... + Event Console: * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes!

7 years, 9 months

Fix bug from recent commit

by Mathias Kettner

Module: check_mk Branch: master Commit: fca39daba3068e6ef7279b6d0861599169a52f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fca39daba3068e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:45:19 2016 +0100 Fix bug from recent commit Change-Id: I6ba4ce59b7d97765cb1dbf577741f6e9a7bd23ee --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2106684..c18d043 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1186,7 +1186,7 @@ class EventServer: row += [ g_last_config_reload, - g_event_status.num_open_events, + g_event_status.num_existing_events, self._virtual_memory_size(), ]

7 years, 9 months

Fix wording in global EC settings: not "open" but "current"

by Mathias Kettner

events are limited Message-ID: <5857ed49.+d+F7LOul18Ijqaq%mk(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: 4a38c21659247aeb8e1a6b81c21ce2ec233a7136 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a38c21659247a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:23:00 2016 +0100 Fix wording in global EC settings: not "open" but "current" events are limited Change-Id: I41a591fbf6e5e8bbc1b1a4ec259c28c009777e99 --- web/plugins/wato/mkeventd.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index b3b95b6..b111de1 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2473,19 +2473,19 @@ if mkeventd_enabled: register_configvar(groups["ec"], "event_limit", Dictionary( - title = _("Limit amount of open events"), + title = _("Limit amount of current events"), help = _("This option helps you to protect the Event Console from resoure " - "problems which may occur in case of too many open events at the " + "problems which may occur in case of too many current events at the " "same time."), elements = [ ("by_host", Dictionary( title = _("Host limit"), - help = _("You can limit the number of open events created by a single " + help = _("You can limit the number of current events created by a single " "host here. This is meant to " "prevent you from message storms created by one device.<br>" "Once the limit is reached, the Event Console will block " "all future incoming messages sent by this host until the " - "number of open " + "number of current " "events has been reduced to be below this limit. In the " "moment the limit is reached, the Event Console will notify " "the configured contacts of the host."), @@ -2494,7 +2494,7 @@ if mkeventd_enabled: title = _("Limit"), minvalue = 1, default_value = 1000, - unit = _("open events"), + unit = _("current events"), )), ("action", vs_ec_event_limit_actions("notify contacts of the host")), ], @@ -2502,11 +2502,11 @@ if mkeventd_enabled: )), ("by_rule", Dictionary( title = _("Rule limit"), - help = _("You can limit the number of open events created by a single " + help = _("You can limit the number of current events created by a single " "rule here. This is meant to " "prevent you from too generous rules creating a lot of events.<br>" "Once the limit is reached, the Event Console will stop the rule " - "creating new open events until the number of open " + "creating new current events until the number of current " "events has been reduced to be below this limit. In the " "moment the limit is reached, the Event Console will notify " "the configured contacts of the rule or create a notification " @@ -2516,19 +2516,19 @@ if mkeventd_enabled: title = _("Limit"), minvalue = 1, default_value = 1000, - unit = _("open events"), + unit = _("current events"), )), ("action", vs_ec_event_limit_actions("notify contacts in rule or fallback contacts")), ], optional_keys = [], )), ("overall", Dictionary( - title = _("Overall open events"), - help = _("To protect you against a continously growing list of open " + title = _("Overall current events"), + help = _("To protect you against a continously growing list of current " "events created by different hosts or rules, you can configure " - "this overall limit of open events. All currently open events " + "this overall limit of current events. All currently current events " "are counted and once the limit is reached, no further events " - "will be opened which means that new incoming messages will be " + "will be currented which means that new incoming messages will be " "dropped. In the moment the limit is reached, the Event Console " "will create a notification with empty contact information."), elements = [ @@ -2536,7 +2536,7 @@ if mkeventd_enabled: title = _("Limit"), minvalue = 1, default_value = 10000, - unit = _("open events"), + unit = _("current events"), )), ("action", vs_ec_event_limit_actions("notify all fallback contacts")), ],

7 years, 9 months

Fixed various problems related to our HTML class.

by Sven Panne

Module: check_mk Branch: master Commit: 974ee7c732125416fbe51adfb2ae999de479d651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=974ee7c7321254… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 19 15:16:54 2016 +0100 Fixed various problems related to our HTML class. Change-Id: If56586756f95090b54713e4b098ebb16b2508cda --- web/htdocs/htmllib.py | 34 ++++++++++++++++++++++++---------- web/htdocs/views.py | 2 +- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4bb3483..3322ded 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -252,26 +252,40 @@ class HTML(object): return self._ensure_unicode(item) in self.value - def count(self, item): - return self.value.count(self._ensure_unicode(item)) + def count(self, sub, *args): + return self.value.count(self._ensure_unicode(sub), *args) - def index(self, item): - return self.value.index(self._ensure_unicode(item)) + def index(self, sub, *args): + return self.value.index(self._ensure_unicode(sub), *args) - def lstrip(self, stripstr): - return HTML(self.value.lstrip(self._ensure_unicode(stripstr))) + def lstrip(self, *args): + args = tuple(map(self._ensure_unicode, args[:1])) + args[1:] + return HTML(self.value.lstrip(*args)) - def rstrip(self, stripstr): - return HTML(self.value.rstrip(self._ensure_unicode(stripstr))) + def rstrip(self, *args): + args = tuple(map(self._ensure_unicode, args[:1])) + args[1:] + return HTML(self.value.rstrip(*args)) - def strip(self, stripstr): - return HTML(self.value.strip(self._ensure_unicode(stripstr))) + def strip(self, *args): + args = tuple(map(self._ensure_unicode, args[:1])) + args[1:] + return HTML(self.value.strip(*args)) + def lower(self): + return HTML(self.value.lower()) + + + def upper(self): + return HTML(self.value.upper()) + + + def startswith(self, prefix, *args): + return self.value.startswith(self._ensure_unicode(prefix), *args) + __builtin__.HTML = HTML diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b25de82..dc69805 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -782,7 +782,7 @@ class Cell(object): # images, but all that we need for showing simple icons. # Current limitation: *one* image if txt.lower().startswith("<img"): - img_filename = re.sub('.*src=["\']([^\'"]*)["\'].*', "\\1", txt) + img_filename = re.sub('.*src=["\']([^\'"]*)["\'].*', "\\1", str(txt)) img_path = find_htdocs_image_path(img_filename) if img_path: txt = ("icon", img_path)

7 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016