Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: visuals: option for extra buttons in visual list

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d10f9b63199e366c918c37515a9ce930d35873b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d10f9b63199e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 5 14:41:47 2014 +0200 visuals: option for extra buttons in visual list --- web/htdocs/visuals.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 7f987f7..130b305 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -237,7 +237,7 @@ def available(what, all_visuals): # | Show a list of all visuals with actions to delete/clone/edit | # '----------------------------------------------------------------------' -def page_list(what, title, visuals, custom_columns = []): +def page_list(what, title, visuals, custom_columns = [], render_custom_buttons=None): what_s = what[:-1] if not config.may("general.edit_" + what): raise MKAuthException(_("Sorry, you lack the permission for editing this type of visuals.")) @@ -307,6 +307,10 @@ def page_list(what, title, visuals, custom_columns = []): html.icon_button(html.makeactionuri([('_delete', visualname)]), _("Delete!"), "delete") + # Custom buttons - visual specific + if render_custom_buttons: + render_custom_buttons(visualname, visual) + # visual Name table.cell(_('ID'), visualname) @@ -349,6 +353,7 @@ def page_list(what, title, visuals, custom_columns = []): # | Realizes the steps before getting to the editor (context type) | # '----------------------------------------------------------------------' +# FIXME: title is not needed, that's contained in visual_types def page_create_visual(what, title, info_keys, next_url = None): what_s = what[:-1]

9 years, 8 months

Check_MK Git: check_mk: web/.f12: comment out remove --delete for rsync

by Mathias Kettner

Module: check_mk Branch: master Commit: 289044eeb09e50c118acd260c284f83e4e3506ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=289044eeb09e50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:25:49 2014 +0200 web/.f12: comment out remove --delete for rsync This allows to works with more than one web/ tree --- web/.f12 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index be2e61a..8c56f2e 100644 --- a/web/.f12 +++ b/web/.f12 @@ -6,7 +6,8 @@ sudo rsync \ --exclude "*mkevent*" \ --exclude "*cmc.py" \ --exclude "*omd_configuration.py" \ - --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ + -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ +# --delete \ echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache

9 years, 8 months

Check_MK Git: check_mk: Styling change: save some vertical space in forms

by Mathias Kettner

Module: check_mk Branch: master Commit: 0171edad179b5ce84e121dadec3571c138e0db6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0171edad179b5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:24:31 2014 +0200 Styling change: save some vertical space in forms --- web/htdocs/pages.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 954e215..d395b96 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -661,7 +661,7 @@ table.nform > tbody > tr td { table.nform > tbody > tr > td { vertical-align: middle; - height: 27px; + /* height: 15px; */ } table.nform > tbody > tr > td.simple {

9 years, 8 months

Check_MK Git: check_mk: Small code cleanup: extract datasource selection to own VS

by Mathias Kettner

Module: check_mk Branch: master Commit: d579c2b76ed0c60c456e9c8aee0df8fd3ad64ad0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d579c2b76ed0c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:23:43 2014 +0200 Small code cleanup: extract datasource selection to own VS --- web/htdocs/views.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 88c454a..34b6d4c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -204,20 +204,27 @@ def page_edit_views(): # '----------------------------------------------------------------------' # First step: Select the data source -def page_create_view(next_url = None): + +# Create datasource selection valuespec, also for other modules +def DatasourceSelection(): datasources = [] for ds_name, ds in multisite_datasources.items(): datasources.append((ds_name, ds['title'])) - # FIXME: Sort the datasources by (assumed) common usage - vs_ds = DropdownChoice( + return DropdownChoice( title = _('Datasource'), + help = _('The datasources defines which type of objects should be displayed with this view.'), choices = datasources, sorted = True, - help = _('The datasources defines which type of objects should be displayed with this view.'), columns = 1, + default_value = 'services', ) +def page_create_view(next_url = None): + + # FIXME: Sort the datasources by (assumed) common usage + vs_ds = DatasourceSelection() + ds = 'services' # Default selection html.header(_('Create View'), stylesheets=["pages"])

9 years, 8 months

Check_MK Git: check_mk: Remove hard code, add module name to load to visual_types

by Mathias Kettner

Module: check_mk Branch: master Commit: 32a2b8086bb77f304b3e60e464c9dd07e4b0b749 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a2b8086bb77f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:23:13 2014 +0200 Remove hard code, add module name to load to visual_types --- web/htdocs/visuals.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index d107439..23e777e 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -32,14 +32,16 @@ import config, table visual_types = { 'views': { - 'ident_attr': 'view_name', - 'title': _("view"), - 'plural_title': _("views"), + 'ident_attr': 'view_name', + 'title': _("view"), + 'plural_title': _("views"), + 'module_name': 'views', }, 'dashboards': { - 'ident_attr': 'name', + 'ident_attr': 'name', 'title': _("dashboard"), 'plural_title': _("dashboards"), + 'module_name': 'dashboard', }, } @@ -1027,7 +1029,7 @@ def collect_context_links_of(what, this_visual, active_filter_vars, mobile): context_links = [] # FIXME: Make this cross module access cleaner - module_name = what == 'views' and what or what[:-1] + module_name = visual_types[what]["module_name"] thing_module = __import__(module_name) thing_module.__dict__['load_%s'% what]() available = thing_module.__dict__['permitted_%s' % what]()

9 years, 8 months

Check_MK Git: check_mk: Fix adding new views to implicity main dashboard

by Mathias Kettner

Module: check_mk Branch: master Commit: d2026dec1a141c498f816bd6a2f5cbd9a5805bdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2026dec1a141c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 6 18:22:38 2014 +0200 Fix adding new views to implicity main dashboard --- web/htdocs/dashboard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a3e5477..c60628c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -181,7 +181,10 @@ def permitted_dashboards(): def page_dashboard(): load_dashboards() - name = html.var("name", "main") + name = html.var("name") + if not name: + name = "main" + html.set_var("name", name) # make sure that URL context is always complete if name not in available_dashboards: raise MKGeneralException(_("The requested dashboard can not be found.")) @@ -678,6 +681,7 @@ def page_create_view_dashlet(): import views url = html.makeuri([], filename = "create_view_dashlet_infos.py") url += '&datasource=%s' # %s can not be added using html.makeuri() + # Note: %s will later be replaced by datasource views.page_create_view(next_url=url) else:

9 years, 8 months

Check_MK Git: check_mk: Fixed creating new view dashlets;

by Lars Michelsen

Changed wording of single object things a bit Message-ID: <54329358.UO3bOBl5jMcXi3Ez%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0bd00f64881553493aa6e0338dc4d4363224a9c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd00f64881553… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 6 15:02:09 2014 +0200 Fixed creating new view dashlets; Changed wording of single object things a bit --- web/htdocs/dashboard.py | 10 ++++++---- web/htdocs/visuals.py | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c2dcd2d..a3e5477 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -676,7 +676,8 @@ def page_create_view_dashlet(): if create: import views - url = html.makeuri([('datasource', '%s')], filename = "create_view_dashlet_infos.py") + url = html.makeuri([], filename = "create_view_dashlet_infos.py") + url += '&datasource=%s' # %s can not be added using html.makeuri() views.page_create_view(next_url=url) else: @@ -684,14 +685,15 @@ def page_create_view_dashlet(): choose_view(name) def page_create_view_dashlet_infos(): + import views ds_name = html.var('datasource') - if ds_name not in multisite_datasources: + if ds_name not in views.multisite_datasources: raise MKGeneralException(_('The given datasource is not supported')) # Create a new view by choosing the datasource and the single object types - visuals.page_create_visual('views', _("View"), multisite_datasources[ds_name]['infos'], + visuals.page_create_visual('views', _("View"), views.multisite_datasources[ds_name]['infos'], next_url = 'edit_dashlet.py?name=%s&type=view&datasource=%s&single_infos=%%s' % - (html.urlencode(html.var('name'), ds_name))) + (html.urlencode(html.var('name')), ds_name)) def choose_view(name): import views diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 461a9b6..d107439 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -373,7 +373,7 @@ def page_create_visual(what, title, info_keys, next_url = None): 'of multiple services, a list of multiple services of a single host or even ' 'a list of services with the same name on multiple hosts. When you just want to ' 'create a list of objects, you do not need to make any selection in this dialog. ' - 'If you like to create a view for a specific object of a specific type, select the ' + 'If you like to create a view for one specific object of a specific type, select the ' 'object type below and continue.') % what_s) html.write('') @@ -394,7 +394,7 @@ def page_create_visual(what, title, info_keys, next_url = None): html.begin_form('create_visual') html.hidden_field('mode', 'create') - forms.header(_('Select specific objects')) + forms.header(_('Select specific object type')) forms.section(vs_infos.title()) vs_infos.render_input('single_infos', '') html.help(vs_infos.help()) @@ -564,9 +564,9 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, optional_keys = None, elements = [ ('single_infos', FixedValue(single_infos, - title = _('Show information of single'), + title = _('Specific objects'), totext = single_infos and ', '.join(single_infos) \ - or _('Not showing information for a specific object.'), + or _('Showing information of multiple objects.'), )), ('name', TextAscii( title = _('Unique ID'),

9 years, 8 months

Check_MK Git: check_mk: multisite_to_mrpe: replace spaces w/

by Andreas Boesl

underscores in svc_check_command Message-ID: <54327a2f.eOYsZ7LH50VNmV3T%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 36eb2a7e9f4ffab1fbc1ecf78dd420104fb9f991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36eb2a7e9f4ffa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 6 13:15:15 2014 +0200 multisite_to_mrpe: replace spaces w/ underscores in svc_check_command --- doc/treasures/multisite_to_mrpe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/multisite_to_mrpe b/doc/treasures/multisite_to_mrpe index 4289bee..3fb77a0 100755 --- a/doc/treasures/multisite_to_mrpe +++ b/doc/treasures/multisite_to_mrpe @@ -190,7 +190,7 @@ for service in services: state = { "OK" : 0, "WARN" : 1, "CRIT" : 2, "UNKNOWN" : 3}.get(service['service_state']) if state != None: # skip pending services sys.stdout.write("(%s) %s %d %s|%s\n" % ( - service["svc_check_command"], + service["svc_check_command"].replace(" ", "_"), service["service_description"].replace(" ", "_"), state, service["svc_plugin_output"],

9 years, 8 months

Check_MK Git: check_mk: Views can now be edited again

by Lars Michelsen

Module: check_mk Branch: master Commit: 5109f47e24c936b323164290a1a096b07475c3a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5109f47e24c936… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 6 13:00:34 2014 +0200 Views can now be edited again --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5ee81d8..88c454a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -285,7 +285,7 @@ def get_view_infos(view): def page_edit_view(): load_views() - visuals.page_edit_visual('views', _("View"), multisite_views, + visuals.page_edit_visual('views', multisite_views, custom_field_handler = render_view_config, load_handler = transform_view_to_valuespec, create_handler = create_view_config,

9 years, 8 months

Check_MK Git: check_mk: OptionalDropdownChoice: allow function for choices

by Mathias Kettner

Module: check_mk Branch: master Commit: 42f744532fdc948bb5f70ea0e09625d7e1e013c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f744532fdc94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 4 18:43:31 2014 +0200 OptionalDropdownChoice: allow function for choices This is just like DropdownCoice. --- web/htdocs/valuespec.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 98019b3..aec4ea4 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1548,10 +1548,9 @@ class DualListChoice(ListChoice): # A type-save dropdown choice with one extra field that # opens a further value spec for entering an alternative # Value. -class OptionalDropdownChoice(ValueSpec): +class OptionalDropdownChoice(DropdownChoice): def __init__(self, **kwargs): - ValueSpec.__init__(self, **kwargs) - self._choices = kwargs["choices"] + DropdownChoice.__init__(self, **kwargs) self._explicit = kwargs["explicit"] self._otherlabel = kwargs.get("otherlabel", _("Other")) @@ -1559,15 +1558,17 @@ class OptionalDropdownChoice(ValueSpec): return self._explicit.canonical_value() def value_is_explicit(self, value): - return value not in [ c[0] for c in self._choices ] + return value not in [ c[0] for c in self.choices() ] def render_input(self, varprefix, value): defval = "other" options = [] - for n, (val, title) in enumerate(self._choices): + for n, (val, title) in enumerate(self.choices()): options.append((str(n), title)) if val == value: defval = str(n) + if self._sorted: + options.sort(cmp = lambda a,b: cmp(a[1], b[1])) options.append(("other", self._otherlabel)) html.select(varprefix, options, defval, # attrs={"style":"float:left;"}, onchange="valuespec_toggle_dropdown(this, '%s_ex');" % varprefix ) @@ -1588,20 +1589,21 @@ class OptionalDropdownChoice(ValueSpec): html.write("") def value_to_text(self, value): - for val, title in self._choices: + for val, title in self.choices(): if val == value: return title return self._explicit.value_to_text(value) def from_html_vars(self, varprefix): + choices = self.choices() sel = html.var(varprefix) if sel == "other": return self._explicit.from_html_vars(varprefix + "_ex") - for n, (val, title) in enumerate(self._choices): + for n, (val, title) in enumerate(choices): if sel == str(n): return val - return self._choices[0][0] # can only happen if user garbled URL + return choices[0][0] # can only happen if user garbled URL def validate_value(self, value, varprefix): if self.value_is_explicit(value): @@ -1610,7 +1612,7 @@ class OptionalDropdownChoice(ValueSpec): ValueSpec.custom_validate(self, value, varprefix) def validate_datatype(self, value, varprefix): - for val, title in self._choices: + for val, title in self.choices(): if val == value: return self._explicit.validate_datatype(value, varprefix + "_ex")

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014