Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3377 FIX Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9

by Lars Michelsen

Module: check_mk Branch: master Commit: 32b2f6e5dc8281ce22e392dcb9985dbf1fcef1a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32b2f6e5dc8281… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 16:34:56 2016 +0200 3377 FIX Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 --- .werks/3377 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3377 b/.werks/3377 new file mode 100644 index 0000000..caa26a7 --- /dev/null +++ b/.werks/3377 @@ -0,0 +1,9 @@ +Title: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460557992 + diff --git a/ChangeLog b/ChangeLog index 7ec53a2..4878a5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -257,6 +257,7 @@ * 3329 FIX: Function discover_services now allows the URL parameter mode... * 3330 FIX: WATO Web-API now allows to specify root folder with / instead of empty string again * 3024 FIX: Fixed WATO GIT version control for older (<2.0) GIT versions + * 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 Notifications: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 20e4c24..f915f6b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15278,7 +15278,7 @@ def excludes_by_regexes(addresses, exclude_specs): patterns.append(re.compile(p)) if not patterns: - return addresses + return [] excludes = [] for address in addresses:

8 years, 5 months

3397 Show IP addresses of a host when hovering over its name

by Mathias Kettner

Module: check_mk Branch: master Commit: b429a99e32df4b54626f25ed26992cb531640022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b429a99e32df4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 13 15:02:59 2016 +0200 3397 Show IP addresses of a host when hovering over its name This works in several views, like {{All hosts}}. That way can get to know the address of a host without going to its detail page. --- .werks/3397 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3397 b/.werks/3397 new file mode 100644 index 0000000..449497d --- /dev/null +++ b/.werks/3397 @@ -0,0 +1,11 @@ +Title: Show IP addresses of a host when hovering over its name +Level: 1 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460552531 + +This works in several views, like {{All hosts}}. That way can get to know the +address of a host without going to its detail page. diff --git a/ChangeLog b/ChangeLog index 4c365c1..7ec53a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,7 @@ * 3328 Default cloned views to be not public... * 3376 Cleaned up handling of setting Livestatus AuthUser for "see all" users... NOTE: Please refer to the migration notes! + * 3397 Show IP addresses of a host when hovering over its name... * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f43f295..d95bfac 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -43,7 +43,7 @@ host_service_view_painters.insert(1, ('host', 'host')) host_view_painters = [ ('host_state', None), # ('host_type_icon', None), - ('host', 'host'), + ('host', 'host', 'host_addresses'), ('host_icons', None), ('num_services_ok', 'host_ok'), ('num_services_warn', 'host_warn'),

8 years, 5 months

3025 FIX solaris_pkginfo: the last element of the reported software package list was always missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 2a986ab1521070f8765deed904ddde04c642f495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a986ab1521070… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 13 14:18:33 2016 +0200 3025 FIX solaris_pkginfo: the last element of the reported software package list was always missing --- .werks/3025 | 9 +++++++++ ChangeLog | 1 + inventory/solaris_pkginfo | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/3025 b/.werks/3025 new file mode 100644 index 0000000..f4e35e8 --- /dev/null +++ b/.werks/3025 @@ -0,0 +1,9 @@ +Title: solaris_pkginfo: the last element of the reported software package list was always missing +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1460549851 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1d4c042..4c365c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -311,6 +311,7 @@ * 3289 FIX: Fixed missing filters in HW-/SW-Inventory views after editing the view... * 3013 FIX: Inventory: snmp inventory plugins never use cached data... * 3340 FIX: Fixed exception when searching for software package sizes + * 3025 FIX: solaris_pkginfo: the last element of the reported software package list was always missing 1.2.8b1: diff --git a/inventory/solaris_pkginfo b/inventory/solaris_pkginfo index 38031ba..a243907 100644 --- a/inventory/solaris_pkginfo +++ b/inventory/solaris_pkginfo @@ -86,6 +86,8 @@ def inv_solaris_pkginfo(info): for tkey in translation_dict: if key == tkey: entry.update({ translation_dict[tkey] : value.strip()}) + if entry: + paclist.append(entry) inv_info['solaris_pkginfo'] = {

8 years, 5 months

3376 Cleaned up handling of setting Livestatus AuthUser for "see all" users

by Lars Michelsen

Module: check_mk Branch: master Commit: 0344428ea821781b49b713103cf24e781e51bf10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0344428ea82178… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 14:04:30 2016 +0200 3376 Cleaned up handling of setting Livestatus AuthUser for "see all" users This change affects only users which have the "general.see_all" permission, normally Administrators and Guests. But the most affected users will be the admins. Previous Check_MK versions had the options "Visibility of Hosts/Services" and "Visibility of Hosts/Services (Webservice)" which could be set in the user profile. These options could be used by all users which have the "see all" permission to limit the shown hosts and services to only the ones which they are really a contact for. The later option has been deprecated now. It was first integrated to make users of external tools like Nagstamon, which fetches it's list of host and service problems from the Check_MK webservice, be able to show only the the problems of their hosts and services. But this option also had a side effect: When it is enabled and the option "Visibility of Hosts/Services" was not enabled, the admin could see all hosts/services in the GUI but when executing a CSV export he was only getting the hosts/services he is a contact for. To fix this situation we decided to deprecate the "Visibility of Hosts/Services (Webservice)" and replace it with a URL variable which can be used to filter each page individually. The new URL variable <tt>force_authuser</tt> can be used on any view and set to: <ul> <li><tt>1<tt> to show only the hosts/services the user is a contact for</li> <li><tt>0<tt> to show all hosts/services</li> <li><tt>[username]<tt> to show all hosts/services the given user is a contact for</li> </ul> The now deprecated option will still be working as before but you are recommended to uncheck the option and use the new mechanism. If you are using it for Nagstamon you will need to use a Nagstamon 2.0 release newer than ALPHA-20160307 once it is available. --- .werks/3376 | 36 ++++++++++++++++++++++++++++ ChangeLog | 2 ++ web/htdocs/sites.py | 42 +++++++++++++++++++++++---------- web/plugins/userdb/user_attributes.py | 6 +++-- 4 files changed, 71 insertions(+), 15 deletions(-) diff --git a/.werks/3376 b/.werks/3376 new file mode 100644 index 0000000..ede1f92 --- /dev/null +++ b/.werks/3376 @@ -0,0 +1,36 @@ +Title: Cleaned up handling of setting Livestatus AuthUser for "see all" users +Level: 1 +Component: multisite +Compatible: incomp +Version: 1.2.9i1 +Date: 1460548346 +Class: feature + +This change affects only users which have the "general.see_all" permission, normally Administrators +and Guests. But the most affected users will be the admins. + +Previous Check_MK versions had the options "Visibility of Hosts/Services" and +"Visibility of Hosts/Services (Webservice)" which could be set in the user profile. These options +could be used by all users which have the "see all" permission to limit the shown hosts and services +to only the ones which they are really a contact for. + +The later option has been deprecated now. It was first integrated to make users of external tools +like Nagstamon, which fetches it's list of host and service problems from the Check_MK webservice, +be able to show only the the problems of their hosts and services. +But this option also had a side effect: When it is enabled and the option "Visibility of Hosts/Services" +was not enabled, the admin could see all hosts/services in the GUI but when executing a CSV export +he was only getting the hosts/services he is a contact for. + +To fix this situation we decided to deprecate the "Visibility of Hosts/Services (Webservice)" and +replace it with a URL variable which can be used to filter each page individually. The new URL +variable <tt>force_authuser</tt> can be used on any view and set to: + +<ul> + <li><tt>1<tt> to show only the hosts/services the user is a contact for</li> + <li><tt>0<tt> to show all hosts/services</li> + <li><tt>[username]<tt> to show all hosts/services the given user is a contact for</li> +</ul> + +The now deprecated option will still be working as before but you are recommended to uncheck +the option and use the new mechanism. If you are using it for Nagstamon you will need to +use a Nagstamon 2.0 release newer than ALPHA-20160307 once it is available. diff --git a/ChangeLog b/ChangeLog index 49a8d58..1d4c042 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,8 @@ * 2237 Unique name for columns of Host Groups and Service Groups... * 3310 New dashlet which shows user notifications * 3328 Default cloned views to be not public... + * 3376 Cleaned up handling of setting Livestatus AuthUser for "see all" users... + NOTE: Please refer to the migration notes! * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 6fde86d..41bd63c 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -150,27 +150,43 @@ def connect_single_site(): # If Multisite is retricted to data the user is a contact for, we need to set an # AuthUser: header for livestatus. def set_livestatus_auth(): - if html.output_format == 'html': - perm = "force_authuser" - else: - perm = "force_authuser_webservice" - - use_livestatus_auth = True - if config.may("general.see_all") and not config.user.get(perm): - use_livestatus_auth = False - - if use_livestatus_auth == True: - _live.set_auth_user('read', config.user_id) - _live.set_auth_user('action', config.user_id) + user_id = livestatus_auth_user() + if user_id != None: + _live.set_auth_user('read', user_id) + _live.set_auth_user('action', user_id) # May the user see all objects in BI aggregations or only some? if not config.may("bi.see_all"): - _live.set_auth_user('bi', config.user_id) + _live.set_auth_user('bi', user_id) # Default auth domain is read. Please set to None to switch off authorization _live.set_auth_domain('read') +# Returns either None when no auth user shal be set or the name of the user +# to be used as livestatus auth user +def livestatus_auth_user(): + if not config.may("general.see_all"): + return config.user_id + + force_authuser = html.var("force_authuser") + if force_authuser == "1": + return config.user_id + elif force_authuser == "0": + return None + elif force_authuser: + return force_authuser # set a different user + + # TODO: Remove this with 1.5.0/1.6.0 + if html.output_format != 'html' and config.user.get("force_authuser_webservice"): + return config.user_id + + if config.user.get("force_authuser"): + return config.user_id + + return None + + def disconnect(): global _live, _site_status _live = None diff --git a/web/plugins/userdb/user_attributes.py b/web/plugins/userdb/user_attributes.py index d48aa57..a2a5a8c 100644 --- a/web/plugins/userdb/user_attributes.py +++ b/web/plugins/userdb/user_attributes.py @@ -37,11 +37,13 @@ declare_user_attribute( permission = "general.see_all" ) +# TODO: Remove this with 1.5.0/1.6.0 declare_user_attribute( "force_authuser_webservice", Checkbox( - title = _("Visibility of Hosts/Services (Webservice)"), - label = _("Export only hosts and services the user is a contact for"), + title = _("Hosts/Service visibility (Webservice, Deprecated)"), + label = _("Export only hosts and services the user is a contact for. " + "<b>Please don't use this option anymore, it is deprecated.</b>"), help = _("When this option is checked, then the Multisite webservice " "will only export hosts and services that the user is a contact for - " "even if he has the permission for seeing all objects."),

8 years, 5 months

3396 Change default setting of Precompile aggregations on demand to ON now

by Mathias Kettner

Module: check_mk Branch: master Commit: ee498bc7109099cb36cbc7f1a7f5faf61517bf91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee498bc7109099… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 13 13:44:02 2016 +0200 3396 Change default setting of Precompile aggregations on demand to ON now The global setting {{Precompile aggregations on demand}} improves the performance of BI in case where not all aggregations are needed at once. This is especially true for the case of single-host aggregations. This setting now exists for a long time and we have finally regarded that feature as stable enough in order to make it the default. We might remove the setting from WATO totally in future. --- .werks/3396 | 16 ++++++++++++++++ ChangeLog | 1 + web/plugins/config/bi.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/3396 b/.werks/3396 new file mode 100644 index 0000000..7fb5a2d --- /dev/null +++ b/.werks/3396 @@ -0,0 +1,16 @@ +Title: Change default setting of Precompile aggregations on demand to ON now +Level: 2 +Component: bi +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460547726 + +The global setting {{Precompile aggregations on demand}} improves the +performance of BI in case where not all aggregations are needed at once. This +is especially true for the case of single-host aggregations. This setting +now exists for a long time and we have finally regarded that feature as +stable enough in order to make it the default. + +We might remove the setting from WATO totally in future. diff --git a/ChangeLog b/ChangeLog index 43e5d06..49a8d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -264,6 +264,7 @@ BI: * 3271 New option in aggregation for tuning aggregation of downtimes... + * 3396 Change default setting of Precompile aggregations on demand to ON now... * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex diff --git a/web/plugins/config/bi.py b/web/plugins/config/bi.py index a55b1a3..b2a1485 100644 --- a/web/plugins/config/bi.py +++ b/web/plugins/config/bi.py @@ -29,4 +29,4 @@ aggregations = [] host_aggregations = [] bi_packs = {} bi_compile_log = None -bi_precompile_on_demand = False +bi_precompile_on_demand = True diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 66ef2a5..1392ad6 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -398,7 +398,7 @@ register_configvar(group, "to change the precompilation to be executed on demand. BI only precompiles the " "aggregations which are really requested by the users." ), - default_value = False), + default_value = True), domain = "multisite") register_configvar(group,

8 years, 5 months

Fixed display options for webservices after last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e2617df04df4eb6ebe2d383ef1fa4b4f8958388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e2617df04df4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 13:06:04 2016 +0200 Fixed display options for webservices after last commit --- 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 88d7776..e9df56f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -343,7 +343,7 @@ def prepare_display_options(): if html.output_format == "html": display_options = html.var("display_options", "") else: - display_options = DisplayOptions.all_on() + display_options = DisplayOptions.all_off() display_options = DisplayOptions.apply_defaults(display_options)

8 years, 5 months

3395 FIX Fix performance issue when many BI aggregations are active

by Mathias Kettner

Module: check_mk Branch: master Commit: d3b7be700c083542b9835afdd04d39539d5483c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3b7be700c0835… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 13 12:20:41 2016 +0200 3395 FIX Fix performance issue when many BI aggregations are active If you have created 1000 or more aggregations and show a view with many hosts or services than you could get massive performance and memory problems in your Apache process. The reason is the computation of the BI icon in the drop down menus of hosts and services. This was only done in order to check the visibility of the menu itself. The menu is now always visible and thus the computation is not longer neccessary. --- .werks/3395 | 15 +++++++++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 4 ---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/3395 b/.werks/3395 new file mode 100644 index 0000000..9cfedc0 --- /dev/null +++ b/.werks/3395 @@ -0,0 +1,15 @@ +Title: Fix performance issue when many BI aggregations are active +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460542721 + +If you have created 1000 or more aggregations and show a view with many +hosts or services than you could get massive performance and memory problems +in your Apache process. The reason is the computation of the BI icon in the +drop down menus of hosts and services. This was only done in order to +check the visibility of the menu itself. The menu is now always visible +and thus the computation is not longer neccessary. diff --git a/ChangeLog b/ChangeLog index d7c0289..43e5d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 3374 FIX: Fixed broken Logwatch page when a host has no log directory (yet) * 3375 FIX: Fixed exception when adding a bookmark while having a list not named my_bookmarks * 3118 FIX: Availability view now takes daylight saving time into account + * 3395 FIX: Fix performance issue when many BI aggregations are active... WATO: diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 801d69a..29e84c7 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -84,10 +84,6 @@ def paint_action_menu(what, row, tags, host_custom_vars): if html.has_var('_display_options'): url_vars.append(('_display_options', html.var('_display_options'))) - icons = get_icons(what, row, toplevel=False) - if not icons: - return # Don't paint the menu trigger when the menu would be empty - return html.render_popup_trigger( html.render_icon('menu', _('Open the action menu'), cssclass="iconbutton"), 'action_menu', 'action_menu', url_vars=url_vars)

8 years, 5 months

Use text/plain for python output_format (application/ python is not a good choice for repr() data)

by Lars Michelsen

Module: check_mk Branch: master Commit: fbd2aba68d712d8d897de891cb20fd1d7fe8fd24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbd2aba68d712d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 11:14:26 2016 +0200 Use text/plain for python output_format (application/python is not a good choice for repr() data) --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7857f87..40aaf60 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -184,7 +184,7 @@ class html(GUITester): content_type = "text/csv; charset=UTF-8" elif f == "python": - content_type = "application/python; charset=UTF-8" + content_type = "text/plain; charset=UTF-8" elif f == "text": content_type = "text/plain; charset=UTF-8"

8 years, 5 months

windows agent: cleanup in performance counter functionality,

by Sebastian Herbord

perftest can now output a tree of all counters Message-ID: <570e0bb2.oXRFFJbpd/HtnmXn%sh(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: 395cd7a09f60cfcb3ec51cd2412380c4a6e3ee4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=395cd7a09f60cf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 13 09:02:39 2016 +0200 windows agent: cleanup in performance counter functionality, perftest can now output a tree of all counters --- agents/windows/PerfCounter.cc | 71 ++++++++++++++++++++++++++------------ agents/windows/PerfCounter.h | 6 ++-- agents/windows/PerfCounterPdh.cc | 2 +- agents/windows/PerfCounterPdh.h | 2 +- agents/windows/perftest.cc | 38 ++++++++++++-------- 5 files changed, 79 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=395cd7a09f…

8 years, 5 months

further bugfix to recent change on downtime buttons

by Sebastian Herbord

Module: check_mk Branch: master Commit: a0b0609dd56d9cdc0b9bcafdfaa2587d99f3b214 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0b0609dd56d9c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 13 11:03:51 2016 +0200 further bugfix to recent change on downtime buttons --- web/plugins/views/commands.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 8ffdf97..42bedf9 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -554,8 +554,12 @@ def command_downtime(cmdtag, spec, row): _("<b>%s of %s length</b> on") %\ (title_start, get_duration_human_readable(duration)) - if rangebtns: + try: rangebtn = rangebtns.next() + except StopIteration: + rangebtn = None + + if rangebtn: btnname, end = rangebtn.split("__", 1) down_to, title = resolve_end(end) elif html.var("_down_from_now"):

8 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016