valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add filter type to state_output

Browse Source
This commit is contained in:
Joseph Hall 2014-08-01 07:22:47 -06:00 committed by Colton Myers
parent ecc9ce4f35
commit bcdc5ce5bb
1 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
salt/output/highstate.py
View File

@ -16,14 +16,20 @@ state_verbose:
instruct the highstate outputter to omit displaying anything in green, this instruct the highstate outputter to omit displaying anything in green, this
means that nothing with a result of True and no changes will not be printed means that nothing with a result of True and no changes will not be printed
state_output: state_output:
The highstate outputter has three output modes, `full`, `terse`, `mixed`, The highstate outputter has five output modes, `full`, `terse`, `mixed`,
and `changes`. The default is set to full, which will display many lines of `changes` and `filter`. The default is set to full, which will display many
detailed information for each executed chunk. If the `state_output` option lines of detailed information for each executed chunk. If the `state_output`
is set to `terse` then the output is greatly simplified and shown in only option is set to `terse` then the output is greatly simplified and shown in
one line. If `mixed` is used, then terse output will be used unless a only one line. If `mixed` is used, then terse output will be used unless a
state failed, in which case full output will be used. If `changes` is used, state failed, in which case full output will be used. If `changes` is used,
then terse output will be used if there was no error and no changes, then terse output will be used if there was no error and no changes,
otherwise full output will be used. otherwise full output will be used. If `filter` is used, then either or both
of two different filters can be used: `exclude` or `terse`. These can be set
as such from the command line, or in the Salt config as
`state_output_exclude` or `state_output_terse`, respectively. The values to
exclude must be a comma-separated list of `True`, `False` and/or `None`.
Because of parsing nuances, if only one of these is used, it must still
contain a comma. For instance: `exclude=True,`.
state_tabular: state_tabular:
If `state_output` uses the terse output, set this to `True` for an aligned If `state_output` uses the terse output, set this to `True` for an aligned
output format. If you wish to use a custom format, this can be set to a output format. If you wish to use a custom format, this can be set to a
@ -56,6 +62,7 @@ import pprint
# Import salt libs # Import salt libs
import salt.utils import salt.utils
import salt.output import salt.output
from salt._compat import string_types
def output(data): def output(data):
@ -125,7 +132,40 @@ def _format_host(host, data):
hcolor = colors['YELLOW'] hcolor = colors['YELLOW']
tcolor = colors['YELLOW'] tcolor = colors['YELLOW']
comps = tname.split('_|-') comps = tname.split('_|-')
if __opts__.get('state_output', 'full').lower() == 'terse': if __opts__.get('state_output', 'full').lower() == 'filter':
# By default, full data is shown for all types. However, return
# data may be excluded by setting state_output_exclude to a
# comma-separated list of True, False or None, or including the
# same list with the exclude option on the command line. For
# now, this option must include a comma. For example:
# exclude=True,
# The same functionality is also available for making return
# data terse, instead of excluding it.
cliargs = __opts__.get('arg', [])
clikwargs = {}
for item in cliargs:
if isinstance(item, dict) and '__kwarg__' in item:
clikwargs = item.copy()
exclude = clikwargs.get(
'exclude', __opts__.get('state_output_exclude', [])
)
if isinstance(exclude, string_types):
exclude = str(exclude).split(',')
terse = clikwargs.get(
'terse', __opts__.get('state_output_terse', [])
)
if isinstance(terse, string_types):
terse = str(terse).split(',')
if str(ret['result']) in terse:
msg = _format_terse(tcolor, comps, ret, colors, tabular)
hstrs.append(msg)
continue
if str(ret['result']) in exclude:
continue
elif __opts__.get('state_output', 'full').lower() == 'terse':
# Print this chunk in a terse way and continue in the # Print this chunk in a terse way and continue in the
# loop # loop
msg = _format_terse(tcolor, comps, ret, colors, tabular) msg = _format_terse(tcolor, comps, ret, colors, tabular)