mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-10 19:22:54 +01:00
allow states for desktop. give all nodes docker_clean, order it last
This commit is contained in:
@@ -188,6 +188,8 @@
|
|||||||
'docker_clean'
|
'docker_clean'
|
||||||
],
|
],
|
||||||
'so-desktop': [
|
'so-desktop': [
|
||||||
|
'docker_clean',
|
||||||
|
'telegraf'
|
||||||
],
|
],
|
||||||
}, grain='role') %}
|
}, grain='role') %}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
prune_images:
|
prune_images:
|
||||||
cmd.run:
|
cmd.run:
|
||||||
- name: so-docker-prune
|
- name: so-docker-prune
|
||||||
|
- order: last
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
||||||
|
|||||||
12
salt/top.sls
12
salt/top.sls
@@ -32,6 +32,7 @@ base:
|
|||||||
- docker
|
- docker
|
||||||
- sensoroni
|
- sensoroni
|
||||||
- telegraf
|
- telegraf
|
||||||
|
- docker_clean
|
||||||
|
|
||||||
'*_sensor and G@saltversion:{{saltversion}}':
|
'*_sensor and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -44,7 +45,6 @@ base:
|
|||||||
- healthcheck
|
- healthcheck
|
||||||
- zeek
|
- zeek
|
||||||
- strelka
|
- strelka
|
||||||
- docker_clean
|
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
|
|
||||||
'*_eval and G@saltversion:{{saltversion}}':
|
'*_eval and G@saltversion:{{saltversion}}':
|
||||||
@@ -79,7 +79,6 @@ base:
|
|||||||
- playbook
|
- playbook
|
||||||
- redis
|
- redis
|
||||||
- elasticfleet
|
- elasticfleet
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_manager and G@saltversion:{{saltversion}}':
|
'*_manager and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -108,7 +107,6 @@ base:
|
|||||||
- soctopus
|
- soctopus
|
||||||
- playbook
|
- playbook
|
||||||
- elasticfleet
|
- elasticfleet
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_standalone and G@saltversion:{{saltversion}}':
|
'*_standalone and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -143,7 +141,6 @@ base:
|
|||||||
- soctopus
|
- soctopus
|
||||||
- playbook
|
- playbook
|
||||||
- elasticfleet
|
- elasticfleet
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_searchnode and G@saltversion:{{saltversion}}':
|
'*_searchnode and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -153,7 +150,6 @@ base:
|
|||||||
- elasticsearch
|
- elasticsearch
|
||||||
- logstash
|
- logstash
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_managersearch and G@saltversion:{{saltversion}}':
|
'*_managersearch and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -182,7 +178,6 @@ base:
|
|||||||
- soctopus
|
- soctopus
|
||||||
- playbook
|
- playbook
|
||||||
- elasticfleet
|
- elasticfleet
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_heavynode and G@saltversion:{{saltversion}}':
|
'*_heavynode and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -200,7 +195,6 @@ base:
|
|||||||
- zeek
|
- zeek
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
- elasticagent
|
- elasticagent
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_import and G@saltversion:{{saltversion}}':
|
'*_import and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -225,7 +219,6 @@ base:
|
|||||||
- suricata
|
- suricata
|
||||||
- zeek
|
- zeek
|
||||||
- elasticfleet
|
- elasticfleet
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_receiver and G@saltversion:{{saltversion}}':
|
'*_receiver and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
@@ -234,14 +227,12 @@ base:
|
|||||||
- logstash
|
- logstash
|
||||||
- redis
|
- redis
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'*_idh and G@saltversion:{{saltversion}}':
|
'*_idh and G@saltversion:{{saltversion}}':
|
||||||
- match: compound
|
- match: compound
|
||||||
- ssl
|
- ssl
|
||||||
- firewall
|
- firewall
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
- docker_clean
|
|
||||||
- idh
|
- idh
|
||||||
|
|
||||||
'*_fleet and G@saltversion:{{saltversion}}':
|
'*_fleet and G@saltversion:{{saltversion}}':
|
||||||
@@ -252,7 +243,6 @@ base:
|
|||||||
- elasticfleet
|
- elasticfleet
|
||||||
- elasticfleet.install_agent_grid
|
- elasticfleet.install_agent_grid
|
||||||
- schedule
|
- schedule
|
||||||
- docker_clean
|
|
||||||
|
|
||||||
'J@desktop:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:OEL )':
|
'J@desktop:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:OEL )':
|
||||||
- match: compound
|
- match: compound
|
||||||
|
|||||||
Reference in New Issue
Block a user