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

handle senario where there are no measurements

Browse Source
This commit is contained in:
m0duspwnens
2021-06-29 07:46:25 -04:00
parent 1c516daa96
commit 6b68a39cbe
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/influxdb/defaults.yaml
View File

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

2
salt/influxdb/init.sls
View File

@@ -113,7 +113,7 @@ telegraf_database:
{% endfor %} {% endfor %}
{% for dest_rp in influxdb.downsample.keys() %} {% for dest_rp in influxdb.downsample.keys() %}
{% for measurement in influxdb.downsample[dest_rp].measurements %} {% for measurement in influxdb.downsample[dest_rp].get('measurements', []) %}
so_downsample_{{measurement}}_cq: so_downsample_{{measurement}}_cq:
influxdb_continuous_query.present: influxdb_continuous_query.present:
- name: so_downsample_{{measurement}}_cq - name: so_downsample_{{measurement}}_cq