Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Linux Agent: Plugin for tracking LVM volume statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41678d1fe567c583c02fb27c0a16791aa3d12861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41678d1fe567c5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:50:32 2012 +0200 Linux Agent: Plugin for tracking LVM volume statistics --- agents/plugins/lvmstat | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lvmstat b/agents/plugins/lvmstat new file mode 100755 index 0000000..7e6f5ef --- /dev/null +++ b/agents/plugins/lvmstat @@ -0,0 +1,60 @@ +#!/usr/bin/python + +# Agent plugin to gather io statistics on lvm volumes +# as tricky as i'd have expected. +# it seems there is no way to ask devmapper for lvm volumes only. +# (...major numbers were such an awesome idea) + + +import os +import subprocess + + +# should be a dict +# { "dm-1" : (vg01, lvol12)} +devices = {} +stats = {} + + +# grab volume groups and lv's from lvm. Otherwise we might also find devices that +# are used by "something completely different" - i.e. multipath targets +lvlist = subprocess.Popen(["lvs", + "--separator", ";", "--noheadings", + "--nosuffix", "-o", "vg_name,lv_name" ], + stdout=subprocess.PIPE) + + +# with this list from lvm we can now find the dm nodes of the volumes +for line in lvlist.stdout.readlines(): + line = line.strip() + vg_name, lv_name = line.split(";") + # Found this in dtc-xen's statistics server. Greetings to Thomas! + minor = os.minor(os.stat("/dev/%s/%s" % (vg_name, lv_name)).st_rdev) + dmdev = "dm-%s" % minor + devices.update( { dmdev : (vg_name, lv_name)}) + + + +# then we can parse our nice new dictionary and grab the stats for each blockdev +for dmdev in devices.keys(): + counter = "/sys/block/%s/stat" % dmdev + stats[dmdev] = file(counter).read().rstrip() + + # read the gathered stats and if they are showing no IO, then + # either there was the counters disabled (and we enable them) + # or there was simply no IO to the LVM volume. + + if sum(map(int, stats[dmdev].split()[3-8])) == 0: + stats_switch = "/sys/block/%s/queue/iostats" % dmdev + if map(int, file(stats_switch).read().rstrip()) == 0: + os.system("echo 1 > /sys/block/%s/queue/iostats" % dmdev) + + print ("%s/%s %s") % (devices[dmdev][0],devices[dmdev][1], stats[dmdev]) + + + + + +# BUGS: this script uses stat and open/read/close on each lvm volume. +# in large-scale systems this is quite inefficient. +# OTOH systems of that scale typically use VxVM instead of LVM.

12 years, 3 months

Check_MK Git: check_mk: printer_alerts: new configuration variable printer_alerts_text_map

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af337e558b8fecbb5ee93bc81722f84c7bab2dd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af337e558b8fec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 10:31:45 2012 +0200 printer_alerts: new configuration variable printer_alerts_text_map --- ChangeLog | 2 ++ checkman/printer_alerts | 10 ++++++++++ checks/printer_alerts | 22 ++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a982db3..a986b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,8 @@ * FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name * New active check via WATO: check_ldap + * printer_alerts: new configuration variable printer_alerts_text_map. Make + 'Energiesparen' on Brother printers an OK state. BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checkman/printer_alerts b/checkman/printer_alerts index 85ab277..b217657 100644 --- a/checkman/printer_alerts +++ b/checkman/printer_alerts @@ -23,9 +23,19 @@ examples: 0: [ 4, 6, 7, 19, 20, 23, 24, 25, 27, 35, 36, 37, 38, 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, 1503, 1504, 1505, 1506, 1509 ], } + # Make 'Energiesparen' an OK state + printer_alerts_text_map = { + 'Energiesparen' : 0, + } + [configuration] printer_alerts_state_map(dict): Can be used to configure state codes reported by the printer to result in individual nagios states. This dictionary contains three elements. One for each nagios state. Each element holds a list of state codes to result in this state. Take a look at the example section to see the defaults. + +printer_alerts_text_map(dict): Some printers send a status code of {-1} in some cases. + But you can use the additional descriptive text sent by the printer for assigning + a monitoring state by using this dictionary. The key is the descriptive text. The + value is 0 (OK), 1 (WARN), 2 (CRIT) or 3 (UNKNOWN). diff --git a/checks/printer_alerts b/checks/printer_alerts index 58ba220..95ac1dc 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -70,6 +70,14 @@ printer_alerts_state_map = { 1503, 1504, 1505, 1506, 1509 ], } +# Some printers send a code of -1 but an additional text +# that allows us to generate a useful state - at the price +# of providing texts in the native language of the country +# of the printers user. +printer_alerts_text_map = { + 'Energiesparen' : 0, +} + def inventory_printer_alerts(info): return [ (None, None) ] @@ -84,10 +92,16 @@ def check_printer_alerts(_not_used, _not_used1, info): for sev, group, group_index, code, desc in info: state = 3 # UNKNOWN + if desc in printer_alerts_text_map: + state = printer_alerts_text_map[desc] + sum_txt.append("%s - %s" % (nagios_state_names[state], desc)) + break + for s in [ 2, 1, 0 ]: if saveint(code) in printer_alerts_state_map[s]: state = s break + # Code not found -> take into account severity if state == 3 and sev == '1': state = 0 @@ -103,8 +117,11 @@ def check_printer_alerts(_not_used, _not_used1, info): elif state > sum_state: sum_state = state - sum_txt.append('%s - %s - %s (%s)' % (nagios_state_names[state], - group_txt, desc, code)) + info_text = '%s - %s - %s' % (nagios_state_names[state], group_txt, desc) + if state == 3 and code != -1: + info_text += " (code: %d)" % code + + sum_txt.append(info_text) return (sum_state, ', '.join(sum_txt)) @@ -119,6 +136,7 @@ snmp_info['printer_alerts'] = ( ".1.3.6.1.2.1.43.18.1.1", [ ] ) check_config_variables.append("printer_alerts_state_map") +check_config_variables.append("printer_alerts_text_map") snmp_scan_functions['printer_alerts'] = \ lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0753

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ae05162aed050b01f051df14a86fb8863ec1be2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae05162aed050… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 19:06:11 2012 +0200 Updated bug entries #0753 --- .bugs/753 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/753 b/.bugs/753 new file mode 100644 index 0000000..08df980 --- /dev/null +++ b/.bugs/753 @@ -0,0 +1,11 @@ +Title: Table-Layout with multiple columns: gap missing if no grouping +Component: multisite +State: open +Date: 2012-05-20 19:05:00 +Targetversion: 1.2.0 +Class: bug + +In the table layout if you select more than one column, then +there should be a small gap between the columns. This is painted, +but only when there is at least one grouping column - even if it +is not visible.

12 years, 3 months

Check_MK Git: check_mk: Remove underline from links in tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 693251b2d40a9444e6427c1c040da49fc7f99d0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=693251b2d40a94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:43:59 2012 +0200 Remove underline from links in tables --- web/htdocs/pages.css | 8 ++++++++ web/htdocs/status.css | 3 +++ web/htdocs/views.css | 3 +++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1e6dd0c..1a26870 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -267,6 +267,14 @@ table.data tr.data td { vertical-align: middle; } +table.data a { + text-decoration: none; + color: black; +} +table.data tr.data td a:hover { + text-decoration: underline; +} + table.data tr.data td.checkbox { width: 20px; text-align: center; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 67fb770..1b93c68 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -286,6 +286,9 @@ table.data td.count { font-weight: bold; font-family: sans-serif; } +table.data .state0 *, table.data .state2 *, table.data .state3 * { + color: white; +} table.data td.number { text-align: right; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3799fb2..9dfc07b 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -145,6 +145,9 @@ div.empty_columnswitcher { float: left; } +div.view_form { + margin-bottom: 10px; +} /*-------------------------------------------------------------------------.

12 years, 3 months

Check_MK Git: check_mk: Changed styling of data tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 159fd56f0f9d924a0765151e121b48d4a65f9b55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=159fd56f0f9d92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:59:31 2012 +0200 Changed styling of data tables (omit horizontal borders) --- web/htdocs/pages.css | 3 ++- web/htdocs/status.css | 4 ++-- web/htdocs/wato.css | 2 +- web/htdocs/wato.py | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1a26870..31f98e5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -261,7 +261,8 @@ table.data th.tablegap { } table.data tr.data td { - border: 1px solid #bbb; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; padding: 2px 4px; height: 22px; vertical-align: middle; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 1b93c68..350f3c6 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -225,8 +225,8 @@ tr.even1 { background-color: #ffa; } tr.odd2 { background-color: #fcc; } tr.even2 { background-color: #faa; } -tr.odd3 { background-color: #fda; } -tr.even3 { background-color: #fea; } +tr.odd3 { background-color: #ffe0a0; } +tr.even3 { background-color: #ffefaf; } /* Row headers in single dataset layout */ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 6b9791d..e64873c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,7 +45,7 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { - /* box-shadow: 0 0 3px #334488; */ + box-shadow: 0 0 3px #334488; width: auto; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 51ad0db..87016d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1164,9 +1164,9 @@ def show_hosts(folder): # Helper function for showing bulk actions. This is needed at the bottom # of the table of hosts and - if there are more than just a few - also # at the top of the table. - def bulk_actions(at_least_one_imported, top, colspan): + def bulk_actions(at_least_one_imported, top, colspan, odd): # bulk actions - html.write('<tr class="data odd0">') + html.write('<tr class="data %s0">' % odd) html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') html.write("</td><td class=bulksearch colspan=2>") @@ -1228,7 +1228,7 @@ def show_hosts(folder): # list shows more than 10 rows if more_than_ten_items and \ (config.may("wato.edit_hosts") or config.may("wato.manage_hosts")): - bulk_actions(at_least_one_imported, True, colspan) + bulk_actions(at_least_one_imported, True, colspan, "even") # Header line html.write("<tr><th class=left></th><th></th><th>" @@ -1349,7 +1349,7 @@ def show_hosts(folder): html.write("</tr>\n") if config.may("wato.edit_hosts") or config.may("wato.manage_hosts"): - bulk_actions(at_least_one_imported, False, colspan) + bulk_actions(at_least_one_imported, False, colspan, odd) html.write("</table>\n") html.hidden_fields()

12 years, 3 months

Check_MK Git: check_mk: Better layout for checkbox button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08b7603aa6406de29bf479cd3b0a008524e688a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b7603aa6406d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:26:39 2012 +0200 Better layout for checkbox button --- web/htdocs/js/checkmk.js | 35 +++++++++++++++++++++++++---------- web/htdocs/views.py | 13 +++++++++++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d467597..7267e72 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1626,21 +1626,36 @@ function view_toggle_form(oButton, idForm) { } -/* Switch number of view columns, refresh and checkboxes */ +/* Switch number of view columns, refresh and checkboxes. If the + choices are missing, we do a binary toggle. */ gColumnSwitchTimeout = null; function view_switch_option(oDiv, viewname, option, choices) { var current_title = oDiv.firstChild.innerHTML; - var new_choice = choices[0]; // in case not contained in choices - for (var c=0; c<choices.length; c++) { - choice = choices[c]; - val = choice[0]; - title = choice[1]; - if (current_title == title) { - var new_choice = choices[(c+1) % choices.length]; - break; + if (choices) { + var new_choice = choices[0]; // in case not contained in choices + for (var c=0; c<choices.length; c++) { + choice = choices[c]; + val = choice[0]; + title = choice[1]; + if (current_title == title) { + var new_choice = choices[(c+1) % choices.length]; + break; + } } + oDiv.firstChild.innerHTML = "" + new_choice[1]; } - oDiv.firstChild.innerHTML = "" + new_choice[1]; + else { + if (oDiv.className.indexOf('down') != -1) { + new_value = false; + oDiv.className = 'columnswitcher'; + } + else { + new_value = true; + oDiv.className = 'columnswitcher down'; + } + new_choice = [ new_value, '' ]; + } + get_url_sync("ajax_set_viewoption.py?view_name=" + viewname + "&option=" + option + "&value=" + new_choice[0]); if (option == "refresh") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1040912..4785f85 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1535,6 +1535,16 @@ def view_option_switcher(view, option, choices): 'onclick="view_switch_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( view["name"], option, choices, title)) +def view_option_toggler(view, option, title): + vo = view_options(view["name"]) + value = vo.get(option, view.get(option, False)) + html.begin_context_buttons() # just to be sure + html.write('<div class="columnswitcher %s"' + 'onclick="view_switch_option(this, \'%s\', \'%s\');"><div>%s</div></div>' % ( + value and "down" or "", view["name"], option, title)) + + + # Will be called when the user presses the upper button, in order # to persist the new setting - and to make it active before the # browser reload of the DIV containing the actual status data is done. @@ -1594,8 +1604,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'C' in display_options: if command_form: toggle_button("commands", False, "commands", _("Execute commands on hosts, services and other objects")) - choices = [ [ False, 'O' ], [ True, 'X' ] ] - view_option_switcher(thisview, "show_checkboxes", choices) + view_option_toggler(thisview, "show_checkboxes", "X") else: empty_toggle_button() empty_toggle_button()

12 years, 3 months

Check_MK Git: check_mk: Fixed layout problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 215764dc7fa779900fd14f83503531f92b3382ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=215764dc7fa779… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:33:30 2012 +0200 Fixed layout problems --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/pages.css | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 884c09e..c4b1808 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -839,8 +839,8 @@ class html: if self.req.header_sent: self.bottom_focuscode() corner_text = "" - # if self.browser_reload: - # corner_text += _("refresh: %s secs") % self.browser_reload + if self.browser_reload: + corner_text += _("refresh: %s secs") % self.browser_reload if self.render_headfoot: si = self.render_status_icons() self.write("<table class=footer><tr>" diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0bf7d7f..1e6dd0c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -271,6 +271,10 @@ table.data tr.data td.checkbox { width: 20px; text-align: center; } +table.data tr.data td.checkbox input { + margin: 0px; +} + table.data th input.checkgroup { height: 12px; width: 16px;

12 years, 3 months

Check_MK Git: check_mk: Redesign of views filter bar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0acf2ee8202108c073ad1f0bcfea018038531a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0acf2ee8202108… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:17:01 2012 +0200 Redesign of views filter bar --- ChangeLog | 1 + web/htdocs/images/columnswitcher.png | Bin 702 -> 741 bytes web/htdocs/images/columnswitcher_down.png | Bin 671 -> 648 bytes web/htdocs/images/columnswitcher_hi.png | Bin 720 -> 748 bytes web/htdocs/images/icon_commands.png | Bin 0 -> 2981 bytes web/htdocs/images/icon_filter.png | Bin 0 -> 3885 bytes web/htdocs/images/icon_painteroptions.png | Bin 0 -> 5111 bytes web/htdocs/js/checkmk.js | 65 ++++---- web/htdocs/sidebar.css | 2 +- web/htdocs/views.css | 165 +++++-------------- web/htdocs/views.py | 267 +++++++++++------------------ web/plugins/views/filters.py | 2 +- 12 files changed, 179 insertions(+), 323 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0acf2ee820…

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0752

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fd7406828ccff2616bcc8f902654fc37666f6ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fd7406828ccff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 15:58:39 2012 +0200 Updated bug entries #0752 --- .bugs/752 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/752 b/.bugs/752 new file mode 100644 index 0000000..1969811 --- /dev/null +++ b/.bugs/752 @@ -0,0 +1,9 @@ +Title: Opera: Globes are only displayed half +Component: multisite +State: open +Date: 2012-05-20 15:58:01 +Targetversion: 1.2.0 +Class: bug + +Only the right half of the actual data is being displayed. +Maybe Opera has problems with negative values somewhere.

12 years, 3 months

Check_MK Git: check_mk: Views: move edit button into context button area

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 670628cc7535e7f33f8ad3a659f7aadc737c8909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=670628cc7535e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 19 12:46:25 2012 +0200 Views: move edit button into context button area --- web/htdocs/views.py | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 99b196a..6fcc20a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -548,7 +548,7 @@ def page_edit_view(): "view that has the same link name as a builtin view, then your " "view will override that (shadowing it).")) - forms.section(_("Datasource")) + forms.section(_("Datasource"), simple=True) datasource_title = multisite_datasources[datasourcename]["title"] html.write("%s: <b>%s</b><br>\n" % (_('Datasource'), datasource_title)) html.hidden_field("datasource", datasourcename) @@ -585,7 +585,7 @@ def page_edit_view(): html.write(_(" seconds")) html.help(_("Leave this empty or at 0 for now automatic reload.")) - forms.section(_("Audible alarm sounds")) + forms.section(_("Audible alarm sounds"), simple=True) html.checkbox("play_sounds", False, label=_("Play alarm sounds")) html.help(_("If enabled and the view shows at least one host or service problem " "the a sound will be played by the browser. Please consult the %s for details.") @@ -692,10 +692,10 @@ def page_edit_view(): ("pergroup", _("once per group")), ("repeat", _("repeat every 20'th row")) ]) - forms.section(_('Sortable by user')) + forms.section(_('Sortable by user'), simple=True) html.checkbox('user_sortable', True, label=_("Make view sortable by user")) - forms.section(_('Checkboxes')) + forms.section(_('Checkboxes'), simple=True) html.checkbox('show_checkboxes', False, label=_("Show checkboxes for selecting rows")) forms.end() @@ -1314,7 +1314,7 @@ def render_view(view, rows, datasource, group_painters, painters, has_done_actions = False if show_buttons and 'B' in display_options: - show_context_links(view, hide_filters) + show_context_links(view, hide_filters, display_options) # User errors in filters html.show_user_errors() @@ -1399,18 +1399,6 @@ def render_view(view, rows, datasource, group_painters, painters, html.write("<td class=gap> </td>\n") - # Customize/Edit view button - if 'E' in display_options and config.may("edit_views"): - backurl = htmllib.urlencode(html.makeuri([])) - html.write('<td class="right" onmouseover="hover_tab(this);" onmouseout="unhover_tab(this);">') - if view["owner"] == config.user_id: - html.write('<a href="edit_view.py?load_view=%s&back=%s">%s</a>\n' % - (view["name"], backurl, _('Edit'))) - else: - html.write('<a href="edit_view.py?clonefrom=%s&load_view=%s&back=%s">%s</a>\n' % - (view["owner"], view["name"], backurl, _('Edit'))) - html.write('</td>') - html.write("</tr>") html.write("</table><table class=navi><tr>\n") @@ -1641,7 +1629,7 @@ def view_linktitle(view): return t -def show_context_links(thisview, active_filters): +def show_context_links(thisview, active_filters, display_options): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container execute_hooks('buttons-begin') @@ -1665,6 +1653,16 @@ def show_context_links(thisview, active_filters): if not view.get("mobile"): html.context_button(linktitle, url=uri, icon=icon, id=buttonid, bestof=config.context_buttons_to_show) + # Customize/Edit view button + if 'E' in display_options and config.may("edit_views"): + backurl = htmllib.urlencode(html.makeuri([])) + if thisview["owner"] == config.user_id: + url = "edit_view.py?load_view=%s&back=%s" % (thisview["name"], backurl) + else: + url = "edit_view.py?clonefrom=%s&load_view=%s&back=%s" % \ + (thisview["owner"], thisview["name"], backurl) + html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) + execute_hooks('buttons-end') html.end_context_buttons()

12 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012