Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Add snapin page: Added missing state style; Made some strings localizable

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 309b25795648fe508259941559814173cbea496a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=309b25795648fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:50:37 2011 +0100 Add snapin page: Added missing state style; Made some strings localizable --- web/htdocs/sidebar.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 72cb751..5dedc98 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -301,9 +301,9 @@ def move_snapin(): def page_add_snapin(): if not config.may("configure_sidebar"): - raise MKGeneralException("You are not allowed to change the sidebar.") + raise MKGeneralException(_("You are not allowed to change the sidebar.")) - html.header("Available snapins", stylesheets=["pages", "sidebar"]) + html.header(_("Available snapins"), stylesheets=["pages", "sidebar", "status"]) used_snapins = [name for (name, state) in load_user_config()] addname = html.var("name")

12 years, 9 months

Check_MK Git: check_mk: Add Snapin page: Trying to prevent dragging confusions by using other click event

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c938d8dea60a08e2203942980800a2e98830418 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c938d8dea60a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:59:34 2011 +0100 Add Snapin page: Trying to prevent dragging confusions by using other click event --- ChangeLog | 1 + web/htdocs/sidebar.css | 2 +- web/htdocs/sidebar.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30d1e31..1c5c316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * Logwatch: Fixed styling of context button when acknowleding log messages * Logwatch: Implemented overview page to show all problematic logfiles * Add Snapin page: show previews of all snapins + * Add Snapin page: Trying to prevent dragging confusions by using other click event * New (hidden) button for reloading a snapin (left to the close button) BI: diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index e20873c..9f7fa2a 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -369,7 +369,7 @@ div.statebullet { div.add_snapin div.snapinadder { - padding: 8px 2px; + padding: 8px 2px 14px 2px; background-color: #9bc; -moz-border-radius: 8px; border-bottom: 1px solid #9ab; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 5dedc98..2d3757d 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -329,7 +329,7 @@ def page_add_snapin(): url = 'sidebar_add_snapin.py?name=%s&_transid=%d&pos=top' % (name, transid) html.write('<div class=snapinadder onmouseover="this.style.background=\'#cde\'; this.style.cursor=\'pointer\';" ' 'onmouseout="this.style.background=\'#9bc\' "' - 'onclick="window.location.href=\'%s\';">' % url) + 'onmousedown="window.location.href=\'%s\';return false;">' % url) html.write("<div class=snapin_preview>") html.write("<div class=clickshield></div>")

12 years, 9 months

Check_MK Git: check_mk: BI: Added new column for displaying the numeric state output

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 562e1f559d3fe5bca87c9c11857db673e5636b7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=562e1f559d3fe5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 08:44:41 2011 +0100 BI: Added new column for displaying the numeric state output --- .bugs/414 | 10 +++++++--- web/plugins/views/bi.py | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.bugs/414 b/.bugs/414 index 5f8dcdd..19e1a73 100644 --- a/.bugs/414 +++ b/.bugs/414 @@ -1,11 +1,15 @@ Title: BI: FOREACH_* auch in untergeordneten Ebenen nutzbar machen Component: bi -Benefit: 2 -State: open Cost: 4 Date: 2011-11-24 12:26:52 -Targetversion: future +State: done Class: feature +Benefit: 2 +Fun: 0 +Targetversion: future Um im BI flexibler zu sein, sollte man z.B. FOREACH_SERVICE nicht nur in der obersten Regel-Ebene nutzne können. + +2011-12-08 08:34:39: changed state open -> done +Has been implemented in 1.1.13 code for aggregation rules and services. diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 2db8c39..8a36060 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -74,6 +74,13 @@ multisite_painters["aggr_state"] = { "paint" : lambda row: paint_aggr_state_short(row["aggr_effective_state"], row["aggr_effective_state"] != row["aggr_state"]) } +multisite_painters["aggr_state_num"] = { + "title" : _("Aggregated state (number)"), + "short" : _("State"), + "columns" : [ "aggr_effective_state" ], + "paint" : lambda row: ("", str(row["aggr_effective_state"]['state'])) +} + multisite_painters["aggr_real_state"] = { "title" : _("Aggregated real state (never assumed)"), "short" : _("R.State"),

12 years, 9 months

Check_MK Git: check_mk: Added aggr_single_api view for fetching single aggregation infos via json/ python API

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfd5ae0a80521d22bb78cc0996f8649c6f8bcd6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd5ae0a80521d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 08:52:12 2011 +0100 Added aggr_single_api view for fetching single aggregation infos via json/python API --- web/plugins/views/builtin.py | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 61f8fbf..818ff24 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2436,6 +2436,37 @@ multisite_builtin_views.update({ 'topic': u'Business Intelligence', 'user_sortable': None}, +# Shows minimal information about a single aggregation which has to be set via aggr_name=<Name>. +# Use together with output_format=python for API calls +'aggr_single_api': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'bi_aggregations', + 'description': u'Single Aggregation for simple API calls. Contains the state and state output.', + 'group_painters': [], + 'hard_filters': [], + 'hard_filtervars': [], + 'hidden': True, + 'hide_filters': ['aggr_name'], + 'hidebutton': True, + 'icon': 'aggr', + 'layout': 'table', + 'linktitle': 'Single Aggregation', + 'mobile': False, + 'mustsearch': False, + 'name': 'aggr_single_api', + 'num_columns': 1, + 'owner': 'omdadmin', + 'painters': [('aggr_state_num', None, ''), + ('aggr_output', None, '')], + 'play_sounds': False, + 'public': True, + 'show_checkboxes': None, + 'show_filters': [], + 'sorters': [], + 'title': u'Single Aggregation for simple API calls', + 'topic': u'Business Intelligence', + 'user_sortable': None}, + # +----------------------------------------------------------------------+ # | _ _ _ _ __ _ _ _ | # | | \ | | ___ | |_(_)/ _(_) ___ __ _| |_(_) ___ _ __ ___ |

12 years, 9 months

Check_MK Git: check_mk: Multisite icons: Always using host custom vars for processing but also fetching service custom vars from the datasource

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb96617c39664124ca4d0b557a5a6fda3101a86a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb96617c396641… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:43:56 2011 +0100 Multisite icons: Always using host custom vars for processing but also fetching service custom vars from the datasource --- web/plugins/views/painters.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 15a5f91..c903ef7 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -121,8 +121,8 @@ def paint_icons(what, row): what: "host" or "service" row: The livestatus row of the current object """ - custom_vars = dict(zip(row[what + "_custom_variable_names"], - row[what + "_custom_variable_values"])) + custom_vars = dict(zip(row["host_custom_variable_names"], + row["host_custom_variable_values"])) # Extract host tags if "TAGS" in custom_vars: @@ -145,11 +145,15 @@ def paint_icons(what, row): def iconpainter_columns(what): cols = set(['site', 'host_name', - what + '_custom_variable_names', - what + '_custom_variable_values' ]) + 'host_custom_variable_names', + 'host_custom_variable_values' ]) if what == 'service': - cols.add('service_description') + cols.update([ + 'service_description', + 'service_custom_variable_names', + 'service_custom_variable_values', + ]) for icon in multisite_icons: if 'columns' in icon:

12 years, 9 months

Check_MK Git: check_mk: Sidebar: Fixed snapin dragging width bug

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74598466fe87a8bc105f0258e64c610eedc3e42a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74598466fe87a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 09:46:16 2011 +0100 Sidebar: Fixed snapin dragging width bug --- web/htdocs/js/sidebar.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 046e50d..a3cc3f0 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -165,7 +165,6 @@ function snapinDrag(event) { newTop += document.getElementById('side_content').scrollTop;*/ snapinDragging.style.top = newTop + 'px'; snapinDragging.style.left = (event.clientX - snapinOffset[1]) + 'px'; - snapinDragging.style.width = '175px'; snapinDragging.style.zIndex = 200; // Refresh the drop marker

12 years, 9 months

Check_MK Git: check_mk: WATO: add confirmation for deletion of host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4e5600aa249a99adbbd34d1db514f478a5fa89f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4e5600aa249a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:53:30 2011 +0100 WATO: add confirmation for deletion of host tags --- web/htdocs/wato.py | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aaabbb2..0163cbc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7985,6 +7985,16 @@ def mode_hosttags(phase): operations = [ x[0] for x in e[2] ] message = rename_host_tags_after_confirmation(del_id, operations) + if message == True: # no confirmation yet + c = wato_confirm(_("Confirm deletion of the host " + "tag group '%s'") % del_id, + _("Do you really want to delete the " + "host tag group '%s'?") % del_id) + if c == False: + return "" + elif c == None: + return None + if message: hosttags = [ e for e in hosttags if e[0] != del_id ] save_hosttags(hosttags) @@ -8295,7 +8305,8 @@ def save_hosttags(hosttags): def rename_host_tags_after_confirmation(tag_id, operations): mode = html.var("_repair") if mode == "abort": - raise MKUserError("id_0", "Please refine your changes or go back to the list of tag groups.") + raise MKUserError("id_0", _("Aborting change.")) + elif mode: if type(operations) == list: # make attribute unknown to system, important for save() operations undeclare_host_tag_attribute(tag_id) @@ -8309,7 +8320,8 @@ def rename_host_tags_after_confirmation(tag_id, operations): change_host_tags_in_folders(tag_id, operations, "check", g_root_folder) if affected_folders: - message += _("Affected folders with an explicit reference to this tag group and that are affected by the change") + ":<ul>" + message += _("Affected folders with an explicit reference to this tag " + "group and that are affected by the change") + ":<ul>" for folder in affected_folders: message += '<li><a href="%s">%s</a></li>' % ( make_link_to([("mode", "editfolder")], folder), @@ -8317,7 +8329,8 @@ def rename_host_tags_after_confirmation(tag_id, operations): message += "</ul>" if affected_hosts: - message += _("Hosts where this tag group is explicitely set and that are effected by the change") + ":<ul><li>" + message += _("Hosts where this tag group is explicitely set " + "and that are effected by the change") + ":<ul><li>" for nr, host in enumerate(affected_hosts): if nr > 20: message += "... (%d more)" % (len(affected_hosts) - 20)

12 years, 9 months

Check_MK Git: check_mk: WATO: fix reordering of host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dcd221bf4b2057ff4084888841eef94a2fc2beb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcd221bf4b2057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:41:15 2011 +0100 WATO: fix reordering of host tags --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d0a4e9b..aaabbb2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7996,7 +7996,7 @@ def mode_hosttags(phase): if move_nr != None: if html.check_transaction(): move_nr = int(move_nr) - if move_nr > 0: + if move_nr >= 0: dir = 1 else: move_nr = -move_nr

12 years, 9 months

Check_MK Git: check_mk: WATO: fix selection of empty tag

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 854c47607cf10fe1adffe69aa5b4307197a388d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=854c47607cf10f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:36:31 2011 +0100 WATO: fix selection of empty tag --- .bugs/481 | 10 +++++++--- web/htdocs/wato.py | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.bugs/481 b/.bugs/481 index ad05856..d43b2b2 100644 --- a/.bugs/481 +++ b/.bugs/481 @@ -1,11 +1,15 @@ Title: Tag group with empty tag does not show default Component: wato -Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:26:37 -Targetversion: 1.2.0 +State: done Class: bug +Benefit: 1 +Fun: 0 +Targetversion: 1.2.0 If a tag group has an empty tag then that choice is not being shown in the combo box. + +2011-12-07 20:36:48: changed state open -> done +fixed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2ec191e..d0a4e9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3442,6 +3442,8 @@ class HostTagAttribute(Attribute): # But case could occur if tags definitions have been changed. def render_input(self, value): + if value == None: + value = "" # Important for tag groups with an empty tag entry # Tag groups with just one entry are being displayed # as checkboxes choices = []

12 years, 9 months

Check_MK Git: check_mk: builin views: fix syntax error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a585787fe213eedd5538cfcc8dcc95453b02d2a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a585787fe213ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 7 20:32:22 2011 +0100 builin views: fix syntax error --- web/plugins/views/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 0edf462..61f8fbf 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2434,7 +2434,7 @@ multisite_builtin_views.update({ 'sorters': [], 'title': u'Single Aggregation', 'topic': u'Business Intelligence', - 'user_sortable': None} + 'user_sortable': None}, # +----------------------------------------------------------------------+ # | _ _ _ _ __ _ _ _ |

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits