From aed73511e49fc185a0c012f6db24e50e550180d5 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 20 Sep 2021 09:24:03 -0400
Subject: [PATCH] file cleanup, comment cleanup

---
 salt/elasticsearch/config.map.jinja        |  5 --
 salt/elasticsearch/files/elasticsearch.yml | 72 ----------------------
 2 files changed, 77 deletions(-)
 delete mode 100644 salt/elasticsearch/files/elasticsearch.yml

diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index d0944842c..1ca729143 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -1,8 +1,3 @@
-# soup needs
-# elasticsearch:esclustername pillar move to elasticsearch:config:cluster:name
-# move elasticsearch:true_cluster_name to elasticsearch:config:cluster:name if true_cluster enabled
-# elasticsearch:node_route_type moved
-
 {% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
 
 {% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
diff --git a/salt/elasticsearch/files/elasticsearch.yml b/salt/elasticsearch/files/elasticsearch.yml
deleted file mode 100644
index 518cd74e9..000000000
--- a/salt/elasticsearch/files/elasticsearch.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-{%- set NODE_ROUTE_TYPE = salt['pillar.get']('elasticsearch:node_route_type', 'hot') %}
-{%- set NODEIP = salt['pillar.get']('elasticsearch:mainip') %}
-{%- set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
-{%- if TRUECLUSTER is sameas true %}
-  {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:true_cluster_name') %}
-{%- else %}
-  {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:esclustername') %}
-{%- endif %}
-{%- set NODE_ROLES = salt['pillar.get']('elasticsearch:node_roles', ['data', 'ingest']) %}
-cluster.name: "{{ ESCLUSTERNAME }}"
-network.host: 0.0.0.0
-path.logs: /var/log/elasticsearch
-action.destructive_requires_name: true
-transport.bind_host: 0.0.0.0
-transport.publish_host: {{ grains.host }}
-transport.publish_port: 9300
-cluster.routing.allocation.disk.threshold_enabled: true
-cluster.routing.allocation.disk.watermark.low: 95%
-cluster.routing.allocation.disk.watermark.high: 98%
-cluster.routing.allocation.disk.watermark.flood_stage: 98%
-xpack.ml.enabled: false
-xpack.security.enabled: true
-xpack.security.transport.ssl.enabled: true
-xpack.security.transport.ssl.verification_mode: none
-xpack.security.transport.ssl.key: /usr/share/elasticsearch/config/elasticsearch.key
-xpack.security.transport.ssl.certificate: /usr/share/elasticsearch/config/elasticsearch.crt
-xpack.security.transport.ssl.certificate_authorities: [ "/usr/share/elasticsearch/config/ca.crt" ]
-xpack.security.http.ssl.enabled: true
-xpack.security.http.ssl.client_authentication: none
-xpack.security.http.ssl.key: /usr/share/elasticsearch/config/elasticsearch.key
-xpack.security.http.ssl.certificate: /usr/share/elasticsearch/config/elasticsearch.crt
-xpack.security.http.ssl.certificate_authorities: /usr/share/elasticsearch/config/ca.crt
-{% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
-xpack.security.authc:
-  anonymous:
-    username: anonymous_user
-    roles: superuser
-    authz_exception: true
-{% endif %}
-node.name: {{ grains.host }}
-script.max_compilations_rate: 20000/1m
-{%- if TRUECLUSTER is sameas true %}
-  {%- if grains.role == 'so-manager' %}
-    {%- if salt['pillar.get']('nodestab', {}) %}
-node.roles: [ master, data, remote_cluster_client ]
-discovery.seed_hosts:
-   - {{ grains.master }}
-      {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
-   - {{ SN.split('_')|first }}
-      {%- endfor %}
-    {%- endif %}
-  {%- elif grains.role == 'so-managersearch' %}
-      {%- if salt['pillar.get']('nodestab', {}) %}
-node.roles: [ master, data, remote_cluster_client ]
-discovery.seed_hosts:
-   - {{ grains.master }}
-      {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
-   - {{ SN.split('_')|first }}
-      {%- endfor %}
-    {%- endif %}
-node.attr.box_type: {{ NODE_ROUTE_TYPE }}
-  {%- else %}
-node.roles: {{ NODE_ROLES }}
-node.attr.box_type: {{ NODE_ROUTE_TYPE }}
-discovery.seed_hosts:
-   - {{ grains.master }}
-  {%- endif %}
-{%- endif %}
-{%- if TRUECLUSTER is sameas false %}
-node.attr.box_type: {{ NODE_ROUTE_TYPE }}
-{%- endif %}
-indices.query.bool.max_clause_count: 1500