LS salt module - init file cleanup

This commit is contained in:
Mike Reeves
2018-02-13 10:20:15 -05:00
parent 015a968ab2
commit 4775cbb5ec

View File

@@ -82,15 +82,11 @@ lslogdir:
- group: 939 - group: 939
- makedirs: True - makedirs: True
# Drop the ruleset file so it can be appended if needed.
{% if freq == '0' and dstats == '0' %} {% if freq == '0' and dstats == '0' %}
/opt/so/conf/logstash/rulesets: /opt/so/conf/logstash/rulesets:
file.managed: file.managed:
- contents: - contents:
- # Do nto edit this file. Change in salt otherwise changes will be overwritten
- FREQ=0 - FREQ=0
- DSTATS=0 - DSTATS=0
@@ -98,28 +94,26 @@ removefreq:
- name: /opt/so/conf/logstash/pipeline/*_postprocess_freq_analysis_*.conf - name: /opt/so/conf/logstash/pipeline/*_postprocess_freq_analysis_*.conf
removedstats1: removedstats1:
- name: 8007_postprocess_dns_top1m_tagging.conf - name: /opt/so/conf/logstash/pipeline/8007_postprocess_dns_top1m_tagging.conf
removedstats2: removedstats2:
- name: 8008_postprocess_dns_whois_age.conf - name: /opt/so/conf/logstash/pipeline/8008_postprocess_dns_whois_age.conf
{% elif freq == '1' and dstats == '0' %} {% elif freq == '1' and dstats == '0' %}
/opt/so/conf/logstash/rulesets: /opt/so/conf/logstash/rulesets:
file.managed: file.managed:
- contents: - contents:
- # Do nto edit this file. Change in salt otherwise changes will be overwritten
- FREQ=1 - FREQ=1
- DSTATS=0 - DSTATS=0
removedstats1: removedstats1:
- name: 8007_postprocess_dns_top1m_tagging.conf - name: /opt/so/conf/logstash/pipeline/8007_postprocess_dns_top1m_tagging.conf
removedstats2: removedstats2:
- name: 8008_postprocess_dns_whois_age.conf - name: /opt/so/conf/logstash/pipeline/8008_postprocess_dns_whois_age.conf
{% elif freq == '1' and dstats == '1' %} {% elif freq == '1' and dstats == '1' %}
/opt/so/conf/logstash/rulesets: /opt/so/conf/logstash/rulesets:
file.managed: file.managed:
- contents: - contents:
- # Do nto edit this file. Change in salt otherwise changes will be overwritten
- FREQ=1 - FREQ=1
- DSTATS=1 - DSTATS=1
@@ -127,7 +121,6 @@ removedstats2:
/opt/so/conf/logstash/rulesets: /opt/so/conf/logstash/rulesets:
file.managed: file.managed:
- contents: - contents:
- # Do nto edit this file. Change in salt otherwise changes will be overwritten
- FREQ=0 - FREQ=0
- DSTATS=1 - DSTATS=1
@@ -142,6 +135,7 @@ so-logstash:
docker_container.running: docker_container.running:
- image: toosmooth/so-logstash:test2 - image: toosmooth/so-logstash:test2
- hostname: logstash - hostname: logstash
- name: logstash
- user: logstash - user: logstash
- environment: - environment:
- LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }} - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}