Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64689 discussions

Check_MK Git: check_mk: #1539 FIX Fixed refreshing of PNP graphs in dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: f436721a492879bf20819d43fc8fc06921ffcd5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f436721a492879… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:13:45 2014 +0100 #1539 FIX Fixed refreshing of PNP graphs in dashboards The PNP graphs contained in dashboards were not refreshed as intended. Now they are refreshed in the hard coded default interval of 60 seconds. This will be configurable soon. --- .werks/1539 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1539 b/.werks/1539 new file mode 100644 index 0000000..c0c6f26 --- /dev/null +++ b/.werks/1539 @@ -0,0 +1,12 @@ +Title: Fixed refreshing of PNP graphs in dashboards +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1417165950 + +The PNP graphs contained in dashboards were not refreshed as intended. +Now they are refreshed in the hard coded default interval of 60 seconds. +This will be configurable soon. diff --git a/ChangeLog b/ChangeLog index 7a864d2..7378e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... * 1538 FIX: Only allow switching sites on/off when permitted to... + * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 00127f5..aaf083f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -376,8 +376,8 @@ def render_dashboard(name): # dashlets using static content (such as an iframe) will not be # refreshed by us but need to do that themselves. if "url" in dashlet or ('render' in dashlet_type and dashlet_type.get('refresh')): - url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)); - refresh = dashlet.get("refresh") + url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) + refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: # FIXME: remove add_wato_folder_to_url refresh_dashlets.append([nr, refresh, str(add_wato_folder_to_url(url, wato_folder))])

9 years, 10 months

Check_MK Git: check_mk: #1538 FIX Only allow switching sites on/ off when permitted to

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ed0a3438324e89bce210ea128db853eed198805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed0a3438324e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 10:01:06 2014 +0100 #1538 FIX Only allow switching sites on/off when permitted to The permission check was missing in the action processing server component. --- .werks/1538 | 9 +++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 23 ++++++++++++----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.werks/1538 b/.werks/1538 new file mode 100644 index 0000000..594fcd2 --- /dev/null +++ b/.werks/1538 @@ -0,0 +1,9 @@ +Title: Only allow switching sites on/off when permitted to +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417165211 +Class: fix + +The permission check was missing in the action processing server component. diff --git a/ChangeLog b/ChangeLog index d1fd67a..7a864d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 1534 FIX: Fixed filtering views in distributed setup lead to empty views... * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... + * 1538 FIX: Only allow switching sites on/off when permitted to... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 94f594f..1d9dc24 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -233,17 +233,18 @@ def connect_to_livestatus(): # Also honor HTML-variables for switching off sites # right now. This is generally done by the variable # _site_switch=sitename1:on,sitename2:off,... - switch_var = html.var("_site_switch") - if switch_var: - for info in switch_var.split(","): - sitename, onoff = info.split(":") - d = config.user_siteconf.get(sitename, {}) - if onoff == "on": - d["disabled"] = False - else: - d["disabled"] = True - config.user_siteconf[sitename] = d - config.save_site_config() + if config.may("sidesnap.sitestatus"): + switch_var = html.var("_site_switch") + if switch_var: + for info in switch_var.split(","): + sitename, onoff = info.split(":") + d = config.user_siteconf.get(sitename, {}) + if onoff == "on": + d["disabled"] = False + else: + d["disabled"] = True + config.user_siteconf[sitename] = d + config.save_site_config() # Make lists of enabled and disabled sites enabled_sites = {}

9 years, 10 months

Check_MK Git: check_mk: raritan_pdu_inlet: intermediate step for code redesign

by Mathias Kettner

Module: check_mk Branch: master Commit: a5a522755982cf71d20569857afdb9e76d9ce95b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5a522755982cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 09:49:21 2014 +0100 raritan_pdu_inlet: intermediate step for code redesign --- checks/{ups_outphase.include => elphase.include} | 18 +++- checks/raritan_pdu_inlet | 62 +++++++------- checks/raritan_pdu_inlet.include | 95 +++++++--------------- checks/raritan_pdu_inlet_summary | 53 +++++++----- checks/ups_socomec_outphase | 42 ++++------ 5 files changed, 123 insertions(+), 147 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5a5227559…

9 years, 10 months

Check_MK Git: check_mk: Removed code gnaaaaah

by Lars Michelsen

Module: check_mk Branch: master Commit: 55a8581559275d5893faffc73fa13d886761e52c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55a8581559275d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 28 09:47:37 2014 +0100 Removed code gnaaaaah --- web/htdocs/dashboard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5fe7022..00127f5 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -875,8 +875,6 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) - html.debug(dashlet) - ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos']

9 years, 10 months

Check_MK Git: check_mk: Removed debug output in dashboard editor

by Mathias Kettner

Module: check_mk Branch: master Commit: dd36a672998b9373539ae693b421f981c31a30e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd36a672998b93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 28 09:41:41 2014 +0100 Removed debug output in dashboard editor --- web/htdocs/dashboard.py | 2 -- web/htdocs/visuals.py | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5fe7022..00127f5 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -875,8 +875,6 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) - html.debug(dashlet) - ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos'] diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e83ebcd..0a81be9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -854,13 +854,9 @@ class Filter: # Is used to populate a value, for example loaded from persistance, into # the HTML context where it can be used by e.g. the display() method. def set_value(self, value): - try: - val = {} - for varname in self.htmlvars: - html.set_var(varname, value.get(varname)) - except: - html.debug("%r, %s" % (self, self.name)) - raise + val = {} + for varname in self.htmlvars: + html.set_var(varname, value.get(varname)) def get_filter(name): return multisite_filters[name]

9 years, 10 months

Check_MK Git: check_mk: hwg_temp: changed default levels to 30/

by Mathias Kettner

35 degrees C Message-ID: <54774209.Qlt67UKN1DgdVDHo%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: df50ef10405126e35e054766e5897b976c666d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df50ef10405126… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 16:23:51 2014 +0100 hwg_temp: changed default levels to 30/35 degrees C --- checks/hwg_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index 7abeed6..87b0757 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -hwg_temp_defaultlevels = (23, 25) +hwg_temp_defaultlevels = (30, 35) def inventory_hwg_temp(info): return [ (line[0], "hwg_temp_defaultlevels")

9 years, 10 months

Check_MK Git: check_mk: #1537 FIX Added transformation code for user dashboards created between 2014-08 and 2014-10

by Lars Michelsen

Module: check_mk Branch: master Commit: 765f4c9334abe5c525daed76718efa3713b25388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765f4c9334abe5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 27 15:43:50 2014 +0100 #1537 FIX Added transformation code for user dashboards created between 2014-08 and 2014-10 Installations which were using early versions of the dashboard editor, which was first available our nightly builds from 2014-08 till 2014-10 and created dashoards with it, have now dashboards saved in a format, which can not be interpreted by the current dashboard code. For some time, we assumed that there were not many installations with such files, therefor we did not implement any migration code and asked the users to migrate by hand. But now we have a bit too many users which are having trouble here, so we decided to implement a migration routine for these dashboards. --- .werks/1537 | 16 ++++++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 25 +++++++++++++++++++++++++ web/htdocs/views.py | 7 ++----- web/htdocs/visuals.py | 13 +++++++++++++ 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/.werks/1537 b/.werks/1537 new file mode 100644 index 0000000..016d73a --- /dev/null +++ b/.werks/1537 @@ -0,0 +1,16 @@ +Title: Added transformation code for user dashboards created between 2014-08 and 2014-10 +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417099138 +Class: fix + +Installations which were using early versions of the dashboard editor, which was first available +our nightly builds from 2014-08 till 2014-10 and created dashoards with it, have now dashboards +saved in a format, which can not be interpreted by the current dashboard code. + +For some time, we assumed that there were not many installations with such files, therefor we +did not implement any migration code and asked the users to migrate by hand. But now we have +a bit too many users which are having trouble here, so we decided to implement a migration +routine for these dashboards. diff --git a/ChangeLog b/ChangeLog index bc01d24..2ffb784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... * 1533 FIX: Fixed sorting of hosts with same name in "services of host" view * 1534 FIX: Fixed filtering views in distributed setup lead to empty views... + * 1537 FIX: Added transformation code for user dashboards created between 2014-08 and 2014-10... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 4967b13..5fe7022 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -92,8 +92,31 @@ def load_dashboards(): global dashboards, available_dashboards transform_builtin_dashboards() dashboards = visuals.load('dashboards', builtin_dashboards) + transform_dashboards(dashboards) available_dashboards = visuals.available('dashboards', dashboards) +# During implementation of the dashboard editor and recode of the visuals +# we had serveral different data structures, for example one where the +# views in user dashlets were stored with a context_type instead of the +# "single_info" key, which is the currently correct one. +# +# This code transforms views from user_dashboards.mk which have been +# migrated/created with daily snapshots from 2014-08 till beginning 2014-10. +# FIXME: Can be removed one day. Mark as incompatible change or similar. +def transform_dashboards(dashboards): + for (u, n), dashboard in dashboards.items(): + visuals.transform_old_visual(dashboard) + + # Also transform dashlets + for dashlet in dashboard['dashlets']: + visuals.transform_old_visual(dashlet) + + if dashlet['type'] == 'pnpgraph': + if 'service' not in dashlet['single_infos']: + dashlet['single_infos'].append('service') + if 'host' not in dashlet['single_infos']: + dashlet['single_infos'].append('host') + # be compatible to old definitions, where even internal dashlets were # referenced by url, e.g. dashboard['url'] = 'hoststats.py' # FIXME: can be removed one day. Mark as incompatible change or similar. @@ -852,6 +875,8 @@ def page_edit_dashlet(): except IndexError: raise MKGeneralException(_('The dashlet does not exist.')) + html.debug(dashlet) + ty = dashlet['type'] dashlet_type = dashlet_types[ty] single_infos = dashlet['single_infos'] diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b6f0d13..fb601f9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -91,6 +91,7 @@ def permitted_views(): return available_views # Convert views that are saved in the pre 1.2.6-style +# FIXME: Can be removed one day. Mark as incompatible change or similar. def transform_old_views(): for view in multisite_views.values(): @@ -103,11 +104,7 @@ def transform_old_views(): if 'context_type' in view: # This code transforms views from user_views.mk which have been migrated with # daily snapshots from 2014-08 till beginning 2014-10. - if view['context_type'] in [ 'host', 'service', 'hostgroup', 'servicegroup' ]: - view['single_infos'] = [view['context_type']] - else: - view['single_infos'] = [] # drop the context type and assume a "multiple view" - del view['context_type'] + visuals.transform_old_visual(view) elif 'single_infos' not in view: # This tries to map the datasource and additional settings of the diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index b4b1943..e83ebcd 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1244,6 +1244,19 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, return context_links +def transform_old_visual(visual): + if 'context_type' in visual: + if visual['context_type'] in [ 'host', 'service', 'hostgroup', 'servicegroup' ]: + visual['single_infos'] = [visual['context_type']] + else: + visual['single_infos'] = [] # drop the context type and assume a "multiple visual" + del visual['context_type'] + elif 'single_infos' not in visual: + visual['single_infos'] = [] + + visual.setdefault('context', {}) + + #. # .--Popup Add-----------------------------------------------------------. # | ____ _ _ _ |

9 years, 10 months

Check_MK Git: check_mk: New builtin view for listing BI aggregations for API calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d520670201f9514e58daf242d956c23a234eedc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d520670201f95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 27 15:38:51 2014 +0100 New builtin view for listing BI aggregations for API calls --- web/plugins/views/builtin.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 6a16a8c..3b65e55 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2836,6 +2836,40 @@ multisite_builtin_views.update({ 'topic': u'Business Intelligence', 'user_sortable': None}, +# Shows minimal information about a multiple aggregation +# Use together with output_format=python for API calls +'aggr_all_api': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'bi_aggregations', + 'description': _('List of all aggregations, containing the name of aggregations and state information'), + 'group_painters': [], + 'hard_filters': [], + 'hard_filtervars': [], + 'hidden': True, + 'hide_filters': [], + 'hidebutton': True, + 'icon': 'aggr', + 'layout': 'table', + 'linktitle': 'All Aggregations', + 'mobile': False, + 'mustsearch': False, + 'name': 'aggr_all_api', + 'num_columns': 1, + 'owner': 'omdadmin', + 'painters': [('aggr_group', None, ''), + ('aggr_name', None, ''), + ('aggr_state_num', None, ''), + ('aggr_output', None, ''), + ('aggr_treestate', None, '')], + 'play_sounds': False, + 'public': True, + 'show_checkboxes': None, + 'show_filters': [], + 'sorters': [], + 'title': u'List of all Aggregations for simple API calls', + '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,

9 years, 10 months

Check_MK Git: check_mk: #1554 mk_oracle: You can now monitor multiple ORACLE releases on the same host

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ca124bb0186267d0a9d0301d4cb66fde833158c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca124bb018626… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 12:04:37 2014 +0100 #1554 mk_oracle: You can now monitor multiple ORACLE releases on the same host --- .werks/1387 | 4 ---- .werks/1554 | 9 +++++++++ ChangeLog | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.werks/1387 b/.werks/1387 index ec99242..cfba617 100644 --- a/.werks/1387 +++ b/.werks/1387 @@ -7,7 +7,3 @@ Date: 1416906688 Class: fix The Plugin is now able to find instances with '_' in ORACLE_SID. - -Some Sections couldn't be executed under Oracle 9.2 because the required -views are not available. The Data-Guard Status is only availible from 10.1 -onwards. diff --git a/.werks/1554 b/.werks/1554 new file mode 100644 index 0000000..bc140c8 --- /dev/null +++ b/.werks/1554 @@ -0,0 +1,9 @@ +Title: mk_oracle: You can now monitor multiple ORACLE releases on the same host +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417086219 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1a62e9a..84efcec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 1440 livedump: now able to add hosts icon_image on config generation... * 1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices * 1551 f5_bigip_vserver: add performance data for connections and connection rate + * 1554 mk_oracle: You can now monitor multiple ORACLE releases on the same host * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... @@ -39,7 +40,7 @@ * 1503 FIX: Fixed monitoring of multiple SAP instances with one mk_sap plugin... * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user - * 1387 FIX: mk_oracle: Correctly deal with underscore in SID for Oracle 9.2-10.1 + * 1387 FIX: mk_oracle: Correctly deal with underscore in SID for Oracle 9.2-10.1... * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing...

9 years, 10 months

Check_MK Git: check_mk: WATO: sort user names in dropdowns for users

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cfe7a948a2c15fb406df1da093117cda9209982 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cfe7a948a2c15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:47:19 2014 +0100 WATO: sort user names in dropdowns for users --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index da15c5e..d860fb9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12166,11 +12166,13 @@ def generate_wato_users_elements_function(none_value, only_contacts = False): for (name, us) in users.items() if (not only_contacts or us.get("contactgroups")) ] + elements.sort() if nv != None: elements = [ (None, none_value) ] + elements return elements return lambda: get_wato_users(none_value) + # Dropdown for choosing a multisite user class UserSelection(DropdownChoice): def __init__(self, **kwargs):

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits