Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64282 discussions

Check_MK Git: check_mk: Better styling for ListOf()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 365ce35ce3e578dd699430adcc8a2627a405c68c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=365ce35ce3e578… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 16:48:47 2012 +0200 Better styling for ListOf() --- web/htdocs/check_mk.css | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d0f13cc..416c201 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -407,15 +407,29 @@ table.vs_date th { padding: 0px; } +table.valuespec_listof { + width: 100%; +} + +table.valuespec_listof > tbody > tr > td:first-child { + padding-bottom: 5px; +} +table.valuespec_listof > tbody > tr > td { + padding: 3px 0px 5px 0px; + border-bottom: 1px solid #9bc; +} +table.valuespec_listof > tbody > tr:last-child > td { + padding-top: 3px; + border-bottom-style: none; +} + table.valuespec_listof td.vlof_buttons { margin-right: 5px; white-space: nowrap; + vertical-align: middle; + width: 1px; } table.valuespec_listof td.vlof_content { - /* border: 1px solid white; - box-shadow: 1px 1px 2px #808080; */ - background-image: url("images/form_background.png"); - background-repeat: repeat; } table.valuespec_listof option[selected] { font-weight: bold;

12 years, 4 months

Check_MK Git: check_mk: Added missing images for new buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4cef3e2f648ed0021bea6f64bb5a0b864990ff5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4cef3e2f648ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 16:26:01 2012 +0200 Added missing images for new buttons --- web/htdocs/images/button_back_hi.png | Bin 0 -> 2262 bytes web/htdocs/images/button_back_lo.png | Bin 0 -> 2687 bytes web/htdocs/images/button_end_hi.png | Bin 0 -> 2534 bytes web/htdocs/images/button_end_lo.png | Bin 0 -> 3043 bytes web/htdocs/images/button_forth_hi.png | Bin 0 -> 2396 bytes web/htdocs/images/button_forth_lo.png | Bin 0 -> 2892 bytes web/htdocs/images/button_start_hi.png | Bin 0 -> 2425 bytes web/htdocs/images/button_start_lo.png | Bin 0 -> 2875 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_back_hi.png b/web/htdocs/images/button_back_hi.png new file mode 100644 index 0000000..3d5522b Binary files /dev/null and b/web/htdocs/images/button_back_hi.png differ diff --git a/web/htdocs/images/button_back_lo.png b/web/htdocs/images/button_back_lo.png new file mode 100644 index 0000000..753b14f Binary files /dev/null and b/web/htdocs/images/button_back_lo.png differ diff --git a/web/htdocs/images/button_end_hi.png b/web/htdocs/images/button_end_hi.png new file mode 100644 index 0000000..5b7256d Binary files /dev/null and b/web/htdocs/images/button_end_hi.png differ diff --git a/web/htdocs/images/button_end_lo.png b/web/htdocs/images/button_end_lo.png new file mode 100644 index 0000000..6c4e737 Binary files /dev/null and b/web/htdocs/images/button_end_lo.png differ diff --git a/web/htdocs/images/button_forth_hi.png b/web/htdocs/images/button_forth_hi.png new file mode 100644 index 0000000..f0052e3 Binary files /dev/null and b/web/htdocs/images/button_forth_hi.png differ diff --git a/web/htdocs/images/button_forth_lo.png b/web/htdocs/images/button_forth_lo.png new file mode 100644 index 0000000..88eb4cf Binary files /dev/null and b/web/htdocs/images/button_forth_lo.png differ diff --git a/web/htdocs/images/button_start_hi.png b/web/htdocs/images/button_start_hi.png new file mode 100644 index 0000000..a2b0d4c Binary files /dev/null and b/web/htdocs/images/button_start_hi.png differ diff --git a/web/htdocs/images/button_start_lo.png b/web/htdocs/images/button_start_lo.png new file mode 100644 index 0000000..1587072 Binary files /dev/null and b/web/htdocs/images/button_start_lo.png differ

12 years, 4 months

Check_MK Git: check_mk: FIX: audit log was not shown if no entry for today existed

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 51e838ad97623bc3ec70c07ec4ea405034c1f93e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51e838ad97623b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 16:25:39 2012 +0200 FIX: audit log was not shown if no entry for today existed --- ChangeLog | 1 + web/htdocs/wato.css | 13 ++----------- web/htdocs/wato.py | 49 +++++++++++++++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index b44149d..67a9bf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * New layout and new internal implementation of input forms * New layout for view overview and view editor * Split up host search in two distinct pages + * FIX: audit log was not shown if no entry for today existed * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 280e35d..1cb7d5f 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -162,17 +162,6 @@ Boston, MA 02110-1301 USA. padding: 2px 6px; } -.wato table.auditlog.pending td { - border-color: #f80; -} -.wato table.auditlog.pending tr.even0 { - background-color: #fda; -} - -.wato table.auditlog.pending tr.odd0 { - background-color: #fc8; -} - .wato td.dns { color: #666; } @@ -477,6 +466,8 @@ table.validationerror img { /* Controls for the audit log paged mechanism */ .wato div.paged_controls { float: right; + position: relative; + top: 3px; } /* Special styles for configuration and rule editor */ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fbdad5b..6034a4e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3654,11 +3654,20 @@ def fmt_time(t): return time.strftime('%H:%M:%S', time.localtime(t)) def paged_log(log): - start = html.var('start', None) + start = int(html.var('start', 0)) if not start: - start = time.time() - start_time, end_time = get_timerange(int(start)) + start = int(time.time()) + + while True: + log_today, times = paged_log_from(log, start) + if len(log) == 0 or len(log_today) > 0: + return log_today, times + else: # No entries today, but log not empty -> go back in time + start -= 24 * 3600 + +def paged_log_from(log, start): + start_time, end_time = get_timerange(start) previous_log_time = None next_log_time = None first_log_index = None @@ -3693,23 +3702,22 @@ def paged_log(log): def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('<div class=paged_controls>') - html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_date(start_time), - fmt_date(end_time)))) - - if previous_log_time is not None: - html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), - title = '%s: %s' % (_("Older events"), fmt_date(previous_log_time))) + if next_log_time is not None: + html.icon_button(html.makeuri([('start', get_timerange(int(time.time()))[0])]), + _("Most recent events"), "start") + html.icon_button(html.makeuri([('start', next_log_time)]), + '%s: %s' % (_("Newer events"), fmt_date(next_log_time)), + "back") else: - html.buttonlink(html.makeuri([]), _("<"), disabled = True) - - html.buttonlink(html.makeuri([('start', get_timerange(int(time.time()))[0])]), _("o"), - title = _("Todays events")) + html.empty_icon_button() + html.empty_icon_button() - if next_log_time is not None: - html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), - title = '%s: %s' % (_("Newer events"), fmt_date(next_log_time))) + if previous_log_time is not None: + html.icon_button(html.makeuri([('start', previous_log_time)]), + '%s: %s' % (_("Older events"), fmt_date(previous_log_time)), + "forth") else: - html.buttonlink(html.makeuri([]), _(">"), disabled = True) + html.empty_icon_button() html.write('</div>') @@ -3722,10 +3730,12 @@ def render_audit_log(log, what, with_filename = False): empty_msg = _("No pending changes, monitoring server is up to date.") if len(log) == 0: - htmlcode += "<div class=info>%s</div>" % empty_msg + html.write("<div class=info>%s</div>" % empty_msg) return + elif what == 'audit': - htmlcode += "<h3>" + _("Audit logfile") + "</h3>" + htmlcode += "<h3>" + _("Audit logfile for %s") % fmt_date(times[0]) + "</h3>" + elif what == 'pending': if is_distributed(): htmlcode += "<h3>" + _("Changes that are not activated on all sites:") + "</h3>" @@ -3752,7 +3762,6 @@ def render_audit_log(log, what, with_filename = False): display_paged(times) else: html.write(htmlcode) - # html.show_warning(htmlcode) def export_audit_log(): html.req.content_type = "text/csv; charset=UTF-8"

12 years, 4 months

Check_MK Git: check_mk: Minor styling change in forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 859987170445ea2185c31854da27d58f0570e6a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=859987170445ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 15:52:37 2012 +0200 Minor styling change in forms --- web/htdocs/images/nform_background.png | Bin 214 -> 214 bytes web/htdocs/pages.css | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/images/nform_background.png b/web/htdocs/images/nform_background.png index 781f4e6..c5452b8 100644 Binary files a/web/htdocs/images/nform_background.png and b/web/htdocs/images/nform_background.png differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1154487..bec54c3 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -503,7 +503,7 @@ table.nform tr.heading td { } table.nform tr.heading > td { border-radius: 5px 5px 0px 0px; - background-image: url("images/white_10percent.png"); + background-image: url("images/white_20percent.png"); background-repeat: repeat; height: 20px; vertical-align: middle;

12 years, 4 months

Check_MK Git: check_mk: Splitup host search in two modes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a80a77ae11207f86b46667458acbf2d99e668956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a80a77ae11207f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 15:41:55 2012 +0200 Splitup host search in two modes --- ChangeLog | 1 + web/htdocs/wato.py | 76 ++++++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index a411f84..b44149d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * Added automation_commands to make automations pluginable * New layout and new internal implementation of input forms * New layout for view overview and view editor + * Split up host search in two distinct pages * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2b4b37a..fbdad5b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2155,54 +2155,59 @@ def show_service_table(host, firsttime): def mode_search(phase): if phase == "title": - return _("Search for hosts in %s and below" % (g_folder["title"])) + return _("Search for hosts") elif phase == "buttons": + global_buttons() html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") + return elif phase == "action": - pass + return "search_results" - else: - render_folder_path() + render_folder_path() - html.write("<table><tr><td>") - ## # Show search form - html.begin_form("search") - forms.header(_("General Properties")) - forms.section(_("Hostname")) - html.text_input("host") - html.set_focus("host") + ## # Show search form + html.begin_form("search") + forms.header(_("General Properties")) + forms.section(_("Hostname")) + html.text_input("host") + html.set_focus("host") - # Attributes - configure_attributes({}, "search", parent = None) + # Attributes + configure_attributes({}, "search", parent = None) - # Button - forms.end() - html.button("_global", _("Search globally"), "submit") - html.button("_local", _("Search in %s") % g_folder["title"], "submit") - html.hidden_fields() - html.end_form() + # Button + forms.end() + html.button("_global", _("Search globally"), "submit") + html.button("_local", _("Search in %s") % g_folder["title"], "submit") + html.hidden_fields() + html.end_form() - # Show search results - if html.transaction_valid(): - html.write("</td><td>") - crit = { - ".name" : html.var("host"), - } - crit.update(collect_attributes(do_validate = False)) - html.write("<h3>" + _("Search results:") + "</h3>") - if html.has_var("_local"): - folder = g_folder - else: - folder = g_root_folder +def mode_search_results(phase): + if phase == "title": + return _("Search results") + + elif phase == "buttons": + global_buttons() + html.context_button(_("New Search"), html.makeuri([("mode", "search")]), "back") + return + + elif phase == "action": + return + + crit = { ".name" : html.var("host") } + crit.update(collect_attributes(do_validate = False)) + + if html.has_var("_local"): + folder = g_folder + else: + folder = g_root_folder - # html.write("<pre>%s</pre>" % pprint.pformat(crit)) - if not search_hosts_in_folders(folder, crit): - html.message(_("No matching hosts found.")) + if not search_hosts_in_folders(folder, crit): + html.message(_("No matching hosts found.")) - html.write("</td></tr></table>") @@ -11148,6 +11153,7 @@ modes = { "firstinventory" : (["hosts", "services"], lambda phase: mode_inventory(phase, True)), "inventory" : (["hosts"], lambda phase: mode_inventory(phase, False)), "search" : (["hosts"], mode_search), + "search_results" : (["hosts"], mode_search_results), "bulkinventory" : (["hosts", "services"], mode_bulk_inventory), "bulkedit" : (["hosts", "edit_hosts"], mode_bulk_edit), "bulkcleanup" : (["hosts", "edit_hosts"], mode_bulk_cleanup),

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 46cf8c49915624bca442237eccee62fadaa8f4b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46cf8c49915624… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 10:49:27 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: New layout for view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95a7e24d7d17b6f6a7038fc2ac44fa7f4015aa80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95a7e24d7d17b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 10:49:24 2012 +0200 New layout for view editor --- ChangeLog | 1 + web/htdocs/check_mk.css | 26 ++- web/htdocs/js/checkmk.js | 31 ++-- web/htdocs/pages.css | 15 +- web/htdocs/views.css | 58 +------ web/htdocs/views.py | 382 ++++++++++++++++++++----------------------- web/htdocs/wato.py | 2 +- web/plugins/views/bi.py | 3 + web/plugins/views/mobile.py | 3 +- 9 files changed, 226 insertions(+), 295 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=95a7e24d7d…

12 years, 4 months

Check_MK Git: check_mk: vxvm_enclosures: add backward compatibility for SF 5.0

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b70f594dfa8cc748f3b7637e56b869c3a02b9be4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b70f594dfa8cc7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri May 18 07:53:39 2012 +0200 vxvm_enclosures: add backward compatibility for SF 5.0 --- agents/plugins/veritas/vxvm_enclosures | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/veritas/vxvm_enclosures b/agents/plugins/veritas/vxvm_enclosures index 18cf6f7..3c95fa9 100755 --- a/agents/plugins/veritas/vxvm_enclosures +++ b/agents/plugins/veritas/vxvm_enclosures @@ -11,5 +11,5 @@ if type vxdmpadm > /dev/null ; then echo '<<<vxvm_enclosures>>>' - vxdmpadm listenclosure | grep -v -w -e ^disk -e ^ENCLR_NAME -e \^= + vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ^ENCLR_NAME -e \^= fi

12 years, 4 months

Check_MK Git: check_mk: vxvm_enclosures: exclude local disks with enclosure based naming

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b31d85cc92baa7cd10350939d8d1e6b825227714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b31d85cc92baa7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri May 18 07:58:23 2012 +0200 vxvm_enclosures: exclude local disks with enclosure based naming --- agents/plugins/veritas/vxvm_enclosures | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/veritas/vxvm_enclosures b/agents/plugins/veritas/vxvm_enclosures index 3c95fa9..dbef723 100755 --- a/agents/plugins/veritas/vxvm_enclosures +++ b/agents/plugins/veritas/vxvm_enclosures @@ -11,5 +11,5 @@ if type vxdmpadm > /dev/null ; then echo '<<<vxvm_enclosures>>>' - vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ^ENCLR_NAME -e \^= + vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ^other_disks -e ^ENCLR_NAME -e \^= fi

12 years, 4 months

Check_MK Git: check_mk: vxvm_multipath: Make backward compatible with 5.0

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2241d361f7b4e95dd067f5da757a132239c06309 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2241d361f7b4e9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri May 18 08:23:24 2012 +0200 vxvm_multipath: Make backward compatible with 5.0 --- agents/plugins/veritas/vxvm_multipath | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath index 281747d..7d69991 100755 --- a/agents/plugins/veritas/vxvm_multipath +++ b/agents/plugins/veritas/vxvm_multipath @@ -1,6 +1,4 @@ #!/bin/sh -# Original output -# c42t4d7 ENABLED(A) - disk2046 emc1 c27 - # DMPNODENAME ENCLR-NAME STATE[A] PATH-TYPE[M] # disk2057 emc1 ENABLED(A) - @@ -12,6 +10,10 @@ if type vxdmpadm >/dev/null; then echo '<<<vxvm_multipath>>>' # dmpnode storagedevice state attribute - vxdmpadm getsubpaths | grep -vw DMPNODENAME | awk '{print $4" "$5" "$2" "$3}' - + #vxdmpadm getsubpaths| grep -vw DMPNODENAME | awk '{print $4" "$5" "$2" "$3}' + vxdmpadm listenclosure all | \ + grep -v -w -e ^[dD]isk -e ENCLR_NAME -e ^other_disks -e \^= | \ + awk '{print $1}' | while read enc ; do vxdmpadm getdmpnode enclosure=$enc + done + done fi

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits