Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Revert "Refactoring htmllib: changed mechanics of javascript_file."

by Lars Michelsen

Module: check_mk Branch: master Commit: 0faa15c2158453d9183f6ac89e1d2ea3c2e76e1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0faa15c2158453… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 17:25:55 2017 +0100 Revert "Refactoring htmllib: changed mechanics of javascript_file." It broke the javascript_file tests. This reverts commit f89337c03d95c287ce6251247c6fabd0a9235b1c. Change-Id: I0bd2b18c5d8d55d34b217ccf073510494760e133 --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 6 +++--- web/htdocs/valuespec.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 49eff00..abd5ab8 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -329,7 +329,7 @@ class html_mod_python(htmllib.html): for min_part in min_parts: path_pattern = cmk.paths.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 = 'js/%s%s-%s.js' % (jsname, min_part, cmk.__version__) + filename_for_browser = '%s%s-%s' % (jsname, min_part, cmk.__version__) break return filename_for_browser diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 61713e7..cf7f980 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -640,9 +640,9 @@ class HTMLGenerator(Escaper, OutputFunnel): return self.write(self.render_javascript(code)) - def javascript_file(self, src): - """ <script type="text/javascript" src="%(name)"/>\n """ - return self.write(self._render_content_tag('script', '', type_="text/javascript", src=src)) + def javascript_file(self, filename): + """ <script type="text/javascript" src="js/%(name)s.js"/>\n """ + return self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % filename)) def render_img(self, src, **attrs): diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f6d5ee8..e9410bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4086,7 +4086,7 @@ class Color(ValueSpec): if not value: value = "#FFFFFF" - html.javascript_file("js/colorpicker.js") + html.javascript_file("colorpicker") # Holds the actual value for form submission html.hidden_field(varprefix + "_value", value or '', varprefix + "_value", add_var = True)

7 years, 8 months

Refactoring htmllib: changed mechanics of javascript_file.

by Roland Halbig

Module: check_mk Branch: master Commit: f89337c03d95c287ce6251247c6fabd0a9235b1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f89337c03d95c2… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 14:48:30 2017 +0100 Refactoring htmllib: changed mechanics of javascript_file. Change-Id: I436b7763169f114d343ea6bc271c8dfcdae39901 --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 6 +++--- web/htdocs/valuespec.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index abd5ab8..49eff00 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -329,7 +329,7 @@ class html_mod_python(htmllib.html): for min_part in min_parts: path_pattern = cmk.paths.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, cmk.__version__) + filename_for_browser = 'js/%s%s-%s.js' % (jsname, min_part, cmk.__version__) break return filename_for_browser diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cf7f980..61713e7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -640,9 +640,9 @@ class HTMLGenerator(Escaper, OutputFunnel): return self.write(self.render_javascript(code)) - def javascript_file(self, filename): - """ <script type="text/javascript" src="js/%(name)s.js"/>\n """ - return self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % filename)) + def javascript_file(self, src): + """ <script type="text/javascript" src="%(name)"/>\n """ + return self.write(self._render_content_tag('script', '', type_="text/javascript", src=src)) def render_img(self, src, **attrs): diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e9410bf..f6d5ee8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4086,7 +4086,7 @@ class Color(ValueSpec): if not value: value = "#FFFFFF" - html.javascript_file("colorpicker") + html.javascript_file("js/colorpicker.js") # Holds the actual value for form submission html.hidden_field(varprefix + "_value", value or '', varprefix + "_value", add_var = True)

7 years, 8 months

Added missing file to build.

by Sven Panne

Module: check_mk Branch: master Commit: b334b620359d91e0874d530163547e943b62d0da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b334b620359d91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 10 16:52:16 2017 +0100 Added missing file to build. Change-Id: I3a6d7c1b0ee4460dd473602a4a24fda186fa96fc --- livestatus/src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 80d0d72..74dd51c 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -85,6 +85,7 @@ livestatus_so_SOURCES = \ MetricsColumn.cc \ NegatingFilter.cc \ NullColumn.cc \ + OffsetBoolColumn.cc \ OffsetDoubleColumn.cc \ OffsetIntColumn.cc \ OffsetPerfdataColumn.cc \

7 years, 8 months

Refactoring table.py: Moved render_headers out of end().

by Roland Halbig

Module: check_mk Branch: master Commit: 3441a01515d6663e0009010e084db609d5e8cd75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3441a01515d666… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 15:18:58 2017 +0100 Refactoring table.py: Moved render_headers out of end(). Change-Id: I743e6f90e6d86bfc15c698d4569dd7b0e9741402 --- web/htdocs/table.py | 128 ++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 5de76aa..b70c25f 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -175,6 +175,7 @@ def end(): # Controls whether or not actions are available for a table search_term = None + actions_visible = False actions_enabled = (table["searchable"] or table["sortable"]) if actions_enabled: @@ -229,67 +230,9 @@ def end(): html.write(" %s" % table["css"]) html.write('">\n') - def render_headers(): - if table["omit_headers"]: - return - - html.write(" <tr>") - first_col = True - for nr, (header, css, help, sortable) in enumerate(table["headers"]): - text = header - - if help: - header = '<span title="%s">%s</span>' % (html.attrencode(help), header) - - if css: - css_def = " class=\"header_%s\"" % css - css_class = " header_%s" % css - else: - css_def = "" - css_class = "" - - if not table["sortable"] or not sortable: - html.write(" <th%s>" % css_def) - else: - reverse = 0 - sort = html.var('_%s_sort' % table_id) - if sort: - sort_col, sort_reverse = map(int, sort.split(',', 1)) - if sort_col == nr: - reverse = sort_reverse == 0 and 1 or 0 - html.write(" <th class=\"sort%s\" title=\"%s\" onclick=\"location.href='%s'\">" % - (css_class, _('Sort by %s') % text, html.makeactionuri([('_%s_sort' % table_id, '%d,%d' % (nr, reverse))]))) - - # Add the table action link - if first_col: - first_col = False - if actions_enabled: - if not header: - header = " " # Fixes layout problem with white triangle - if actions_visible: - state = '0' - help = _('Hide table actions') - img = 'table_actions_on' - else: - state = '1' - help = _('Display table actions') - img = 'table_actions_off' - html.write("<div class=\"toggle_actions\">") - html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), - help, img, cssclass = 'toggle_actions') - html.write("<span>%s</span>" % header) - html.write("</div>") - else: - html.write(header) - else: - html.write(header) - - html.write("</th>\n") - html.write(" </tr>\n") - # If we have no group headers then paint the headers now if table["rows"] and table["rows"][0][2] != "header": - render_headers() + _render_headers(table, actions_enabled, actions_visible) if actions_enabled and actions_visible: html.write('<tr class="data even0 actions"><td colspan=%d>' % num_cols) @@ -324,7 +267,7 @@ def end(): if nr < len(rows) - 1 and rows[nr+1][2] != "header": html.write(' <tr class="groupheader"><td colspan=%d><br>%s</td></tr>' % (num_cols, row)) odd = "even" - render_headers() + _render_headers(table, actions_enabled, actions_visible) continue odd = odd == "odd" and "even" or "odd" @@ -369,12 +312,9 @@ def _write_csv(table, csv_separator): if limit is not None: rows = rows[:limit] - def render_headers(): - html.write(csv_separator.join([html.strip_tags(header) or "" for (header, css, help, sortable) in headers]) + "\n") - # If we have no group headers then paint the headers now if not omit_headers and table["rows"] and table["rows"][0][2] != "header": - render_headers() + html.write(csv_separator.join([html.strip_tags(header) or "" for (header, css, help, sortable) in headers]) + "\n") odd = "even" for nr, (row, css, state, fixed) in enumerate(rows): @@ -382,6 +322,66 @@ def _write_csv(table, csv_separator): html.write("\n") +def _render_headers(table, actions_enabled, actions_visible): + if table["omit_headers"]: + return + + table_id = table['id'] + + html.write(" <tr>") + first_col = True + for nr, (header, css, help, sortable) in enumerate(table["headers"]): + text = header + + if help: + header = '<span title="%s">%s</span>' % (html.attrencode(help), header) + + if css: + css_def = " class=\"header_%s\"" % css + css_class = " header_%s" % css + else: + css_def = "" + css_class = "" + + if not table["sortable"] or not sortable: + html.write(" <th%s>" % css_def) + else: + reverse = 0 + sort = html.var('_%s_sort' % table_id) + if sort: + sort_col, sort_reverse = map(int, sort.split(',', 1)) + if sort_col == nr: + reverse = sort_reverse == 0 and 1 or 0 + html.write(" <th class=\"sort%s\" title=\"%s\" onclick=\"location.href='%s'\">" % + (css_class, _('Sort by %s') % text, html.makeactionuri([('_%s_sort' % table_id, '%d,%d' % (nr, reverse))]))) + + # Add the table action link + if first_col: + first_col = False + if actions_enabled: + if not header: + header = " " # Fixes layout problem with white triangle + if actions_visible: + state = '0' + help = _('Hide table actions') + img = 'table_actions_on' + else: + state = '1' + help = _('Display table actions') + img = 'table_actions_off' + html.write("<div class=\"toggle_actions\">") + html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), + help, img, cssclass = 'toggle_actions') + html.write("<span>%s</span>" % header) + html.write("</div>") + else: + html.write(header) + else: + html.write(header) + + html.write("</th>\n") + html.write(" </tr>\n") + def _filter_rows(rows, search_term): filtered_rows = []

7 years, 8 months

Flush before/after os.system.

by Sven Panne

Module: check_mk Branch: master Commit: e1fe579da691a3319d930c0ddd78253e2fa46dca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1fe579da691a3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 10 16:08:32 2017 +0100 Flush before/after os.system. Change-Id: I7b44bf9457f802e5a99b78defb1ccbaf3ef1b9d1 --- tests/testlib/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 58a4258..9e6345f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -11,6 +11,7 @@ import requests import socket import pipes import subprocess +import sys from urlparse import urlparse from bs4 import BeautifulSoup @@ -49,6 +50,7 @@ def var_dir(): def omd(cmd): cmdline = " ".join(["sudo", "/usr/bin/omd"] + cmd) print "Executing: %s" % cmdline + sys.stdout.flush() return os.system(cmdline) >> 8 @@ -140,6 +142,7 @@ class CMKVersion(object): cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path print(cmd) + sys.stdout.flush() if os.system(cmd) >> 8 != 0: raise Exception("Failed to install package: %s" % temp_package_path) @@ -277,10 +280,12 @@ class Site(object): for path in paths: if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"..." % path) + sys.stdout.flush() assert os.system("cd \"%s\" ; " "sudo PATH=$PATH ONLY_COPY=1 SITE=%s bash -x .f12" % (path, self.id)) >> 8 == 0 print("Executing .f12 in \"%s\" DONE" % path) + sys.stdout.flush() def rm_if_not_reusing(self):

7 years, 8 months

Changed picked code to new functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 39376e123676b067103fe0b5365f71d96324bf65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39376e123676b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 15:52:22 2017 +0100 Changed picked code to new functions Change-Id: Id9485cf5b1f6051c542e899b7eb104df295b63fb --- web/htdocs/watolib.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c1f31bb..5201592 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6849,8 +6849,7 @@ def read_only_message(): elif type(config.wato_read_only['enabled']) == tuple: end_time = config.wato_read_only['enabled'][1] - text += _("The read only mode is enabled until %s %s. ") % \ - (fmt_date(end_time), fmt_time(end_time)) + text += _("The read only mode is enabled until %s. ") % render.date_and_time(end_time) if may_override_read_only_mode(): text += _("But you are allowed to make changes anyway. ")

7 years, 8 months

Fixed issue in recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 351f1aeb8a62007e918a2a2edf880c5dd31d4f13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=351f1aeb8a6200… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 15:43:11 2017 +0100 Fixed issue in recent commit Change-Id: I36d071a947a3179569bab085bc5b2535c2875b68 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aa3d58d..6f7d75f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -269,7 +269,7 @@ def page_handler(): html.context_button(buttontext, folder_preserving_link([("mode", target)])) html.end_context_buttons() - if not html.is_transaction() or may_override_read_only_mode(): + if not html.is_transaction() or (is_read_only_mode_enabled() and may_override_read_only_mode()): show_read_only_warning() # Show outcome of action

7 years, 8 months

More output during integration tests.

by Sven Panne

Module: check_mk Branch: master Commit: 9a5b5897014007ff2af516fe28c09dc7581a9fba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a5b5897014007… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 10 15:08:09 2017 +0100 More output during integration tests. Change-Id: I04580593049151095c56eb62e0569c6e7527a959 --- tests/testlib/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 17ce733..58a4258 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -276,10 +276,11 @@ class Site(object): for path in paths: if os.path.exists("%s/.f12" % path): - print("Executing .f12 in \"%s\"" % path) + print("Executing .f12 in \"%s\"..." % path) assert os.system("cd \"%s\" ; " - "sudo PATH=$PATH ONLY_COPY=1 SITE=%s bash .f12" % + "sudo PATH=$PATH ONLY_COPY=1 SITE=%s bash -x .f12" % (path, self.id)) >> 8 == 0 + print("Executing .f12 in \"%s\" DONE" % path) def rm_if_not_reusing(self):

7 years, 8 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ca1b54a0b6c9edcca6ec1467735d4677ba99a13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca1b54a0b6c9ed… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 10 15:22:53 2017 +0100 Fetched livestatus from downstream. Change-Id: I9856919b0bc3c198929779fd121451dbdeb7b063 --- livestatus/src/Query.cc | 12 +++++++++- livestatus/src/Query.h | 2 +- livestatus/src/Renderer.cc | 22 ++++++++--------- livestatus/src/Renderer.h | 6 ++--- livestatus/src/RendererBrokenCSV.cc | 2 +- livestatus/src/RendererBrokenCSV.h | 2 +- livestatus/src/RendererCSV.cc | 2 +- livestatus/src/RendererCSV.h | 2 +- livestatus/src/RendererJSON.cc | 2 +- livestatus/src/RendererJSON.h | 2 +- livestatus/src/RendererPython.cc | 2 +- livestatus/src/RendererPython.h | 2 +- livestatus/src/RendererPython3.cc | 2 +- livestatus/src/RendererPython3.h | 2 +- livestatus/src/Store.cc | 47 ++++++++++++++----------------------- livestatus/src/Store.h | 6 ++--- livestatus/src/module.cc | 2 +- 17 files changed, 58 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca1b54a0b6…

7 years, 8 months

Removd werk for deprecated check

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a73531457f0a714bfb2a4e949064a7218436cdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a73531457f0a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 15:15:12 2017 +0100 Removd werk for deprecated check Change-Id: Ifc86ba2aff02f85d3a35422aa33b74755829d9ef --- .werks/4233 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.werks/4233 b/.werks/4233 deleted file mode 100644 index 85318e0..0000000 --- a/.werks/4233 +++ /dev/null @@ -1,9 +0,0 @@ -Title: cisco_temp_sensor: Fixed possible wrong calculated thresholds -Level: 1 -Component: checks -Compatible: compat -Version: 1.4.0i4 -Date: 1484055595 -Class: fix - -

7 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017