CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-09 18:52:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/merge-2.3.51

Browse Source 
# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
This commit is contained in:
William Wernert
2021-05-21 12:31:54 -04:00
parent de4fde4ee3 c5d0286e24
commit fe3aec173f
13 changed files with 45 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/soc/files/soc/soc.json
View File

@@ -54,7 +54,7 @@
"verifyCert": false
},
"influxdb": {
{%- if grains['role'] in ['so-import'] %}
{%- if grains['role'] in ['so-import'] or (grains['role'] == 'so-eval' and GRAFANA == 0) %}
"hostUrl": "",
{%- else %}
"hostUrl": "https://{{ MANAGERIP }}:8086",