From a8b79e8dc1706758f377fb91a9ac028abf624098 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Thu, 14 Jul 2016 14:55:41 +0300 Subject: [PATCH] `event_return_*` master opts: update doc and config examples Signed-off-by: Denys Havrysh --- conf/master | 16 ++++++++-------- doc/ref/configuration/master.rst | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/conf/master b/conf/master index 8c289155e51..09bc1d0d4e0 100644 --- a/conf/master +++ b/conf/master @@ -131,15 +131,15 @@ # By default, events are not queued. #event_return_queue: 0 -# Only return events matching tags in a whitelist, -# event_return_whitelist: -# - salt/master/a_tag -# - salt/master/another_tag +# Only return events matching tags in a whitelist, supports glob matches. +#event_return_whitelist: +# - salt/master/a_tag +# - salt/run/*/ret -# Store all event returns _except_ the tags in a blacklist. -# event_return_blacklist: -# - salt/master/not_this_tag -# - salt/master/or_this_one +# Store all event returns **except** the tags in a blacklist, supports globs. +#event_return_blacklist: +# - salt/master/not_this_tag +# - salt/wheel/*/ret # Passing very large events can cause the minion to consume large amounts of # memory. This value tunes the maximum size of a message allowed onto the diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index cfb07e3700c..0fc059f05dd 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -229,6 +229,7 @@ The directory to store the pki authentication keys. --------------------- .. versionchanged:: 2016.3.0 + The default location for this directory has been moved. Prior to this version, the location was a directory named ``extmods`` in the Salt cachedir (on most platforms, ``/var/cache/salt/extmods``). It has been @@ -517,11 +518,15 @@ Default: ``[]`` Only return events matching tags in a whitelist. +.. versionchanged:: Carbon + + Supports glob matching patterns. + .. code-block:: yaml event_return_whitelist: - salt/master/a_tag - - salt/master/another_tag + - salt/run/*/ret .. conf_master:: event_return_blacklist @@ -534,11 +539,15 @@ Default: ``[]`` Store all event returns _except_ the tags in a blacklist. +.. versionchanged:: Carbon + + Supports glob matching patterns. + .. code-block:: yaml event_return_blacklist: - salt/master/not_this_tag - - salt/master/or_this_one + - salt/wheel/*/ret .. conf_master:: max_event_size @@ -1574,6 +1583,7 @@ Defines which branch/tag should be used as the ``base`` environment. gitfs_base: salt .. versionchanged:: 2014.7.0 + Ability to specify the base on a per-remote basis was added. See :ref:`here ` for more info. @@ -3348,6 +3358,7 @@ used. --------------- .. versionchanged:: 2015.8.0 + Renamed from ``win_repo`` to ``winrepo_dir``. Default: ``/srv/salt/win/repo`` @@ -3384,9 +3395,11 @@ out for 2015.8.0 and later minions. --------------------- .. versionchanged:: 2015.8.0 + Renamed from ``win_repo_mastercachefile`` to ``winrepo_cachefile`` .. note:: + 2015.8.0 and later minions do not use this setting since the cachefile is now located on the minion. @@ -3406,6 +3419,7 @@ created. ------------------- .. versionchanged:: 2015.8.0 + Renamed from ``win_gitrepos`` to ``winrepo_remotes``. Default: ``['https://github.com/saltstack/salt-winrepo.git']``