Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Finalized the action menu and improved popup menu positioning

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a0e0317c646bd81b277dbfe2e1c83309549969f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a0e0317c646bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 10:38:58 2015 +0200 Finalized the action menu and improved popup menu positioning --- web/htdocs/htmllib.py | 26 +++++++------ web/htdocs/images/icon_reload.gif | Bin 1852 -> 0 bytes web/htdocs/images/icon_reload.png | Bin 0 -> 3488 bytes web/htdocs/images/icon_reload_cmk.gif | Bin 1800 -> 0 bytes web/htdocs/images/icon_reload_cmk.png | Bin 0 -> 3626 bytes web/htdocs/js/checkmk.js | 46 ++++++++++++---------- web/htdocs/pages.css | 10 +++-- web/htdocs/valuespec.py | 11 +++--- web/htdocs/views.py | 69 +++++++++++++++++++++++++++++++++ web/htdocs/visuals.py | 5 ++- web/plugins/icons/builtin.py | 39 +++++++++++++------ web/plugins/pages/shipped.py | 1 + web/plugins/views/painters.py | 57 +++++++++++++++++---------- 13 files changed, 191 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a0e0317c6…

9 years, 5 months

Check_MK Git: check_mk: #2174 Added action popup to host & service views, supporting custom actions now

by Lars Michelsen

Module: check_mk Branch: master Commit: 096708dc2512715c03984b32e52a1a4782922cdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=096708dc251271… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 10:55:17 2015 +0200 #2174 Added action popup to host & service views, supporting custom actions now Each host and service has several icons showing up in the web GUI to either provide options to perform actions or visualizing the state of the object. Now we reworked the whole thing a bit by adding a popup menu which is groups together the actions for an object. This aims to reduce the number of icons shown up in list views. By default the icon column is now showing the popup menu trigger icon which can be left clicked to open the popup menu and the graph icon if a host or service has performance data available. The column is also showing all state related icons. Former versions already allowed users to extend the web GUI with so called in python written icon plugins. This is still possible. But now, we added the option to easily configure basic actions using WATO. The configuration is split into two steps: a) You need to basically configure your custom actions This is done via the option <i>Custom icons and actions</i> which can be found in the <i>Status GUI (Multisite)</i> tab of the <i>Global Settings</i>. First you need to choose an unique identifier for your action. Then you can either configure simple icons providing some kind of information, for example the type of the system, by configuring just an icon and the title. If you like to add a custom action, for example a link to the web interface of one of your devices, you can configure an action URL where you can use some basic macros: <ul> <li>$HOSTNAME$: Contains the name of the host</li> <li>$SERVICEDESC$: Contains the service description (in case this is a service)</li> <li>$HOSTADDRESS$: Contains the network address of the host</li> </ul> b) Assign the actions to your objects After you configured at least one custom action, you can use the rules <i>Custom icons or actions for hosts in status GUI</i> and <i>Custom icons or actions for services in status GUI</i> to assign your custom actions to your hosts and services. --- .werks/2174 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 1 + 2 files changed, 54 insertions(+) diff --git a/.werks/2174 b/.werks/2174 new file mode 100644 index 0000000..a1827e8 --- /dev/null +++ b/.werks/2174 @@ -0,0 +1,53 @@ +Title: Added action popup to host & service views, supporting custom actions now +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1428914435 +Class: feature + +Each host and service has several icons showing up in the web GUI to either +provide options to perform actions or visualizing the state of the object. + +Now we reworked the whole thing a bit by adding a popup menu which is groups +together the actions for an object. This aims to reduce the number of icons +shown up in list views. + +By default the icon column is now showing the popup menu trigger icon which +can be left clicked to open the popup menu and the graph icon if a host or +service has performance data available. The column is also showing all state +related icons. + +Former versions already allowed users to extend the web GUI with so called +in python written icon plugins. This is still possible. +But now, we added the option to easily configure basic actions using WATO. +The configuration is split into two steps: + +a) You need to basically configure your custom actions + +This is done via the option <i>Custom icons and actions</i> which +can be found in the <i>Status GUI (Multisite)</i> tab of the <i>Global +Settings</i>. + +First you need to choose an unique identifier for your action. + +Then you can either configure simple icons providing some kind +of information, for example the type of the system, by configuring just +an icon and the title. + +If you like to add a custom action, for example a link to the web interface +of one of your devices, you can configure an action URL where you can use +some basic macros: + +<ul> +<li>$HOSTNAME$: Contains the name of the host</li> +<li>$SERVICEDESC$: Contains the service description (in case this is a service)</li> +<li>$HOSTADDRESS$: Contains the network address of the host</li> +</ul> + +b) Assign the actions to your objects + +After you configured at least one custom action, you can use the rules +<i>Custom icons or actions for hosts in status GUI</i> and +<i>Custom icons or actions for services in status GUI</i> to assign +your custom actions to your hosts and services. diff --git a/ChangeLog b/ChangeLog index 295a7a3..67c6bdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -330,6 +330,7 @@ * 2042 Services are now sorted in a natural way, this affects services containing numbers... * 2140 Remove PNP Timeranges from range selection, put these ranges directly into the list... * 2166 LDAP: Multiple LDAP groups can be configured for assigning single roles to users... + * 2174 Added action popup to host & service views, supporting custom actions now... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views

9 years, 5 months

Check_MK Git: check_mk: Some internal code cleanup; Made existing " add to visual" popup menus more generic

by Lars Michelsen

Module: check_mk Branch: master Commit: 74d7289a7970aae905ecb08c306312b7558b1ac3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d7289a7970aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 15:29:39 2015 +0100 Some internal code cleanup; Made existing "add to visual" popup menus more generic --- web/htdocs/htmllib.py | 67 +++++++++++++----------- web/htdocs/js/checkmk.js | 126 ++++++++++++++++++---------------------------- web/htdocs/pages.css | 8 +-- 3 files changed, 93 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=74d7289a79…

9 years, 5 months

Check_MK Git: check_mk: Started rewrite of icon selector

by Lars Michelsen

Module: check_mk Branch: master Commit: eaa72595d563e55ea95678b1aaa388cf44d29d90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa72595d563e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 15:31:34 2015 +0100 Started rewrite of icon selector --- web/htdocs/valuespec.py | 21 ++++++++++++--------- web/htdocs/views.py | 18 ++++++++++++++++++ web/plugins/icons/builtin.py | 19 +++++++++++++++++++ web/plugins/pages/shipped.py | 3 +++ web/plugins/views/painters.py | 6 +++++- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ba7e31e..03373a9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3241,14 +3241,19 @@ class IconSelector(ValueSpec): if not value: value = self._empty_img - html.write('<div class="popup_container">') html.hidden_field(varprefix + "_value", value or '', varprefix + "_value", add_var = True) - self.render_icon(value, 'toggle_popup(event, \'%s\')' % varprefix, - _('Choose another Icon'), id = varprefix + '_img') - if not value: - html.write('<a href="javascript:void(0)" onclick="toggle_popup(event, \'%s\')">%s</a>' % - (varprefix, _('Select an Icon'))) - html.write('<div id="%s_popup" class="popup" style="display:none">' % varprefix) + + html.begin_popup_trigger('icon_selector', + params=html.urlencode_vars([('value', value), + ('varprefix', varprefix), + ('allow_empty', self._allow_empty and '1' or '0')])) + if value: + self.render_icon(value, '', _('Choose another Icon'), id = varprefix + '_img') + else: + html.write(_('Select an Icon')) + html.end_popup_trigger() + + def render_popup_input(self, varprefix, value): html.write('<table>') empty = self._allow_empty and ['empty'] or [] for nr, icon in enumerate(empty + self.available_icons()): @@ -3264,8 +3269,6 @@ class IconSelector(ValueSpec): html.write('</td>') html.write('</tr>') html.write('</table>') - html.write('</div>') - html.write('</div>') def from_html_vars(self, varprefix): icon = html.var(varprefix + '_value') diff --git a/web/htdocs/views.py b/web/htdocs/views.py index aa617d0..bfbbe93 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2409,4 +2409,22 @@ def ajax_inv_render_tree(): else: render_inv_subtree_container(hostname, tree_id, invpath, node) +#. +# .--Icon Selector-------------------------------------------------------. +# | ___ ____ _ _ | +# | |_ _|___ ___ _ __ / ___| ___| | ___ ___| |_ ___ _ __ | +# | | |/ __/ _ \| '_ \ \___ \ / _ \ |/ _ \/ __| __/ _ \| '__| | +# | | | (_| (_) | | | | ___) | __/ | __/ (__| || (_) | | | +# | |___\___\___/|_| |_| |____/ \___|_|\___|\___|\__\___/|_| | +# | | +# +----------------------------------------------------------------------+ +# | AJAX API call for rendering the icon selector | +# '----------------------------------------------------------------------' + +def ajax_popup_icon_selector(): + varprefix = html.var('varprefix') + value = html.var('value') + allow_empty = html.var('allow_empty') == '1' + vs = IconSelector(allow_empty=allow_empty) + vs.render_popup_input(varprefix, value) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 721bcee..8ad6d68 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -57,6 +57,25 @@ # 'paint': paint_icon_image, #}) +# .--Action Menu---------------------------------------------------------. +# | _ _ _ __ __ | +# | / \ ___| |_(_) ___ _ __ | \/ | ___ _ __ _ _ | +# | / _ \ / __| __| |/ _ \| '_ \ | |\/| |/ _ \ '_ \| | | | | +# | / ___ \ (__| |_| | (_) | | | | | | | | __/ | | | |_| | | +# | /_/ \_\___|\__|_|\___/|_| |_| |_| |_|\___|_| |_|\__,_| | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +def paint_action_menu(): + pass + return 'open_menu', 'onclick:' + +multisite_icons.append({ + 'columns': [], + 'paint': paint_action_menu, +}) # +----------------------------------------------------------------------+ # | ____ _ _ _ | diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index f50e3d2..9c187ed 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -103,6 +103,9 @@ pagehandlers.update({ "ajax_userdb_sync" : userdb.ajax_sync, "notify" : notify.page_notify, + "ajax_inv_render_tree" : views.ajax_inv_render_tree, + "ajax_popup_icon_selector" : views.ajax_popup_icon_selector, + "webapi" : webapi.page_api, "crashed_check" : crashed_check.page_crashed_check, diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2f3c5ff..dd65b9d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -189,7 +189,11 @@ def paint_icons(what, row): if html.output_format == "html": if link: - output += '<a href="%s">' % link + onclick = '' + if link.startswith('onclick:'): + onclick = ' onclick="%s"' % link[8:] + link = 'javascript:void(0)' + output += '<a href="%s"%s>' % (link, onclick) output += html.render_icon(icon_name, title) if link: output += '</a>'

9 years, 5 months

Check_MK Git: check_mk: continued rewriting icon selector

by Lars Michelsen

Module: check_mk Branch: master Commit: 6457828f66bdba467b0928faed1a805e98b5a459 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6457828f66bdba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 16:28:55 2015 +0100 continued rewriting icon selector --- web/htdocs/valuespec.py | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 03373a9..a5dbff9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3188,28 +3188,39 @@ class IconSelector(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._prefix = kwargs.get('prefix', 'icon_') - self._subdir = kwargs.get('subdir', '') - self._num_cols = kwargs.get('num_cols', 12) self._allow_empty = kwargs.get('allow_empty', True) - if self._subdir: - self._html_path = os.path.join('images', self._subdir) - else: - self._html_path = 'images' - self._empty_img = kwargs.get('emtpy_img', 'empty') + self._html_path = 'images/icons' + self._empty_img = kwargs.get('emtpy_img', 'empty') self._exclude = [ 'trans', 'empty', ] + # Mapping table to put icons into categories etc. + # FIXME: Need specification file or some plugin mechanism + self._icons = [ + 'logos': (_('Logos'), [ + 'windows', + 'linux', + 'cisco', + 'checkmk', + 'ooo_gulls', + 'acroread', + ], + 'misc': (_('Misc'), [ + + ], + ] + def available_icons(self): if defaults.omd_root: dirs = [ - os.path.join(defaults.omd_root, "local/share/check_mk/web/htdocs/images", self._subdir), - os.path.join(defaults.omd_root, "share/check_mk/web/htdocs/images", self._subdir), + os.path.join(defaults.omd_root, "local/share/check_mk/web/htdocs/images/icons"), + os.path.join(defaults.omd_root, "share/check_mk/web/htdocs/images/icons"), ] else: - dirs = [ os.path.join(defaults.web_dir, "htdocs/images", self._subdir) ] + dirs = [ os.path.join(defaults.web_dir, "htdocs/images/icons") ] icons = set([]) for dir in dirs: @@ -3254,21 +3265,13 @@ class IconSelector(ValueSpec): html.end_popup_trigger() def render_popup_input(self, varprefix, value): - html.write('<table>') + html.write('<div class="icons">') empty = self._allow_empty and ['empty'] or [] for nr, icon in enumerate(empty + self.available_icons()): - if nr == 0: - html.write('<tr>') - elif nr % self._num_cols == 0: - html.write('</tr><tr>') - - html.write('<td>') self.render_icon(icon, onclick = 'vs_iconselector_select(event, \'%s\', \'%s\')' % (varprefix, icon), - title = _('Choose this Icon'), id = varprefix + '_i_' + icon) - html.write('</td>') - html.write('</tr>') - html.write('</table>') + title = _('Choose this icon'), id = varprefix + '_i_' + icon) + html.write('</div>') def from_html_vars(self, varprefix): icon = html.var(varprefix + '_value')

9 years, 5 months

Check_MK Git: check_mk: Processed with icon selector

by Lars Michelsen

Module: check_mk Branch: master Commit: a4e9872e3097f798a11ae60aaf1e8948d88ea6c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e9872e3097f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 27 15:40:55 2015 +0100 Processed with icon selector --- doc/helpers/add-icon-category | 23 ++++++++ web/htdocs/images/icons/acroread.png | Bin 3926 -> 3975 bytes web/htdocs/images/icons/checkmk.png | Bin 2062 -> 2052 bytes web/htdocs/images/icons/cisco.png | Bin 1271 -> 1310 bytes web/htdocs/images/icons/empty.png | Bin 0 -> 132 bytes web/htdocs/images/icons/linux.png | Bin 2878 -> 2918 bytes web/htdocs/images/icons/ooo_gulls.png | Bin 3432 -> 3486 bytes web/htdocs/images/icons/windows.png | Bin 812 -> 846 bytes web/htdocs/js/checkmk.js | 20 +++++++ web/htdocs/pages.css | 45 +++++++++++++++ web/htdocs/valuespec.py | 97 ++++++++++++++++++++++++--------- 11 files changed, 158 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a4e9872e30…

9 years, 5 months

Check_MK Git: check_mk: icon selector wird auch in host/ service icons genutzt

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b3e0edaab0943bea8031a512b424cf2025eff35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b3e0edaab0943… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 30 15:52:23 2015 +0200 icon selector wird auch in host/service icons genutzt --- web/htdocs/valuespec.py | 20 ++++--- web/plugins/wato/check_mk_configuration.py | 85 +++++----------------------- 2 files changed, 24 insertions(+), 81 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index bd2b677..36868ac 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3266,13 +3266,17 @@ class IconSelector(ValueSpec): return icon_categories def render_icon(self, icon, onclick = '', title = '', id = ''): + if not icon: + icon = self._empty_img path = "%s/%s%s.png" % (self._html_path, self._prefix, html.attrencode(icon)) + icon = '' if onclick: - html.write('<a href="javascript:void(0)" onclick="%s">' % onclick) - html.write('<img align=absmiddle id="%s" class=icon title="%s" src="%s">' % (id, title, path)) + icon += '<a href="javascript:void(0)" onclick="%s">' % onclick + icon += '<img align=absmiddle id="%s" class=icon title="%s" src="%s">' % (id, title, path) if onclick: - html.write('</a>') + icon += '</a>' + return icon def render_input(self, varprefix, value): if not value: @@ -3285,7 +3289,7 @@ class IconSelector(ValueSpec): ('varprefix', varprefix), ('allow_empty', self._allow_empty and '1' or '0')])) if value: - self.render_icon(value, '', _('Choose another Icon'), id = varprefix + '_img') + html.write(self.render_icon(value, '', _('Choose another Icon'), id = varprefix + '_img')) else: html.write(_('Select an Icon')) html.end_popup_trigger() @@ -3314,9 +3318,9 @@ class IconSelector(ValueSpec): display = active_category != category_name and ' style="display:none"' or '' html.write('<div%s id="%s_%s_container" class="%s_container">' % (display, varprefix, category_name, varprefix)) for nr, icon in enumerate(empty + icons): - self.render_icon(icon, + html.write(self.render_icon(icon, onclick = 'vs_iconselector_select(event, \'%s\', \'%s\')' % (varprefix, icon), - title = _('Choose this icon'), id = varprefix + '_i_' + icon) + title = _('Choose this icon'), id = varprefix + '_i_' + icon)) html.write('</div>') if self._upload: @@ -3328,8 +3332,6 @@ class IconSelector(ValueSpec): html.write('</div>') html.write('</div>') - - def from_html_vars(self, varprefix): icon = html.var(varprefix + '_value') if icon == 'empty': @@ -3338,7 +3340,7 @@ class IconSelector(ValueSpec): return icon def value_to_text(self, value): - self.render_icon(value) + return self.render_icon(value) def validate_datatype(self, value, varprefix): if value is not None and type(value) != str: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9dada8c..f368f48 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2133,72 +2133,10 @@ register_rule(group, "will also be reflected in the past.")), itemtype = "service") -class MonitoringIcon(ValueSpec): - def __init__(self, **kwargs): - ValueSpec.__init__(self, **kwargs) - - def available_icons(self): - if defaults.omd_root: - dirs = [ defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons", - defaults.omd_root + "/share/check_mk/web/htdocs/images/icons" ] - else: - dirs = [ defaults.web_dir + "/htdocs/images/icons" ] - - icons = [] - for dir in dirs: - if os.path.exists(dir): - icons += [ i for i in os.listdir(dir) - if '.' in i and os.path.isfile(dir + "/" + i) ] - icons.sort() - return icons - - def render_input(self, varprefix, value): - if value is None: - value = "" - num_columns = 12 - html.write("<table>") - for nr, filename in enumerate([""] + self.available_icons()): - if nr % num_columns == 0: - html.write("<tr>") - html.write("<td>") - html.radiobutton(varprefix, str(nr), value == filename, - self.value_to_text(filename)) - html.write("  </td>") - if nr % num_columns == num_columns - 1: - html.write("</tr>") - if nr != num_columns - 1: - html.write("</tr>") - html.write("</table>") - - def value_to_text(self, value): - if value: - return '<img align=middle title="%s" class=icon src="images/icons/%s">' % \ - (value, value) - else: - return _("none") - - def from_html_vars(self, varprefix): - nr = int(html.var(varprefix)) - if nr == 0: - return None - else: - return self.available_icons()[nr-1] - - def validate_datatype(self, value, varprefix): - if value is not None and type(value) != str: - raise MKUserError(varprefix, _("The type is %s, but should be str") % - type(value)) - - def validate_value(self, value, varprefix): - if value and value not in self.available_icons(): - raise MKUserError(varprefix, _("The selected icon image does not exist.")) - ValueSpec.custom_validate(self, value, varprefix) - - register_rule(group, "extra_host_conf:icon_image", - MonitoringIcon( + IconSelector( title = _("Icon image for hosts in status GUI"), help = _("You can assign icons to hosts for the status GUI. " "Put your images into <tt>%s</tt>. ") % @@ -2207,21 +2145,24 @@ register_rule(group, or defaults.web_dir + "/htdocs/images/icons" ), )) + register_rule(group, "extra_service_conf:icon_image", - MonitoringIcon( - title = _("Icon image for services in status GUI"), - help = _("You can assign icons to services for the status GUI. " - "Put your images into <tt>%s</tt>. ") % - ( defaults.omd_root - and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" - or defaults.web_dir + "/htdocs/images/icons" ), + Transform( + IconSelector( + title = _("Icon image for services in status GUI"), + help = _("You can assign icons to services for the status GUI. " + "Put your images into <tt>%s</tt>. ") % + ( defaults.omd_root + and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" + or defaults.web_dir + "/htdocs/images/icons" ), ), + forth = lambda v: v and v[:-4] or v, + back = lambda v: v and v+'.png' or v, + ), itemtype = "service") - - register_rulegroup("agent", _("Access to Agents"), _("Settings concerning the connection to the Check_MK and SNMP agents"))

9 years, 5 months

Check_MK Git: check_mk: Added icon upload

by Lars Michelsen

Module: check_mk Branch: master Commit: d3cfc01588cdadff582c5bc2cf706cce377ed4ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3cfc01588cdad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 30 14:09:12 2015 +0200 Added icon upload --- web/htdocs/pages.css | 13 +++++-- web/htdocs/valuespec.py | 29 +++++++++++----- web/htdocs/views.py | 78 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/pages/shipped.py | 2 ++ 4 files changed, 112 insertions(+), 10 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index c9d876b..d8d28b0 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -976,8 +976,8 @@ body.main table.footer .popup_menu a:hover { #popup_menu .icons li a:hover { text-decoration: none; - color:#779D2A; - background-color: #fbfbfb; + background-color: #629BB1; + color: #fff; } #popup_menu .icons li.active a { @@ -1000,6 +1000,15 @@ body.main table.footer .popup_menu a:hover { height: 20px; } +body.icon_upload { + background: transparent; +} + +body.icon_upload div.error, +body.icon_upload div.success { + margin: 0; +} + /*--Various----------------------------------------------------------------. | __ __ _ | | \ \ / /_ _ _ __(_) ___ _ _ ___ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1b5cfc8..bd2b677 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3174,8 +3174,9 @@ class FileUpload(ValueSpec): return '' def validate_value(self, value, varprefix): - if not self._allow_empty and value == None: + if not self._allow_empty and (value == None or value[0] == ''): raise MKUserError(varprefix, _('Please select a file.')) + self.custom_validate(value, varprefix) def render_input(self, varprefix, value): html.upload_file(varprefix) @@ -3185,24 +3186,25 @@ class FileUpload(ValueSpec): return html.uploaded_file(varprefix) class IconSelector(ValueSpec): + _categories = [ + ('logos', _('Logos')), + ('parts', _('Parts')), + ('misc', _('Misc')), + ] + def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._prefix = kwargs.get('prefix', '') self._allow_empty = kwargs.get('allow_empty', True) self._html_path = 'images/icons' self._empty_img = kwargs.get('emtpy_img', 'empty') + self._upload = kwargs.get('upload', True) self._exclude = [ 'trans', 'empty', ] - self._categories = [ - ('logos', _('Logos')), - ('parts', _('Parts')), - ('misc', _('Misc')), - ] - # All icons within the images/icons directory have the ident of a category # witten in the PNG meta data. For the default images we have done this scripted. # During upload of user specific icons, the meta data is added to the images. @@ -3297,7 +3299,8 @@ class IconSelector(ValueSpec): # Render tab navigation html.write('<ul>') - for category_name, category_alias, icons in available_icons: + upload = self._upload and [('upload', _('Upload'), [])] or [] + for category_name, category_alias, icons in available_icons + upload: active = active_category == category_name and ' class="active"' or '' html.write('<li%s>' % active) html.write('<a id="%s_%s_nav" class="%s_nav" href="javascript:vs_iconselector_toggle(\'%s\', \'%s\')">%s</a>' % @@ -3315,8 +3318,18 @@ class IconSelector(ValueSpec): onclick = 'vs_iconselector_select(event, \'%s\', \'%s\')' % (varprefix, icon), title = _('Choose this icon'), id = varprefix + '_i_' + icon) html.write('</div>') + + if self._upload: + html.write('<div style="display:none" id="%s_%s_container" class="%s_container">' % + (varprefix, 'upload', varprefix)) + html.write('<iframe allowTransparency="true" frameborder="0" width="100%" height="100%" ' + 'src="icon_upload.py">') + html.write('</iframe>') + html.write('</div>') html.write('</div>') + + def from_html_vars(self, varprefix): icon = html.var(varprefix + '_value') if icon == 'empty': diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bfbbe93..d32c022 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2428,3 +2428,81 @@ def ajax_popup_icon_selector(): vs = IconSelector(allow_empty=allow_empty) vs.render_popup_input(varprefix, value) + +def validate_icon(value, varprefix): + from PIL import Image + from StringIO import StringIO + file_name, mime_type, content = value + if file_name[-4:] != '.png' \ + or mime_type != 'image/png' \ + or not content.startswith('\x89PNG'): + raise MKUserError(varprefix, _('Please choose a PNG icon.')) + + try: + im = Image.open(StringIO(content)) + except IOError: + raise MKUserError(varprefix, _('Please choose a valid PNG icon.')) + + w, h = im.size + if w > 80 or h > 80: + raise MKUserError(varprefix, _('Maximum image size: 80x80px')) + +def page_icon_upload(): + vs_upload = Tuple( + title = _('Icon'), + elements = [ + FileUpload( + title = _('Icon'), + allow_empty = False, + validate = validate_icon, + ), + DropdownChoice( + title = _('Category'), + choices = IconSelector._categories, + no_preselect = True, + ) + ] + ) + + html.set_render_headfoot(False) + # FIXME: Hack. Make this possible without the html.var + html.set_var('_body_class', 'icon_upload') + html.header(_('Icon Upload'), stylesheets=['pages', 'views', 'status']) + + if html.var('save') and html.check_transaction(): + try: + icon_info = vs_upload.from_html_vars('upload_icon') + vs_upload.validate_value(icon_info, 'upload_icon') + + # Now add the icon category to the PNG comment + from PIL import Image, PngImagePlugin + from StringIO import StringIO + im = Image.open(StringIO(icon_info[0][2])) + im.info['Comment'] = icon_info[1] + meta = PngImagePlugin.PngInfo() + for k,v in im.info.iteritems(): + if k not in ('interlace', 'gamma', 'dpi', 'transparency', 'aspect'): + meta.add_text(k, v, 0) + + # and finally save the image + if defaults.omd_root: + dest_dir = "%s/local/share/check_mk/web/htdocs/images/icons" % defaults.omd_root + else: + dest_dir = "%s/htdocs/images/icons" % defaults.web_dir + make_nagios_directories(dest_dir) + im.save(dest_dir+'/'+icon_info[0][0], 'PNG', pnginfo=meta) + + html.message(_('Upload succeeded.')) + + except MKUserError, e: + html.write('<div class=error>%s</div>\n' % e.message) + html.add_user_error(e.varname, e.message) + + html.begin_form('upload_icon', method='POST') + vs_upload.render_input('upload_icon', None) + + html.button('save', _('Upload'), 'submit') + + html.hidden_fields() + html.end_form() + html.footer() diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 9c187ed..7055f4f 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -104,7 +104,9 @@ pagehandlers.update({ "notify" : notify.page_notify, "ajax_inv_render_tree" : views.ajax_inv_render_tree, + "ajax_popup_icon_selector" : views.ajax_popup_icon_selector, + "icon_upload" : views.page_icon_upload, "webapi" : webapi.page_api,

9 years, 5 months

Check_MK Git: check_mk: Small improved layout of icon selector

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b03293eb6ebba490dd0872f6b060d43e53706b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b03293eb6ebba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 27 16:11:38 2015 +0100 Small improved layout of icon selector --- web/htdocs/images/icons/5floppy_mount.png | Bin 2952 -> 3004 bytes web/htdocs/images/icons/5floppy_unmount.png | Bin 1792 -> 1961 bytes web/htdocs/images/icons/background.png | Bin 3169 -> 3292 bytes web/htdocs/images/icons/cdaudio_mount.png | Bin 4161 -> 4203 bytes web/htdocs/images/icons/cdaudio_unmount.png | Bin 4287 -> 4355 bytes web/htdocs/images/icons/cpu.png | Bin 4356 -> 4003 bytes web/htdocs/images/icons/filesystem.png | Bin 2207 -> 1963 bytes web/htdocs/images/icons/gnome_apps.png | Bin 4452 -> 4508 bytes web/htdocs/images/icons/input_devices_settings.png | Bin 3177 -> 3239 bytes web/htdocs/images/icons/joystick.png | Bin 3418 -> 3477 bytes web/htdocs/images/icons/kcmdevices.png | Bin 1803 -> 1926 bytes web/htdocs/images/icons/kcmmemory.png | Bin 3325 -> 3400 bytes web/htdocs/images/icons/kcmpci.png | Bin 2428 -> 2489 bytes web/htdocs/images/icons/kcmprocessor.png | Bin 3679 -> 3966 bytes web/htdocs/images/icons/kcmx.png | Bin 2984 -> 3158 bytes web/htdocs/images/icons/kdat.png | Bin 1669 -> 1817 bytes web/htdocs/images/icons/kjobviewer.png | Bin 3386 -> 3455 bytes web/htdocs/images/icons/klpq.png | Bin 3386 -> 3455 bytes web/htdocs/images/icons/kmousetool.png | Bin 3007 -> 3072 bytes web/htdocs/images/icons/krdc.png | Bin 2566 -> 2760 bytes web/htdocs/images/icons/ksim.png | Bin 4981 -> 5034 bytes web/htdocs/images/icons/ksim_cpu.png | Bin 3722 -> 4040 bytes web/htdocs/images/icons/laptop_pcmcia.png | Bin 3361 -> 3413 bytes web/htdocs/images/icons/memory.png | Bin 3325 -> 3400 bytes web/htdocs/images/icons/modem.png | Bin 2150 -> 2408 bytes web/htdocs/images/icons/mycomputer.png | Bin 4042 -> 4127 bytes web/htdocs/images/icons/netscape.png | Bin 2777 -> 2950 bytes web/htdocs/images/icons/networkdevice.png | Bin 3467 -> 3623 bytes web/htdocs/images/icons/nfs_unmount.png | Bin 2565 -> 2657 bytes web/htdocs/images/icons/opera.png | Bin 3625 -> 3695 bytes web/htdocs/images/icons/package_games.png | Bin 3561 -> 3654 bytes web/htdocs/images/icons/print_printer.png | Bin 3158 -> 3337 bytes web/htdocs/images/icons/printer.png | Bin 3386 -> 3455 bytes web/htdocs/images/icons/printer1.png | Bin 3248 -> 3348 bytes web/htdocs/images/icons/processor.png | Bin 5570 -> 6030 bytes web/htdocs/images/icons/raid.png | Bin 2475 -> 2607 bytes web/htdocs/images/icons/samba.png | Bin 3779 -> 3858 bytes web/htdocs/images/icons/scanner.png | Bin 3570 -> 3710 bytes web/htdocs/images/icons/zip_mount.png | Bin 3049 -> 3090 bytes web/htdocs/images/icons/zip_unmount.png | Bin 2167 -> 2272 bytes web/htdocs/js/checkmk.js | 4 ++-- web/htdocs/pages.css | 2 ++ web/htdocs/valuespec.py | 1 + 43 files changed, 5 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2b03293eb6…

9 years, 5 months

Check_MK Git: check_mk: wato_import.py script can now also handle tags

by Goetz Golla

Module: check_mk Branch: master Commit: 036954520ffcb2c1fa3e6a56cf2a9c0ab3008c43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036954520ffcb2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Apr 13 10:34:30 2015 +0200 wato_import.py script can now also handle tags --- doc/treasures/wato_import.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/treasures/wato_import.py b/doc/treasures/wato_import.py old mode 100755 new mode 100644 index 4502ddd..9534428 --- a/doc/treasures/wato_import.py +++ b/doc/treasures/wato_import.py @@ -32,19 +32,19 @@ try: path = os.environ.pop('OMD_ROOT') pathlokal = "~/etc/check_mk/conf.d/wato/" pathlokal = os.path.expanduser(pathlokal) - datei = open(sys.argv[1],'r') + datei = open(sys.argv[1],'r') except: print """Run this script inside a OMD site Usage: ./wato_import.py csvfile.csv CSV Example: - wato_foldername;hostname;host_alias;ipaddress|None""" + wato_foldername;hostname|tags;host_alias;(ipaddress|None)""" sys.exit() folders = {} for line in datei: - if line.startswith('#'): + if line.startswith('#') or len(line.split(',')) < 4: continue - ordner, name, alias, ipaddress = line.split(';')[:4] + ordner, name, alias, ipaddress = line.split(',')[:4] if ordner: try: os.makedirs(pathlokal+ordner) @@ -53,24 +53,25 @@ for line in datei: folders.setdefault(ordner,[]) ipaddress = ipaddress.strip() if ipaddress == "None": - ipaddress = False + ipaddress = False folders[ordner].append((name,alias,ipaddress)) datei.close() for folder in folders: - all_hosts = "" - host_attributes = "" + all_hosts = "" + host_attributes = "" ips = "" for name, alias, ipaddress in folders[folder]: + realname = name.split("|")[0] all_hosts += "'%s',\n" % (name) if ipaddress: - host_attributes += "'%s' : {'alias' : u'%s', 'ipaddress' : '%s' },\n" % (name, alias, ipaddress) - ips += "'%s' : '%s'," % ( name, ipaddress ) + host_attributes += "'%s' : {'alias' : u'%s', 'ipaddress' : '%s' },\n" % (realname, alias, ipaddress) + ips += "'%s' : '%s'," % ( realname, ipaddress ) else: - host_attributes += "'%s' : {'alias' : u'%s' },\n" % (name, alias) + host_attributes += "'%s' : {'alias' : u'%s' },\n" % (realname, alias) - ziel = open(pathlokal + folder + '/hosts.mk','w') + ziel = open(pathlokal + folder + '/hosts.mk','w') ziel.write('all_hosts += [') ziel.write(all_hosts) ziel.write(']\n\n')

9 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015