Merge pull request #8704 from Security-Onion-Solutions/influx/defaults

remove jinja from influxdb defaults.yaml
This commit is contained in:
Josh Patterson
2022-09-09 15:42:46 -04:00
committed by GitHub
2 changed files with 9 additions and 8 deletions

View File

@@ -1,5 +1,3 @@
{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" 2> /root/measurement_query.log | jq -r .results[0].series[0].values[]?[0] 2>> /root/measurement_query.log', shell='/bin/bash') %}
influxdb:
retention_policies:
so_short_term:
@@ -13,9 +11,3 @@ influxdb:
downsample:
so_long_term:
resolution: 5m
{% if measurements|length > 0 %}
measurements:
{% for measurement in measurements.splitlines() %}
- {{ measurement }}
{% endfor %}
{% endif %}

9
salt/influxdb/map.jinja Normal file
View File

@@ -0,0 +1,9 @@
{% import_yaml 'influxdb/defaults.yaml' as INFLUXDB %}
{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" 2> /root/measurement_query.log | jq -r .results[0].series[0].values[]?[0] 2>> /root/measurement_query.log', shell='/bin/bash') %}
{% if measurements|length > 0 %}
{% do INFLUXDB.influxdb.downsample.so_long_term.update('measurements': [])%}
{% for measurement in measurements.splitlines() %}
{% do INFLUXDB.influxdb.downsample.so_long_term.measurements.append(measurement)%}
{% endfor %}
{% endif %}