CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-09 10:42:54 +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/grafana/init.sls
View File

@@ -11,7 +11,7 @@
{% set GRAFANA_SETTINGS = salt['grains.filter_by'](default_settings, default='grafana', merge=salt['pillar.get']('grafana', {})) %}
{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone'] and GRAFANA == 1 %}
{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %}
# Grafana all the things
grafanadir: