Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: #1163 Service discovery: Added direct link to check parameter ruleset of services

by Lars Michelsen

Module: check_mk Branch: master Commit: a059095a71a01ea372154293aa0b660c4ae88392 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a059095a71a01e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 29 08:34:52 2014 +0100 #1163 Service discovery: Added direct link to check parameter ruleset of services This link was existing before. It had been replaced by a link to a page which lists all rulesets affecting a service. This commit adds the link again as additional one to the list of discovered services --- .werks/1163 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/images/button_diagnose_hi.png | Bin 0 -> 3195 bytes web/htdocs/images/button_diagnose_lo.png | Bin 0 -> 3963 bytes web/htdocs/images/button_ignore_hi.png | Bin 0 -> 3326 bytes web/htdocs/images/button_ignore_lo.png | Bin 0 -> 3640 bytes web/htdocs/wato.py | 29 ++++++++--------------------- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.werks/1163 b/.werks/1163 new file mode 100644 index 0000000..6268f02 --- /dev/null +++ b/.werks/1163 @@ -0,0 +1,11 @@ +Title: Service discovery: Added direct link to check parameter ruleset of services +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1414567986 +Class: feature + +This link was existing before. It had been replaced by a link to a page which lists +all rulesets affecting a service. This commit adds the link again as additional one to the +list of discovered services diff --git a/ChangeLog b/ChangeLog index b1761c1..957232e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -154,6 +154,7 @@ * 1115 Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c... * 1404 Make title/help of custom user attributes localizable... * 1159 Remote BI Aggregations can now be configured to be checked as single services... + * 1163 Service discovery: Added direct link to check parameter ruleset of services... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... * 1091 FIX: logwatch patterns: allow unicode text in pattern comment diff --git a/web/htdocs/images/button_diagnose_hi.png b/web/htdocs/images/button_diagnose_hi.png new file mode 100644 index 0000000..15b6e00 Binary files /dev/null and b/web/htdocs/images/button_diagnose_hi.png differ diff --git a/web/htdocs/images/button_diagnose_lo.png b/web/htdocs/images/button_diagnose_lo.png new file mode 100644 index 0000000..8517c1d Binary files /dev/null and b/web/htdocs/images/button_diagnose_lo.png differ diff --git a/web/htdocs/images/button_ignore_hi.png b/web/htdocs/images/button_ignore_hi.png new file mode 100644 index 0000000..59a7804 Binary files /dev/null and b/web/htdocs/images/button_ignore_hi.png differ diff --git a/web/htdocs/images/button_ignore_lo.png b/web/htdocs/images/button_ignore_lo.png new file mode 100644 index 0000000..6b4497d Binary files /dev/null and b/web/htdocs/images/button_ignore_lo.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b180543..18dfd15 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3300,10 +3300,6 @@ def show_service_table(host, firsttime): table.cell(_("Check Parameters")) if varname and varname in g_rulespecs: rulespec = g_rulespecs[varname] - url = make_link([("mode", "edit_ruleset"), - ("varname", varname), - ("host", hostname), - ("item", mk_repr(item))]) try: rulespec["valuespec"].validate_datatype(params, "") rulespec["valuespec"].validate_value(params, "") @@ -3314,30 +3310,22 @@ def show_service_table(host, firsttime): html.write(paramtext) - # # Strip all HTML code from the paramtext - # table.cell("") - # paramtext = paramtext.replace('</td>', '\t') - # paramtext = paramtext.replace('</tr>', '\n') - # paramtext = html.strip_tags(paramtext) - - # if parameter_column: - # title = _("Edit the parameters of this services") - # else: - # title = _("Check parameters for this service") + ": \n" + paramtext - # #html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % - # # (url, title)) - # Icon for Service parameters. Not for missing services! - table.cell("", "") + table.cell(css='buttons') if state_type not in [ "new", "ignored" ]: + # Link to list of all rulesets affecting this service params_url = make_link([("mode", "object_parameters"), ("host", hostname), ("service", descr)]) html.icon_button(params_url, _("View and modify the parameters for this service"), "rulesets") + url = make_link([("mode", "edit_ruleset"), + ("varname", varname), + ("host", hostname), + ("item", mk_repr(item))]) + html.icon_button(url, _("Edit and analyze the check parameters of this services"), "diagnose") # Permanently disable icon - table.cell() if state_type in ['new', 'old']: url = make_link([ ('mode', 'edit_ruleset'), @@ -3350,8 +3338,7 @@ def show_service_table(host, firsttime): ('rule_folder', ''), ('back_mode', 'inventory'), ]) - html.write('<a href="%s"><img title="%s" class=icon src="images/icon_ignore.png"></a>' % - (url, _("Create rule to permanently disable this service"))) + html.icon_button(url, _("Create rule to permanently disable this service"), "ignore") # Temporary ignore checkbox table.cell()

9 years, 8 months

Check_MK Git: check_mk: #1427 FIX esx_vsphere_hostsystem.multipath: no longer crashes at invalid multipath types

by Andreas Boesl

Module: check_mk Branch: master Commit: f6428ace9899831a838d9b3d86f66f9aa95fbea5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6428ace989983… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 28 16:43:25 2014 +0100 #1427 FIX esx_vsphere_hostsystem.multipath: no longer crashes at invalid multipath types The check had problems (crashed) when processing multipaths elements of the type <tt>usb.vmhba32-usb.0:0-</tt>. Those elements are now ignored. --- .werks/1427 | 11 +++++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/1427 b/.werks/1427 new file mode 100644 index 0000000..da838ea --- /dev/null +++ b/.werks/1427 @@ -0,0 +1,11 @@ +Title: esx_vsphere_hostsystem.multipath: no longer crashes at invalid multipath types +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414510819 +Class: fix + +The check had problems (crashed) when processing multipaths elements of the type <tt>usb.vmhba32-usb.0:0-</tt>. +Those elements are now ignored. + diff --git a/ChangeLog b/ChangeLog index e167270..b1761c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ NOTE: Please refer to the migration notes! * 1161 FIX: fc_port: Fixed invalid values of counters, fixed wrong values in graphs... * 1192 FIX: veeam_jobs: Check now recognize sync jobs... + * 1427 FIX: esx_vsphere_hostsystem.multipath: no longer crashes at invalid multipath types... Multisite: * 1066 New Dashboard Designer... diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 4db95de..7b9a57d 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -299,7 +299,11 @@ def esx_vsphere_multipath_convert(info): data = zip(data[::2], data[1::2]) paths = {} for path, state in data: - path_type, path_id = path.split('-')[-1].split('.') + path_tokens = path.split('-') + if "." not in path_tokens[-1]: + continue # invalid format / unknown type + path_type, path_id = path_tokens[-1].split('.') + if path_type in ['naa', 'eui']: hw_type = path.split('.')[0] if hw_type != 'unknown':

9 years, 8 months

Check_MK Git: check_mk: Another extension of duallist choice

by Lars Michelsen

Module: check_mk Branch: master Commit: aaeb82959ae74a17bb093817044dc3603890f3dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaeb82959ae74a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 28 15:27:44 2014 +0100 Another extension of duallist choice --- web/htdocs/js/checkmk.js | 22 ++++++++++++++++++++++ web/htdocs/valuespec.py | 5 +++++ web/htdocs/views.css | 8 ++++++++ web/plugins/visuals/filters.py | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 56e9e16..a5e2359 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1704,6 +1704,28 @@ function vs_passwordspec_randomize(img) { oInput.value = password; } +function vs_duallist_enlarge(field_suffix, varprefix) { + var field = document.getElementById(varprefix + '_' + field_suffix); + if (field.id != varprefix + '_selected') { + // The other field is the one without "_unselected" suffix + var other_id = varprefix + '_selected'; + var positive = true; + } else { + // The other field is the one with "_unselected" suffix + var other_id = varprefix + '_unselected'; + var positive = false; + } + + var other_field = document.getElementById(other_id); + if (!other_field) + return; + + remove_class(other_field, 'large'); + add_class(other_field, 'small'); + remove_class(field, 'small'); + add_class(field, 'large'); +} + function vs_duallist_switch(field_suffix, varprefix, keeporder) { var field = document.getElementById(varprefix + '_' + field_suffix); if (field.id != varprefix + '_selected') { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 13d1155..0203330 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1540,6 +1540,7 @@ class DualListChoice(ListChoice): self._autoheight = kwargs.get("autoheight", True) self._custom_order = kwargs.get("custom_order", False) self._instant_add = kwargs.get("instant_add", False) + self._enlarge_active = kwargs.get("enlarge_active", False) def render_input(self, varprefix, value): self.load_elements() @@ -1585,6 +1586,10 @@ class DualListChoice(ListChoice): onchange_unselected = '' onchange_selected = '' + if self._enlarge_active: + onchange_selected += ';vs_duallist_enlarge(\'selected\', \'%s\')' % varprefix + onchange_unselected += ';vs_duallist_enlarge(\'unselected\', \'%s\')' % varprefix + html.sorted_select(varprefix + '_unselected', unselected, attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or ''}, onchange = onchange_unselected) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index f0f1074..ab0406d 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -120,6 +120,14 @@ div.floatfilter .content .multigroup select { height: 66px; } +div.floatfilter .content .multigroup select.large { + width: 228px; +} + +div.floatfilter .content .multigroup select.small { + width: 68px; +} + div.floatfilter .content .filtertime select { width: 136px; } diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index a006712..ee505fa 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -155,7 +155,7 @@ class FilterMultigroup(Filter): return True def valuespec(self): - return DualListChoice(choices = all_groups(self.what), autoheight=False) + return DualListChoice(choices = all_groups(self.what), autoheight=False, enlarge_active=True) def selection(self): current = html.var(self.htmlvar, "").strip().split("|")

9 years, 8 months

Check_MK Git: check_mk: Disable screenshot mode per default

by Mathias Kettner

Module: check_mk Branch: master Commit: 4dbdfc5af89fa9020015d8e559cb5b9531ef4b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dbdfc5af89fa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 15:26:24 2014 +0100 Disable screenshot mode per default --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2e16bd5..25c4a6d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -71,7 +71,7 @@ class html: self.keybindings_enabled = True self.io_error = False self.enable_debug = False - self.screenshotmode = True + self.screenshotmode = False self.help_visible = False self.treestates = {} self.treestates_for_id = None

9 years, 8 months

Check_MK Git: check_mk: Reworked duallist choice valuespec to make selection and search possible

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a4613b4e3d14193572a586cfe7be064322ff5d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a4613b4e3d141… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 28 15:09:51 2014 +0100 Reworked duallist choice valuespec to make selection and search possible --- web/htdocs/check_mk.css | 20 ++++++++++++++++++++ web/htdocs/js/checkmk.js | 5 ++++- web/htdocs/valuespec.py | 29 ++++++++++++++++++++++------- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1863640..34c105c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -455,6 +455,26 @@ table.valuespec_listof .unused { display: none; } +table.vs_duallist td.head { + text-align:center; +} + +table.vs_duallist a.control { + display: inline-block; + width: 14px; + border: 1px solid #fff; + text-decoration: none; + text-align: center; +} + +table.vs_duallist a.control.add { + float: right; +} + +table.vs_duallist a.control.del { + float: left; +} + textarea.tt { font-family: monospace; } diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index e09073c..56e9e16 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1704,7 +1704,8 @@ function vs_passwordspec_randomize(img) { oInput.value = password; } -function vs_duallist_switch(field, varprefix, keeporder) { +function vs_duallist_switch(field_suffix, varprefix, keeporder) { + var field = document.getElementById(varprefix + '_' + field_suffix); if (field.id != varprefix + '_selected') { // The other field is the one without "_unselected" suffix var other_id = varprefix + '_selected'; @@ -1725,6 +1726,8 @@ function vs_duallist_switch(field, varprefix, keeporder) { // Move the selected option to the other select field var selected = field.options[field.selectedIndex]; + if (typeof selected === 'undefined') + return; // when add/remove clicked, but none selected field.removeChild(selected); // Determine the correct child to insert. If keeporder is being set, diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4acb5ab..13d1155 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1539,6 +1539,7 @@ class DualListChoice(ListChoice): ListChoice.__init__(self, **kwargs) self._autoheight = kwargs.get("autoheight", True) self._custom_order = kwargs.get("custom_order", False) + self._instant_add = kwargs.get("instant_add", False) def render_input(self, varprefix, value): self.load_elements() @@ -1564,20 +1565,34 @@ class DualListChoice(ListChoice): else: unselected.append(e) - - html.write('<table><tr><td>') - html.write(_('Available:')) - html.write('</td><td>') - html.write(_('Selected:')) + select_func = 'vs_duallist_switch(\'unselected\', \'%s\', %d);' % (varprefix, self._custom_order and 1 or 0) + unselect_func = 'vs_duallist_switch(\'selected\', \'%s\', 1);' % varprefix + + html.write('<table class="vs_duallist"><tr><td class="head">') + html.write(_('Available')) + if not self._instant_add: + html.write('<a href="javascript:%s" class="control add">></a>' % select_func) + html.write('</td><td class="head">') + html.write(_('Selected')) + if not self._instant_add: + html.write('<a href="javascript:%s" class="control del"><</a>' % unselect_func) html.write('</td></tr><tr><td>') + + if self._instant_add: + onchange_unselected = select_func + onchange_selected = unselect_func + else: + onchange_unselected = '' + onchange_selected = '' + html.sorted_select(varprefix + '_unselected', unselected, attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or ''}, - onchange = 'vs_duallist_switch(this, \'%s\', %d);' % (varprefix, self._custom_order and 1 or 0)) + onchange = onchange_unselected) html.write('</td><td>') func = self._custom_order and html.select or html.sorted_select func(varprefix + '_selected', selected, attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or '', 'multiple': 'multiple'}, - onchange = 'vs_duallist_switch(this, \'%s\', 1);' % varprefix) + onchange = onchange_selected) html.write('</td></tr></table>') html.hidden_field(varprefix, '|'.join([k for k, v in selected]), id = varprefix, add_var = True)

9 years, 8 months

Check_MK Git: check_mk: Werk 1426: fixed formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 474ac311e8310101350c5665137170330f9b8f8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=474ac311e83101… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 28 13:49:57 2014 +0100 Werk 1426: fixed formatting --- .werks/1426 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1426 b/.werks/1426 index 4c33031..6cd0a18 100644 --- a/.werks/1426 +++ b/.werks/1426 @@ -9,6 +9,6 @@ Class: fix Sometimes the windows agent read error texts out of dll files. Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path. -However, there were instances were the prefix was <tt>%windir%</tt>. -This placeholder was not replaced correctly. As a result the dll were not found, +However, there were instances where the prefix was <tt>%windir%</tt>. +This placeholder was not replaced correctly. As a result the dll could not get opened, which lead to incorrect formatted texts.

9 years, 8 months

Check_MK Git: check_mk: #1426 FIX windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)

by Andreas Boesl

Module: check_mk Branch: master Commit: d0a8fdcf8ddfdb7e3eb498a9ca4ad8a5598fdd5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0a8fdcf8ddfdb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 28 13:48:08 2014 +0100 #1426 FIX windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters) Sometimes the windows agent read error texts out of dll files. Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path. However, there were instances were the prefix was <tt>%windir%</tt>. This placeholder was not replaced correctly. As a result the dll were not found, which lead to incorrect formatted texts. --- .werks/1426 | 14 ++++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 2 ++ agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 160117 -> 160293 bytes agents/windows/install_agent.exe | Bin 157057 -> 157222 bytes 10 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1426 b/.werks/1426 new file mode 100644 index 0000000..4c33031 --- /dev/null +++ b/.werks/1426 @@ -0,0 +1,14 @@ +Title: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters) +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i6 +Date: 1414500095 +Class: fix + +Sometimes the windows agent read error texts out of dll files. +Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path. + +However, there were instances were the prefix was <tt>%windir%</tt>. +This placeholder was not replaced correctly. As a result the dll were not found, +which lead to incorrect formatted texts. diff --git a/ChangeLog b/ChangeLog index af93fea..ca38465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1373 SEC: Do not ouput complete command line when datasource programs fail... * 1425 New section header option "encoding" for agent output... * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files... + * 1426 FIX: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)... Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices diff --git a/agents/windows/build_version b/agents/windows/build_version index 49541f7..f906e18 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -94 +96 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0ed2329..dd9dad1 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.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index defdda0..d73c2bc 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.cc b/agents/windows/check_mk_agent.cc index 20b166a..fa6b383 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1055,6 +1055,8 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch // but not entirely for sure - C:\WINDOWS if (strncasecmp(dllpath, "%SystemRoot%", 12) == 0) snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 12); + else if (strncasecmp(dllpath, "%windir%", 8) == 0) + snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 8); else snprintf(dll_realpath, sizeof(dll_realpath), "%s", dllpath); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d088125..5ce8ccc 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.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 952b59f..6288309 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 64da341..6acaa93 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 0b5ede7..900fbaa 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 8 months

Check_MK Git: check_mk: Fix screenshot mode for normal views

by Mathias Kettner

Module: check_mk Branch: master Commit: e11a16c1003aa497a42f6727648814b6de7fa9b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e11a16c1003aa4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 07:58:07 2014 +0100 Fix screenshot mode for normal views --- web/htdocs/htmllib.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 53820a2..2e16bd5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -747,16 +747,22 @@ class html: def immediate_browser_redirect(self, secs, url): self.javascript("setReload(%s, '%s');" % (secs, url)) + def body_css_classes(self): + body_classes = [ "main" ] + if self.var("_body_class"): + body_classes.append(self.var("_body_class")) + if self.screenshotmode: + body_classes.append("screenshotmode") + return " ".join(body_classes) + + def body_start(self, title='', **args): + self.html_head(title, **args) + self.write('<body class="%s">' % self.body_css_classes()) + def header(self, title='', **args): if self.output_format == "html": if not self.header_sent: - self.html_head(title, **args) - body_classes = [ "main" ] - if self.var("_body_class"): - body_classes.append(self.var("_body_class")) - if self.screenshotmode: - body_classes.append("screenshotmode") - self.write('<body class="%s">' % " ".join(body_classes)) + self.body_start(title, **args) self.header_sent = True if self.render_headfoot: self.top_heading(title) @@ -782,10 +788,6 @@ class html: self.debug_vars(hide_with_mouse = False) self.end_foldable_container() - def body_start(self, title='', **args): - self.html_head(title, **args) - self.write('<body class="main %s">' % self.var("_body_class", "")) - def bottom_focuscode(self): if self.focus_object: formname, varname = self.focus_object

9 years, 8 months

Check_MK Git: check_mk: Screenshotmode also covers sidebar

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b867b7e0fae8a7cb76da4175b6ba1e3e58415b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b867b7e0fae8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 07:29:16 2014 +0100 Screenshotmode also covers sidebar --- web/htdocs/sidebar.css | 4 ++++ web/htdocs/sidebar.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index cb46f73..c5f0a5a 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -47,6 +47,10 @@ body.side { margin: 0px; } +body.side.screenshotmode { + background-image: url(""); +} + /* Top logo part */ #side_header { position: absolute; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 129e806..ef8d8e1 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -213,7 +213,10 @@ def page_side(): else: interval = 'null' html.html_head(_("Check_MK Sidebar"), javascripts=["sidebar"], stylesheets=["sidebar", "status"]) - html.write('<body class="side" onload="initScrollPos(); setSidebarHeight(); init_messages(%s);" ' + html.write('<body class="side') + if config.screenshotmode: + html.write(" screenshotmode") + html.write('" onload="initScrollPos(); setSidebarHeight(); init_messages(%s);" ' 'onunload="storeScrollPos()">\n' % interval) html.write('<div id="check_mk_sidebar">\n')

9 years, 8 months

Check_MK Git: check_mk: #1477 New screenshot mode for Multisite

by Mathias Kettner

Module: check_mk Branch: master Commit: 3dd5245d3096018f0b4d139fc6277a66a59d71c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dd5245d309601… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 28 07:17:59 2014 +0100 #1477 New screenshot mode for Multisite If you add <tt>screenshotmode = True</tt> to your <tt>multisite.mk</tt> or add a <tt>?screenshotmode=1</tt> to your URL, then Multisite will replace the fancy blue background by a plain white. This makes it easier to screenshot parts of the GUI like configuration boxes, sidebar snapins, etc. --- .werks/1477 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 8 +++++++- web/htdocs/index.py | 4 ++++ web/htdocs/login.css | 5 ++++- web/htdocs/pages.css | 8 ++++++++ web/plugins/config/builtin.py | 1 + 7 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.werks/1477 b/.werks/1477 new file mode 100644 index 0000000..cb6a212 --- /dev/null +++ b/.werks/1477 @@ -0,0 +1,11 @@ +Title: New screenshot mode for Multisite +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1414477007 +Class: feature + +If you add <tt>screenshotmode = True</tt> to your <tt>multisite.mk</tt> or add a <tt>?screenshotmode=1</tt> +to your URL, then Multisite will replace the fancy blue background by a plain white. This makes it easier +to screenshot parts of the GUI like configuration boxes, sidebar snapins, etc. diff --git a/ChangeLog b/ChangeLog index af93fea..36fc182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1411 New builting views for the history of scheduled downtimes * 1185 mobile ui: Added a new view to see events from the Event Console * 1412 Speed up of displaying and sorting after WATO folder path + * 1477 New screenshot mode for Multisite... * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e24a5f4..53820a2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -71,6 +71,7 @@ class html: self.keybindings_enabled = True self.io_error = False self.enable_debug = False + self.screenshotmode = True self.help_visible = False self.treestates = {} self.treestates_for_id = None @@ -750,7 +751,12 @@ class html: if self.output_format == "html": if not self.header_sent: self.html_head(title, **args) - self.write('<body class="main %s">' % self.var("_body_class", "")) + body_classes = [ "main" ] + if self.var("_body_class"): + body_classes.append(self.var("_body_class")) + if self.screenshotmode: + body_classes.append("screenshotmode") + self.write('<body class="%s">' % " ".join(body_classes)) self.header_sent = True if self.render_headfoot: self.top_heading(title) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b43ddb6..22e982a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -106,6 +106,10 @@ def handler(req, fields = None, profiling = True): config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True + + if html.var("screenshotmode") or config.screenshotmode: # Omit fancy background, make it white + html.screenshotmode = True + html.enable_debug = config.debug html.set_buffering(config.buffered_http_stream) diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 78c77f3..6b499ed 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -43,7 +43,6 @@ body.main { vertical-align: middle; } - div#login { background-image: url("images/login_spotlight.png"); background-repeat: no-repeat; @@ -56,6 +55,10 @@ div#login { /* border: 1px solid yellow; */ } +body.main.screenshotmode div#login { + background-image: url(""); +} + img#login_window { width: 370px; height: 230px; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index d395b96..5590450 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -70,6 +70,14 @@ body.main { background-color: #426D8A; } +/* Special mode for creating screenshots of single elements. Omit background. + This can be selected in multisite.mk with screenshotmode = True or screenshotmode=1 + on the URL */ +body.main.screenshotmode { + background-image: url(""); + background-color: white; +} + body.main div.main { padding-left: 10px; border-left: 1px solid red; diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8c82e27..6e98986 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -34,6 +34,7 @@ roles = {} # User supplied roles # define default values for all settings debug = False +screenshotmode = False profile = False users = [] admin_users = []

9 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014