Sfoglia il codice sorgente

Fix metadata generation

tags/0.4
Ales Komarek 9 anni fa
parent
commit
6ce3d5f76e
2 ha cambiato i file con 33 aggiunte e 31 eliminazioni
  1. +13
    -12
      salt/meta/sensu.yml
  2. +20
    -19
      salt/meta/sphinx.yml

+ 13
- 12
salt/meta/sensu.yml Vedi File

@@ -1,12 +1,13 @@
local_salt_master_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-master -u root -c 1:10"
interval: 60
occurrences: 1
subscribers:
- local-salt-master
local_salt_minion_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-minion -u root -c 1:10"
interval: 60
occurrences: 1
subscribers:
- local-salt-minion
check:
local_salt_master_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-master -u root -c 1:10"
interval: 60
occurrences: 1
subscribers:
- local-salt-master
local_salt_minion_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-minion -u root -c 1:10"
interval: 60
occurrences: 1
subscribers:
- local-salt-minion

+ 20
- 19
salt/meta/sphinx.yml Vedi File

@@ -1,19 +1,20 @@
name: Salt
description: Salt is a new approach to infrastructure management. Easy enough to get running in minutes, scalable enough to manage tens of thousands of servers, and fast enough to communicate with them in seconds.
role:
{%- if pillar.salt.minion is defined %}
{%- from "salt/map.jinja" import minion with context %}
minion:
name: minion
param:
version:
value: {{ salt['cmd.run']('salt-minion --version')|replace('salt-minion ', '') }}
{%- endif %}
{%- if pillar.salt.master is defined %}
{%- from "salt/map.jinja" import master with context %}
master:
name: master
param:
version:
value: {{ salt['cmd.run']('salt --version')|replace('salt ', '') }}
{%- endif %}
doc:
name: Salt
description: Salt is a new approach to infrastructure management. Easy enough to get running in minutes, scalable enough to manage tens of thousands of servers, and fast enough to communicate with them in seconds.
role:
{%- if pillar.salt.minion is defined %}
{%- from "salt/map.jinja" import minion with context %}
minion:
name: minion
param:
version:
value: {{ salt['cmd.run']('salt-minion --version')|replace('salt-minion ', '') }}
{%- endif %}
{%- if pillar.salt.master is defined %}
{%- from "salt/map.jinja" import master with context %}
master:
name: master
param:
version:
value: {{ salt['cmd.run']('salt --version')|replace('salt ', '') }}
{%- endif %}

Loading…
Annulla
Salva