add sensoroni, telegraf, common states to desktop. allow docker_registry connection to managers for desktop

This commit is contained in:
m0duspwnens
2023-08-31 13:21:32 -04:00
parent e408718230
commit b010919099
3 changed files with 17 additions and 28 deletions

View File

@@ -2,6 +2,7 @@ base:
'*': '*':
- global.soc_global - global.soc_global
- global.adv_global - global.adv_global
- influxdb.token
- logrotate.soc_logrotate - logrotate.soc_logrotate
- logrotate.adv_logrotate - logrotate.adv_logrotate
- ntp.soc_ntp - ntp.soc_ntp
@@ -9,20 +10,19 @@ base:
- patch.needs_restarting - patch.needs_restarting
- patch.soc_patch - patch.soc_patch
- patch.adv_patch - patch.adv_patch
- sensoroni.soc_sensoroni
- sensoroni.adv_sensoroni
- telegraf.soc_telegraf
- telegraf.adv_telegraf
'* and not *_desktop': '* and not *_desktop':
- docker.soc_docker - docker.soc_docker
- docker.adv_docker - docker.adv_docker
- firewall.soc_firewall - firewall.soc_firewall
- firewall.adv_firewall - firewall.adv_firewall
- influxdb.token
- nginx.soc_nginx - nginx.soc_nginx
- nginx.adv_nginx - nginx.adv_nginx
- node_data.ips - node_data.ips
- sensoroni.soc_sensoroni
- sensoroni.adv_sensoroni
- telegraf.soc_telegraf
- telegraf.adv_telegraf
'*_manager or *_managersearch': '*_manager or *_managersearch':
- match: compound - match: compound

View File

@@ -463,6 +463,9 @@ firewall:
- endgame - endgame
desktop: desktop:
portgroups: portgroups:
- docker_registry
- influxdb
- sensoroni
- yum - yum
customhostgroup0: customhostgroup0:
portgroups: [] portgroups: []
@@ -651,6 +654,9 @@ firewall:
- endgame - endgame
desktop: desktop:
portgroups: portgroups:
- docker_registry
- influxdb
- sensoroni
- yum - yum
customhostgroup0: customhostgroup0:
portgroups: [] portgroups: []
@@ -847,6 +853,9 @@ firewall:
- strelka_frontend - strelka_frontend
desktop: desktop:
portgroups: portgroups:
- docker_registry
- influxdb
- sensoroni
- yum - yum
customhostgroup0: customhostgroup0:
portgroups: [] portgroups: []

View File

@@ -28,18 +28,18 @@ base:
- motd - motd
- salt.minion-check - salt.minion-check
- salt.lasthighstate - salt.lasthighstate
- common
- sensoroni
- telegraf
'not *_desktop and G@saltversion:{{saltversion}}': 'not *_desktop and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- common
- docker - docker
'*_sensor and G@saltversion:{{saltversion}}': '*_sensor and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- sensor - sensor
- ssl - ssl
- sensoroni
- telegraf
- firewall - firewall
- nginx - nginx
- pcap - pcap
@@ -57,11 +57,9 @@ base:
- ca - ca
- ssl - ssl
- registry - registry
- sensoroni
- manager - manager
- backup.config_backup - backup.config_backup
- nginx - nginx
- telegraf
- influxdb - influxdb
- soc - soc
- kratos - kratos
@@ -92,9 +90,7 @@ base:
- ca - ca
- ssl - ssl
- registry - registry
- sensoroni
- nginx - nginx
- telegraf
- influxdb - influxdb
- soc - soc
- kratos - kratos
@@ -124,11 +120,9 @@ base:
- ca - ca
- ssl - ssl
- registry - registry
- sensoroni
- manager - manager
- backup.config_backup - backup.config_backup
- nginx - nginx
- telegraf
- influxdb - influxdb
- soc - soc
- kratos - kratos
@@ -157,9 +151,7 @@ base:
'*_searchnode and G@saltversion:{{saltversion}}': '*_searchnode and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- ssl - ssl
- sensoroni
- nginx - nginx
- telegraf
- firewall - firewall
- elasticsearch - elasticsearch
- logstash - logstash
@@ -172,9 +164,7 @@ base:
- ca - ca
- ssl - ssl
- registry - registry
- sensoroni
- nginx - nginx
- telegraf
- influxdb - influxdb
- soc - soc
- kratos - kratos
@@ -201,9 +191,7 @@ base:
- match: compound - match: compound
- sensor - sensor
- ssl - ssl
- sensoroni
- nginx - nginx
- telegraf
- firewall - firewall
- elasticsearch - elasticsearch
- logstash - logstash
@@ -224,10 +212,8 @@ base:
- ca - ca
- ssl - ssl
- registry - registry
- sensoroni
- manager - manager
- nginx - nginx
- telegraf
- influxdb - influxdb
- soc - soc
- kratos - kratos
@@ -247,8 +233,6 @@ base:
'*_receiver and G@saltversion:{{saltversion}}': '*_receiver and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- ssl - ssl
- sensoroni
- telegraf
- firewall - firewall
- logstash - logstash
- redis - redis
@@ -258,8 +242,6 @@ base:
'*_idh and G@saltversion:{{saltversion}}': '*_idh and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- ssl - ssl
- sensoroni
- telegraf
- firewall - firewall
- elasticfleet.install_agent_grid - elasticfleet.install_agent_grid
- docker_clean - docker_clean
@@ -268,8 +250,6 @@ base:
'*_fleet and G@saltversion:{{saltversion}}': '*_fleet and G@saltversion:{{saltversion}}':
- match: compound - match: compound
- ssl - ssl
- sensoroni
- telegraf
- firewall - firewall
- logstash - logstash
- elasticfleet - elasticfleet