Browse Source

Add posibility to configure salt logging params:

- LOG_FILE
  - LOG_LEVEL
  - LOG_LEVEL_LOGFILE

Change-Id: Ic8c0c3bb2a4a80ba0590ca79d8e491dd4f840897
pull/73/head
Oleksii Chupryn 6 years ago
parent
commit
7b7102a675
5 changed files with 90 additions and 2 deletions
  1. +24
    -0
      README.rst
  2. +16
    -0
      salt/files/master.conf
  3. +17
    -2
      salt/files/minion.conf
  4. +24
    -0
      tests/pillar/master_logging.sls
  5. +9
    -0
      tests/pillar/minion_logging.sls

+ 24
- 0
README.rst View File

address: https://git.openstack.org/openstack/salt-formula-keystone address: https://git.openstack.org/openstack/salt-formula-keystone
revision: refs/changes/56/123456/1 revision: refs/changes/56/123456/1


Salt master logging configuration

.. code-block:: yaml

salt:
master:
enabled: true
log:
level: warning
file: '/var/log/salt/master'
level_logfile: warning

Salt minion logging configuration

.. code-block:: yaml

salt:
minion:
enabled: true
log:
level: info
file: '/var/log/salt/minion'
level_logfile: warning

Salt master with logging handlers Salt master with logging handlers


.. code-block:: yaml .. code-block:: yaml

+ 16
- 0
salt/files/master.conf View File

{%- endif %} {%- endif %}
{%- endif %} {%- endif %}


{%- if master.log is defined %}

{%- if master.log.level is defined %}
log_level: {{ master.log.level }}
{%- endif %}

{%- if master.log.file is defined %}
log_file: {{ master.log.file }}
{%- endif %}

{%- if master.log.level_logfile is defined %}
log_level_logfile: {{ master.log.level_logfile }}
{%- endif %}

{%- endif %}

{%- if pillar.salt.get('minion') %} {%- if pillar.salt.get('minion') %}
{%- for handler in pillar.salt.minion.get("handlers", []) %} {%- for handler in pillar.salt.minion.get("handlers", []) %}
{%- if handler.engine == "udp"%} {%- if handler.engine == "udp"%}

+ 17
- 2
salt/files/minion.conf View File



{%- endif %} {%- endif %}


log_level: {{ minion.log.get('level', 'error') }}
state_output: {{ minion.log.get('state_output', 'changes') }}
{%- if minion.log is defined %}

{%- if minion.log.level is defined %}
log_level: {{ minion.log.level }}
{%- endif %}

{%- if minion.log.file is defined %}
log_file: {{ minion.log.file }}
{%- endif %}

{%- if minion.log.level_logfile is defined %}
log_level_logfile: {{ minion.log.level_logfile }}
{%- endif %}

{%- endif %}

state_output: {{ minion.get('log', {}).get('state_output', 'changes') }}


{%- if minion.get('proxy', {}).get('host', "") != "" %} {%- if minion.get('proxy', {}).get('host', "") != "" %}
proxy_host: {{ minion.proxy.host }} proxy_host: {{ minion.proxy.host }}

+ 24
- 0
tests/pillar/master_logging.sls View File

git:
client:
enabled: true
linux:
system:
enabled: true
salt:
master:
command_timeout: 5
worker_threads: 2
enabled: true
source:
engine: pkg
pillar:
engine: salt
source:
engine: local
environment:
prd:
formula: {}
log:
level: warning
file: '/var/log/salt/master'
level_logfile: warning

+ 9
- 0
tests/pillar/minion_logging.sls View File

salt:
minion:
enabled: true
master:
host: config01.dc01.domain.com
log:
level: info
file: '/var/log/salt/minion'
level_logfile: warning

Loading…
Cancel
Save