saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Additions for #24042

Browse source
This commit is contained in:
Jacob Hammons 2015-07-30 15:43:21 -06:00
parent db2129b199
commit 3f3db4bd8e
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/master
View file

@ -389,7 +389,7 @@
# Send progress events as each function in a state run completes execution
# by setting to 'True'. Progress events are in the format
# 'salt/job/<job_id>/prog/<minion_id>/<run_num>'.
# 'salt/job/<JID>/prog/<MID>/<RUN NUM>'.
#state_events: False
##### File Server settings #####

2
doc/ref/configuration/master.rst
View file

@ -935,7 +935,7 @@ Default: ``False``
Send progress events as each function in a state run completes execution
by setting to ``True``. Progress events are in the format
``salt/job/<job_id>/prog/<minion_id>/<run_num>``.
``salt/job/<JID>/prog/<MID>/<RUN NUM>``.
.. code-block:: yaml

9
doc/topics/event/master_events.rst
View file

@ -86,6 +86,15 @@ Job events
:var fun: The function the minion ran. E.g., ``test.ping``.
:var return: The data returned from the execution module.
.. salt:event:: salt/job/<JID>/prog/<MID>/<RUN NUM>
Fired each time a each function in a state run completes execution. Must be
enabled using the :conf_master:`state_events` option.
:var data: The data returned from the state module function.
:var id: The minion ID.
:var jid: The job ID.
.. _event-master_presence:
Presence events