Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Replaced some more images with simple CSS definitions

by Lars Michelsen

Module: check_mk Branch: master Commit: bb0021f6859107cbd535fa3ad4f120539416e63c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb0021f6859107… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 11:11:32 2016 +0200 Replaced some more images with simple CSS definitions --- web/htdocs/images/form_background.png | Bin 87 -> 0 bytes web/htdocs/images/nform_background.png | Bin 105 -> 0 bytes web/htdocs/images/white_10percent.png | Bin 83 -> 0 bytes web/htdocs/images/white_20percent.png | Bin 83 -> 0 bytes web/htdocs/images/white_40percent.png | Bin 83 -> 0 bytes web/htdocs/images/white_70percent.png | Bin 83 -> 0 bytes web/htdocs/images/white_80percent.png | Bin 83 -> 0 bytes web/htdocs/images/white_90percent.png | Bin 83 -> 0 bytes web/htdocs/pages.css | 25 +++++++------------------ web/htdocs/views.css | 6 ++---- web/htdocs/wato.css | 12 ++++-------- 11 files changed, 13 insertions(+), 30 deletions(-) diff --git a/web/htdocs/images/form_background.png b/web/htdocs/images/form_background.png deleted file mode 100644 index 14da800..0000000 Binary files a/web/htdocs/images/form_background.png and /dev/null differ diff --git a/web/htdocs/images/nform_background.png b/web/htdocs/images/nform_background.png deleted file mode 100644 index 734be88..0000000 Binary files a/web/htdocs/images/nform_background.png and /dev/null differ diff --git a/web/htdocs/images/white_10percent.png b/web/htdocs/images/white_10percent.png deleted file mode 100644 index 94e0c90..0000000 Binary files a/web/htdocs/images/white_10percent.png and /dev/null differ diff --git a/web/htdocs/images/white_20percent.png b/web/htdocs/images/white_20percent.png deleted file mode 100644 index 3b7f8a8..0000000 Binary files a/web/htdocs/images/white_20percent.png and /dev/null differ diff --git a/web/htdocs/images/white_40percent.png b/web/htdocs/images/white_40percent.png deleted file mode 100644 index 1de5ae5..0000000 Binary files a/web/htdocs/images/white_40percent.png and /dev/null differ diff --git a/web/htdocs/images/white_70percent.png b/web/htdocs/images/white_70percent.png deleted file mode 100644 index d591905..0000000 Binary files a/web/htdocs/images/white_70percent.png and /dev/null differ diff --git a/web/htdocs/images/white_80percent.png b/web/htdocs/images/white_80percent.png deleted file mode 100644 index 2f70a85..0000000 Binary files a/web/htdocs/images/white_80percent.png and /dev/null differ diff --git a/web/htdocs/images/white_90percent.png b/web/htdocs/images/white_90percent.png deleted file mode 100644 index b5f972e..0000000 Binary files a/web/htdocs/images/white_90percent.png and /dev/null differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f00f45c..2e2ef5f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -677,9 +677,10 @@ h2.formcaption { margin-bottom: 0px; } +/* TODO: lm: Is this table.form used anywhere? If not, remove it! */ + table.form { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); border-collapse: collapse; empty-cells: show; border-spacing: 0px; @@ -696,16 +697,9 @@ table.form.nomargin { margin: 0; border-bottom-style: none; } -/* table.form.nomargin td.legend, -table.form.nomargin td.content, -table.form.nomargin td.checkbox, -table.form.nomargin td.buttons { - border-top-style: none; -}*/ table.form.nomargin td.title { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); } table.form > tbody > tr > td { @@ -743,21 +737,18 @@ table.form td.legend.border { /* border-right-style: solid; */ } table.form td.hilite { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); margin: 10px; } table.form td.lgend.button { text-align: right; -/* border-right: 1px solid #fff; */ } td.content hr { height: 1px; border-style: none; - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); } td.legend { @@ -803,7 +794,6 @@ span.checkbox { /* Next-Generation forms */ table.nform { border-spacing: 0px; - /* border-collapse: collapse; */ margin: 0; padding: 0; empty-cells: show; @@ -812,8 +802,7 @@ table.nform { border-radius: 5px; box-shadow: 0px 0px 2px #000; margin-bottom: 10px; - background-image: url("images/nform_background.png"); - background-repeat: repeat; + background-color: rgba(160, 181, 190, 0.6); border-color: #86A9B8 #22404D #22414D #86A9B8; border-width: 1px; border-style: solid; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 26db065..df95a01 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -62,8 +62,7 @@ div.floatfilter { border-style: solid; border-color: #acc #22404d #22414d #8ab; box-shadow: 0.5px 0.5px 1px #444; - background-image: url("images/nform_background.png"); - background-repeat: repeat; + background-color: rgba(160, 181, 190, 0.6); border-radius: 5px; color: black; } @@ -90,8 +89,7 @@ div.floatfilter .legend { margin-bottom: 1px; width: 300px; height: 17px; - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); padding: 3px 5px 0px 5px; border-radius: 5px 5px 0px 0px; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 6799f99..ea3bfd5 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -509,8 +509,7 @@ table.validationerror img { width: 500px; height: 140px; border: 1px solid white; - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.3); margin-top: 10px; border-radius: 4px; position: relative; @@ -926,8 +925,7 @@ div.varname { '-------------------------------------------------------------------------*/ .wato table.progress { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.3); width: 50%; border: 1px solid #000; color: black; @@ -940,8 +938,7 @@ div.varname { /* Log window */ .wato table.progress td.log > div { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.3); border: 1px solid #fff; padding: 5px; height: 250px; @@ -1034,8 +1031,7 @@ div.varname { } .wato table.progress td.stats td { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.3); text-align: right; width: 4em; padding-right: 6px;

7 years, 10 months

User transids: Only saving up to 20 per user (should be way enough)

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ed6c8b84b58c29a117fa3d6293a9ddb5c1578c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ed6c8b84b58c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 13:15:33 2016 +0200 User transids: Only saving up to 20 per user (should be way enough) --- web/htdocs/htmllib.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 022b51a..6692f99 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1851,10 +1851,9 @@ class html(GUITester): return self.current_transid - # Marks a transaction ID as used. This is done by saving - # it in a user specific settings file "transids.mk". At this - # time we remove all entries from that list that are older - # than one week. + # All generated transids are saved per user. They are stored + # in the transids and per user only up to 20 transids are kept. + # Transaction ids older than one day are deleted. def store_new_transids(self): if self.new_transids: valid_ids = self.load_transids(lock = True) @@ -1864,7 +1863,7 @@ class html(GUITester): timestamp, rand = valid_id.split("/") if now - int(timestamp) < 86400: # one day cleared_ids.append(valid_id) - self.save_transids(cleared_ids + self.new_transids, unlock = True) + self.save_transids((cleared_ids + self.new_transids)[-20:], unlock = True) # Remove the used transid from the list of valid ones

7 years, 10 months

Moved some checks from git post receive hooks to tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e6f12b186f43a6af2feaab660005d86f5842c24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e6f12b186f43a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 14:07:23 2016 +0200 Moved some checks from git post receive hooks to tests --- tests/agents/windows/test_precompiled_age.py | 58 ++++++++++++++++++++++++++ tests/checkman/test_manpages.py | 49 ++++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py new file mode 100644 index 0000000..a5d19a3 --- /dev/null +++ b/tests/agents/windows/test_precompiled_age.py @@ -0,0 +1,58 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import glob +from testlib import cmk_path + +precompiled_files = [ + 'check_mk_agent.exe', + 'check_mk_agent-64.exe', + 'check_mk_agent.unversioned.exe', + 'check_mk_agent-64.unversioned.exe', + 'install_agent-64.exe', + 'install_agent.exe', + 'check_mk_agent.msi', +] + + +def test_precompiled_files_present(): + for filename in precompiled_files: + path = "%s/agents/windows/%s" % (cmk_path(), filename) + assert os.path.exists(path) + + +def test_precompiled_file_ages(): + newest_source_file, newest_source_time = find_newest_source_file() + + for filename in precompiled_files: + path = "%s/agents/windows/%s" % (cmk_path(), filename) + commit_time = last_commit_time(path) + assert newest_source_time > commit_time, \ + "%s is newer than source code file %s" % (path, newest_source_file) + + +def find_newest_source_file(): + newest_path, newest_commit_time = None, 0 + + for dirpath, dirnames, filenames in os.walk("%s/agents/windows" % cmk_path()): + for filename in filenames: + if not filename.endswith(".cc") and not filename.endswith(".h"): + continue + + path = "%s/%s" % (dirpath, filename) + commit_time = last_commit_time(path) + if commit_time > newest_commit_time: + newest_path, newest_commit_time = path, commit_time + + assert newest_path != None + assert newest_commit_time != 0 + + return newest_path, newest_commit_time + + +def last_commit_time(path): + lines = os.popen('unset GIT_DIR ; cd %s ; ' + 'git log -n 1 --date=raw -- %s' % (os.path.dirname(path), path)).readlines() + timestamp = int(lines[2].split()[1]) + return timestamp diff --git a/tests/checkman/test_manpages.py b/tests/checkman/test_manpages.py new file mode 100644 index 0000000..8522abc --- /dev/null +++ b/tests/checkman/test_manpages.py @@ -0,0 +1,49 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import sys +from testlib import cmk_path + + +def test_manpage_files(): + os.chdir(cmk_path()) + + checkend_manpages = 0 + for f in os.listdir("%s/checkman" % cmk_path()): + if f[0] == ".": + continue + _check_manpage(f) + checkend_manpages += 1 + + assert checkend_manpages > 0 + + +def _check_manpage(name): + found_catalog = False + for line in open("%s/checkman/%s" % (cmk_path(), name)): + if line.startswith("catalog: "): + found_catalog = True + + assert found_catalog, "Did not find \"catalog:\" header in manpage \"%s\"" % name + + +def test_manpage_list(): + result = os.popen("cd %s ; ./check_mk --list-man 2>&1" % cmk_path()).read() + assert result != "" + assert not "ERROR" in result, "Manpage list broken \"./check_mk --list-man\": %s\"" % result + assert type(eval(result)) == dict + + +def test_missing_manpage(): + missing = [] + + checks = 0 + for line in os.popen('cd %s ; ./check_mk --list-checks' % cmk_path()).readlines(): + checks += 1 + line = line.strip() + check_name = line.split(" ", 1)[0] + assert '(no man page present)' not in line, "Manpage missing: %s" % check_name + + if checks == 0: + raise Exception("\"./check_mk --list-checks\" Did not output a checks")

7 years, 10 months

Removed more bad looking gif images (from host diag page)

by Lars Michelsen

Module: check_mk Branch: master Commit: a2d6191df9ea5bd2b03c78700edf33d47ba9aeae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d6191df9ea5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:33:10 2016 +0200 Removed more bad looking gif images (from host diag page) --- web/htdocs/images/icon_loading.gif | Bin 7696 -> 0 bytes web/htdocs/images/icon_passive.gif | Bin 612 -> 0 bytes web/htdocs/images/icon_pnp.gif | Bin 1098 -> 0 bytes web/htdocs/images/icon_retry.gif | Bin 1852 -> 0 bytes web/htdocs/images/icon_retry_disabled.gif | Bin 1800 -> 0 bytes web/htdocs/js/checkmk.js | 2 +- web/htdocs/js/wato.js | 7 +++++-- web/htdocs/wato.py | 4 ++-- web/plugins/views/painters.py | 2 -- 9 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/images/icon_loading.gif b/web/htdocs/images/icon_loading.gif deleted file mode 100644 index 5b30ae7..0000000 Binary files a/web/htdocs/images/icon_loading.gif and /dev/null differ diff --git a/web/htdocs/images/icon_passive.gif b/web/htdocs/images/icon_passive.gif deleted file mode 100644 index 8653ea3..0000000 Binary files a/web/htdocs/images/icon_passive.gif and /dev/null differ diff --git a/web/htdocs/images/icon_pnp.gif b/web/htdocs/images/icon_pnp.gif deleted file mode 100644 index 6476315..0000000 Binary files a/web/htdocs/images/icon_pnp.gif and /dev/null differ diff --git a/web/htdocs/images/icon_retry.gif b/web/htdocs/images/icon_retry.gif deleted file mode 100644 index db29279..0000000 Binary files a/web/htdocs/images/icon_retry.gif and /dev/null differ diff --git a/web/htdocs/images/icon_retry_disabled.gif b/web/htdocs/images/icon_retry_disabled.gif deleted file mode 100644 index eae1235..0000000 Binary files a/web/htdocs/images/icon_retry_disabled.gif and /dev/null differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7ae541f..b88ef15 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2687,7 +2687,7 @@ function toggle_popup(event, trigger_obj, ident, what, data, url_vars, menu_cont if (what) { popup_data = data; - menu.innerHTML = '<img src="images/icon_loading.gif" class=icon>'; + menu.innerHTML = '<img src="images/icon_reload.png" class="icon reloading">'; // populate the menu using a webservice, because the list of dashboards // is not known in the javascript code. But it might have been cached diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1e38291..91026db 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -739,6 +739,7 @@ function handle_host_diag_result(ident, response_text) { var img = document.getElementById(ident + '_img'); var log = document.getElementById(ident + '_log'); var retry = document.getElementById(ident + '_retry'); + remove_class(img, "reloading"); if (response_text[0] == "0") { img.src = "images/icon_success.png"; @@ -751,7 +752,7 @@ function handle_host_diag_result(ident, response_text) { log.innerHTML = response_text.substr(1).replace(/\n/g, "<br>\n"); - retry.src = "images/icon_retry.gif"; + retry.src = "images/icon_reload.png"; retry.style.display = 'inline'; } @@ -794,7 +795,9 @@ function start_host_diag_test(ident, hostname) { vars += '&snmp_retries=' + encodeURIComponent(document.getElementsByName('vs_rules_p_snmp_retries')[0].value); vars += '&datasource_program=' + encodeURIComponent(document.getElementsByName('vs_rules_p_datasource_program')[0].value); - img.src = "images/icon_loading.gif"; + img.src = "images/icon_reload.png"; + add_class(img, "reloading"); + log.innerHTML = "..."; get_url("wato_ajax_diag_host.py?host=" + encodeURIComponent(hostname) + "&_test=" + encodeURIComponent(ident) + vars, diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6a8676a..75601df 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2574,9 +2574,9 @@ def mode_diag_host(phase): html.write('<h3>%s</h3>' % title) html.write('<table class="data test"><tr class="data odd0">') html.write('<td class="icons"><div>') - html.write('<img class="icon" id="%s_img" src="">' % ident) + html.write('<img class="icon" id="%s_img" src="images/icon_reload.png">' % ident) html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\');">' - '<img class="icon retry" id="%s_retry" src="images/icon_retry_disabled.gif" title="%s"></a>' % + '<img class="icon retry" id="%s_retry" src="images/icon_reload.png" title="%s"></a>' % (ident, hostname, ident, _('Retry this test'))) html.write('</div></td>') html.write('<td><div class="log" id="%s_log"></div>' % ident) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index a2f294e..62dfe33 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -312,8 +312,6 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): n = n[5:] if n.endswith(".png"): n = n[:-4] - elif n.endswith(".gif"): - n = n[:-4] icons.append((sort_index, n.encode('utf-8'), None, None)) continue

7 years, 10 months

Cleaned up old reload icon rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 12dca5c9616698dcd930c9057089d04a0f190277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12dca5c9616698… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:01:00 2016 +0200 Cleaned up old reload icon rendering --- web/htdocs/actions.py | 100 ------------------------------ web/htdocs/images/icon_checkmk.gif | Bin 1368 -> 0 bytes web/htdocs/images/icon_checkmkg.gif | Bin 1315 -> 0 bytes web/htdocs/images/icon_reload_failed.gif | Bin 1869 -> 0 bytes web/htdocs/images/icon_reloading.gif | Bin 7696 -> 0 bytes web/htdocs/images/icon_reloading_cmk.gif | Bin 7397 -> 0 bytes web/htdocs/js/checkmk.js | 40 ++++++------ web/htdocs/pages.css | 16 +++++ web/htdocs/views.py | 80 ++++++++++++++++++++++++ web/htdocs/wato.py | 3 +- web/plugins/icons/builtin.py | 2 +- web/plugins/pages/shipped.py | 3 +- 12 files changed, 118 insertions(+), 126 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=12dca5c961…

7 years, 10 months

Standardized remaining icon_*.png images to 48x48 size

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fb894506097eb2363db29cf6bd7faae7bb7a3b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fb894506097eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:43:10 2016 +0200 Standardized remaining icon_*.png images to 48x48 size --- web/htdocs/images/icon_bulk_import.png | Bin 6360 -> 4419 bytes web/htdocs/images/icon_move.png | Bin 6524 -> 4656 bytes web/htdocs/images/icon_nagios.png | Bin 521 -> 1762 bytes web/htdocs/images/icon_nagvis.png | Bin 5751 -> 4044 bytes web/htdocs/images/icon_plugins_os.png | Bin 12990 -> 3338 bytes web/htdocs/images/icon_www.png | Bin 3532 -> 4557 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_bulk_import.png b/web/htdocs/images/icon_bulk_import.png index 42cf6bd..c838773 100644 Binary files a/web/htdocs/images/icon_bulk_import.png and b/web/htdocs/images/icon_bulk_import.png differ diff --git a/web/htdocs/images/icon_move.png b/web/htdocs/images/icon_move.png index a6445dc..1eb1dca 100644 Binary files a/web/htdocs/images/icon_move.png and b/web/htdocs/images/icon_move.png differ diff --git a/web/htdocs/images/icon_nagios.png b/web/htdocs/images/icon_nagios.png index bbab3f3..3cc4a3d 100644 Binary files a/web/htdocs/images/icon_nagios.png and b/web/htdocs/images/icon_nagios.png differ diff --git a/web/htdocs/images/icon_nagvis.png b/web/htdocs/images/icon_nagvis.png index 79b0342..451ad7f 100644 Binary files a/web/htdocs/images/icon_nagvis.png and b/web/htdocs/images/icon_nagvis.png differ diff --git a/web/htdocs/images/icon_plugins_os.png b/web/htdocs/images/icon_plugins_os.png index 49ada21..814403c 100644 Binary files a/web/htdocs/images/icon_plugins_os.png and b/web/htdocs/images/icon_plugins_os.png differ diff --git a/web/htdocs/images/icon_www.png b/web/htdocs/images/icon_www.png index 2c24074..869ddc3 100644 Binary files a/web/htdocs/images/icon_www.png and b/web/htdocs/images/icon_www.png differ

7 years, 10 months

Removed more bad looking gif images (from custom link snapin)

by Lars Michelsen

Module: check_mk Branch: master Commit: ad4ee8977e0e9a8c373e2587b7e535097c649492 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad4ee8977e0e9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:33:10 2016 +0200 Removed more bad looking gif images (from custom link snapin) --- multisite.mk | 6 +++--- web/htdocs/images/icon_link.png | Bin 0 -> 4557 bytes web/htdocs/images/link_configuration.gif | Bin 969 -> 0 bytes web/htdocs/images/link_downtime.gif | Bin 985 -> 0 bytes web/htdocs/images/link_error.gif | Bin 961 -> 0 bytes web/htdocs/images/link_events.gif | Bin 986 -> 0 bytes web/htdocs/images/link_folder.gif | Bin 978 -> 0 bytes web/htdocs/images/link_folder_open.gif | Bin 978 -> 0 bytes web/htdocs/images/link_home.gif | Bin 1045 -> 0 bytes web/htdocs/images/link_hosts.gif | Bin 1058 -> 0 bytes web/htdocs/images/link_info.gif | Bin 1021 -> 0 bytes web/htdocs/images/link_link.gif | Bin 1038 -> 0 bytes web/htdocs/images/link_map.gif | Bin 1026 -> 0 bytes web/htdocs/images/link_monitoring.gif | Bin 1024 -> 0 bytes web/htdocs/images/link_notes.gif | Bin 1043 -> 0 bytes web/htdocs/images/link_notifications.gif | Bin 1014 -> 0 bytes web/htdocs/images/link_performance.gif | Bin 1025 -> 0 bytes web/htdocs/images/link_processes.gif | Bin 1000 -> 0 bytes web/htdocs/images/link_queue.gif | Bin 958 -> 0 bytes web/htdocs/images/link_reporting.gif | Bin 1064 -> 0 bytes web/htdocs/images/link_search.gif | Bin 1001 -> 0 bytes web/plugins/sidebar/shipped.py | 18 ++++++++++++++++-- 22 files changed, 19 insertions(+), 5 deletions(-) diff --git a/multisite.mk b/multisite.mk index 4219522..0501d43 100644 --- a/multisite.mk +++ b/multisite.mk @@ -38,10 +38,10 @@ nagvis_base_url = '/nagvis' # Links for everyone custom_links['guest'] = [ - ( "Classical Nagios GUI", "../nagios/", "link_home.gif" ), + ( "Classical Nagios GUI", "../nagios/", "icon_home.png" ), ( "Addons", True, [ - ( "PNP4Nagios", "../pnp4nagios/", "link_reporting.gif" ), - ( "NagVis", "../nagvis/", "link_map.gif" ), + ( "PNP4Nagios", "../pnp4nagios/", "icon_pnp.png" ), + ( "NagVis", "../nagvis/", "icon_nagvis.png" ), ]), ] diff --git a/web/htdocs/images/icon_link.png b/web/htdocs/images/icon_link.png new file mode 100644 index 0000000..869ddc3 Binary files /dev/null and b/web/htdocs/images/icon_link.png differ diff --git a/web/htdocs/images/link_configuration.gif b/web/htdocs/images/link_configuration.gif deleted file mode 100644 index cfac640..0000000 Binary files a/web/htdocs/images/link_configuration.gif and /dev/null differ diff --git a/web/htdocs/images/link_downtime.gif b/web/htdocs/images/link_downtime.gif deleted file mode 100644 index e1fa927..0000000 Binary files a/web/htdocs/images/link_downtime.gif and /dev/null differ diff --git a/web/htdocs/images/link_error.gif b/web/htdocs/images/link_error.gif deleted file mode 100644 index a11f335..0000000 Binary files a/web/htdocs/images/link_error.gif and /dev/null differ diff --git a/web/htdocs/images/link_events.gif b/web/htdocs/images/link_events.gif deleted file mode 100644 index 0a99ceb..0000000 Binary files a/web/htdocs/images/link_events.gif and /dev/null differ diff --git a/web/htdocs/images/link_folder.gif b/web/htdocs/images/link_folder.gif deleted file mode 100644 index a9e901a..0000000 Binary files a/web/htdocs/images/link_folder.gif and /dev/null differ diff --git a/web/htdocs/images/link_folder_open.gif b/web/htdocs/images/link_folder_open.gif deleted file mode 100644 index 8b8886e..0000000 Binary files a/web/htdocs/images/link_folder_open.gif and /dev/null differ diff --git a/web/htdocs/images/link_home.gif b/web/htdocs/images/link_home.gif deleted file mode 100644 index 4629492..0000000 Binary files a/web/htdocs/images/link_home.gif and /dev/null differ diff --git a/web/htdocs/images/link_hosts.gif b/web/htdocs/images/link_hosts.gif deleted file mode 100644 index c1c688e..0000000 Binary files a/web/htdocs/images/link_hosts.gif and /dev/null differ diff --git a/web/htdocs/images/link_info.gif b/web/htdocs/images/link_info.gif deleted file mode 100644 index 0422620..0000000 Binary files a/web/htdocs/images/link_info.gif and /dev/null differ diff --git a/web/htdocs/images/link_link.gif b/web/htdocs/images/link_link.gif deleted file mode 100644 index d317683..0000000 Binary files a/web/htdocs/images/link_link.gif and /dev/null differ diff --git a/web/htdocs/images/link_map.gif b/web/htdocs/images/link_map.gif deleted file mode 100644 index ba23239..0000000 Binary files a/web/htdocs/images/link_map.gif and /dev/null differ diff --git a/web/htdocs/images/link_monitoring.gif b/web/htdocs/images/link_monitoring.gif deleted file mode 100644 index 006a54b..0000000 Binary files a/web/htdocs/images/link_monitoring.gif and /dev/null differ diff --git a/web/htdocs/images/link_notes.gif b/web/htdocs/images/link_notes.gif deleted file mode 100644 index b3ff249..0000000 Binary files a/web/htdocs/images/link_notes.gif and /dev/null differ diff --git a/web/htdocs/images/link_notifications.gif b/web/htdocs/images/link_notifications.gif deleted file mode 100644 index 9c4e728..0000000 Binary files a/web/htdocs/images/link_notifications.gif and /dev/null differ diff --git a/web/htdocs/images/link_performance.gif b/web/htdocs/images/link_performance.gif deleted file mode 100644 index d6cdfaf..0000000 Binary files a/web/htdocs/images/link_performance.gif and /dev/null differ diff --git a/web/htdocs/images/link_processes.gif b/web/htdocs/images/link_processes.gif deleted file mode 100644 index b89b5f6..0000000 Binary files a/web/htdocs/images/link_processes.gif and /dev/null differ diff --git a/web/htdocs/images/link_queue.gif b/web/htdocs/images/link_queue.gif deleted file mode 100644 index eab5224..0000000 Binary files a/web/htdocs/images/link_queue.gif and /dev/null differ diff --git a/web/htdocs/images/link_reporting.gif b/web/htdocs/images/link_reporting.gif deleted file mode 100644 index 129bab5..0000000 Binary files a/web/htdocs/images/link_reporting.gif and /dev/null differ diff --git a/web/htdocs/images/link_search.gif b/web/htdocs/images/link_search.gif deleted file mode 100644 index 2e6dfde..0000000 Binary files a/web/htdocs/images/link_search.gif and /dev/null differ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 57811cf..97b59cd 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1427,10 +1427,20 @@ def render_custom_links(): html.end_foldable_container() elif type(entry[1]) == str: frame = len(entry) > 3 and entry[3] or "main" + if len(entry) > 2 and entry[2]: - html.write('<img src="images/%s">' % entry[2]) + icon_file = entry[2] + + # Old configs used files named "link_<name>.gif". Those .gif files have + # been removed from Check_MK. Replacing such images with the default icon + if icon_file.endswith(".gif"): + icon_file = "icon_link.png" else: - html.write('<img src="images/link_link.gif">') + icon_file = "icon_link.png" + + # TODO: Recode to use html.icon / html.render_icon + html.write('<img class="icon" align="absmiddle" src="images/%s">' % icon_file) + simplelink(entry[0], entry[1], frame) else: html.write(_("Second part of tuple must be list or string, not %s\n") % str(entry[1])) @@ -1453,6 +1463,10 @@ sidebar_snapins["custom_links"] = { #snapin_custom_links img { margin-right: 5px; } +#snapin_custom_links img.icon { + width: 16px; + height: 16px; +} """ }

7 years, 10 months

Consolidated several manually rendered icons

by Lars Michelsen

Module: check_mk Branch: master Commit: d3a0540bb9510a4336572db65edbe0736c17b5ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3a0540bb9510a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:41:10 2016 +0200 Consolidated several manually rendered icons --- web/htdocs/check_mk.css | 1 + web/htdocs/htmllib.py | 46 ++++++++++---------- .../images/{alert_ack.png => icon_alert_ack.png} | Bin 3881 -> 3881 bytes .../{alert_ackstop.png => icon_alert_ackstop.png} | Bin 3111 -> 3111 bytes ...led.png => icon_alert_alert_handler_failed.png} | Bin 4309 -> 4309 bytes ...ed.png => icon_alert_alert_handler_started.png} | Bin 3672 -> 3672 bytes ...ed.png => icon_alert_alert_handler_stopped.png} | Bin 3654 -> 3654 bytes ...rt_cmk_notify.png => icon_alert_cmk_notify.png} | Bin 3063 -> 3063 bytes .../{alert_command.png => icon_alert_command.png} | Bin 4257 -> 4257 bytes .../images/{alert_crit.png => icon_alert_crit.png} | Bin 2875 -> 2875 bytes .../images/{alert_down.png => icon_alert_down.png} | Bin 2875 -> 2875 bytes ...{alert_downtime.png => icon_alert_downtime.png} | Bin 3270 -> 3270 bytes ...owntimestop.png => icon_alert_downtimestop.png} | Bin 2441 -> 2441 bytes ...{alert_flapping.png => icon_alert_flapping.png} | Bin 2485 -> 2485 bytes .../{alert_notify.png => icon_alert_notify.png} | Bin 3972 -> 3972 bytes .../images/{alert_ok.png => icon_alert_ok.png} | Bin 3485 -> 3485 bytes .../{alert_reload.png => icon_alert_reload.png} | Bin 3488 -> 3488 bytes .../{alert_restart.png => icon_alert_restart.png} | Bin 2652 -> 2652 bytes .../{alert_start.png => icon_alert_start.png} | Bin 2024 -> 2024 bytes .../images/{alert_stop.png => icon_alert_stop.png} | Bin 514 -> 514 bytes .../{alert_unknown.png => icon_alert_unknown.png} | Bin 2999 -> 2999 bytes .../{alert_unreach.png => icon_alert_unreach.png} | Bin 2999 -> 2999 bytes .../images/{alert_up.png => icon_alert_up.png} | Bin 3485 -> 3485 bytes .../images/{alert_warn.png => icon_alert_warn.png} | Bin 2804 -> 2804 bytes web/htdocs/pages.css | 6 --- web/htdocs/sidebar.css | 7 ++- web/htdocs/sidebar.py | 4 +- web/plugins/sidebar/shipped.py | 11 ++--- web/plugins/views/painters.py | 2 +- web/plugins/visuals/filters.py | 7 ++- 30 files changed, 39 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3a0540bb9…

7 years, 10 months

dell_powerconnect_psu: Make discovery function more robust

by Konstantin Büttner

Module: check_mk Branch: master Commit: dd0fb07ac3c3b65853d1a1764ccfcf025034a7d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd0fb07ac3c3b6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Aug 23 09:15:20 2016 +0200 dell_powerconnect_psu: Make discovery function more robust --- checks/dell_powerconnect_psu | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/dell_powerconnect_psu b/checks/dell_powerconnect_psu index 5ae0abc..b28f7a8 100644 --- a/checks/dell_powerconnect_psu +++ b/checks/dell_powerconnect_psu @@ -79,6 +79,8 @@ dell_powerconnect_psu_status2nagios_map = { def inventory_dell_powerconnect_psu(checkname, info): inventory = [] + if not info or not info[0]: + return hw_ident = info[0][0][0] for device_id, name, state, supply in info[1]: # M6220 are blade switches which report valid values only for the "Main"

7 years, 10 months

Replaced own function with builtin one

by Lars Michelsen

Module: check_mk Branch: master Commit: 37d5e90793c80aa5e45eae2366cc9a0a695fc71e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d5e90793c80a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 08:12:08 2016 +0200 Replaced own function with builtin one --- web/htdocs/lib.py | 6 ------ web/htdocs/wato.py | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 4fc7edd..f737d92 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -376,12 +376,6 @@ def isint(i): return False -def set_is_disjoint(a, b): - for elem in a: - if elem in b: - return False - return True - aquire_lock = store.aquire_lock release_lock = store.release_lock have_lock = store.have_lock diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e8887be..b2cde70 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12479,7 +12479,7 @@ def mode_edit_ruleset(phase): img = 'imatch' else: new_keys = set(value.keys()) # pylint: disable=no-member - if set_is_disjoint(match_keys, new_keys): + if match_keys.isdisjoint(new_keys): title = _("This rule matches and defines new parameters.") img = 'match' elif new_keys.issubset(match_keys):

7 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016