From 5ead3a26b607bb39a518cd0c17d3188afb4f69f9 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 17 Dec 2019 15:32:43 -0500
Subject: [PATCH] Rename Storage to Search Nodes

---
 .../grafana/grafana_dashboards/search_nodes/searchnode.json | 4 ++--
 salt/firewall/init.sls                                      | 6 +++---
 salt/top.sls                                                | 4 ++--
 salt/utility/bin/crossthestreams.sh                         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/salt/common/grafana/grafana_dashboards/search_nodes/searchnode.json b/salt/common/grafana/grafana_dashboards/search_nodes/searchnode.json
index 2f9a1111a..12688e15c 100644
--- a/salt/common/grafana/grafana_dashboards/search_nodes/searchnode.json
+++ b/salt/common/grafana/grafana_dashboards/search_nodes/searchnode.json
@@ -12,7 +12,7 @@
       }
     ]
   },
-  "description": "This Dashboard provides a general overview of a Storage Node",
+  "description": "This Dashboard provides a general overview of a Search Node",
   "editable": true,
   "gnetId": 2381,
   "graphTooltip": 0,
@@ -3433,7 +3433,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Storage Node - {{ SERVERNAME }} Overview",
+  "title": "Search Node - {{ SERVERNAME }} Overview",
   "uid": "{{ UID }}",
   "version": 3
 }
diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls
index fe38b4cd9..f70632c9f 100644
--- a/salt/firewall/init.sls
+++ b/salt/firewall/init.sls
@@ -410,7 +410,7 @@ enable_forwardnode_sensoroni_9822_{{ip}}:
 
 {% endfor %}
 
-{% for ip in pillar.get('ssearch_nodes')  %}
+{% for ip in pillar.get('search_nodes')  %}
 
 enable_searchnode_redis_6379_{{ip}}:
   iptables.insert:
@@ -423,7 +423,7 @@ enable_searchnode_redis_6379_{{ip}}:
     - position: 1
     - save: True
 
-enable_storagenode_ES_9300_{{ip}}:
+enable_searchnode_ES_9300_{{ip}}:
   iptables.insert:
     - table: filter
     - chain: DOCKER-USER
@@ -578,7 +578,7 @@ enable_standard_analyst_443_{{ip}}:
 
 {% endfor %}
 
-# Rules for storage nodes connecting to master
+# Rules for search nodes connecting to master
 
 
 {% endif %}
diff --git a/salt/top.sls b/salt/top.sls
index 7a6d5b99b..265214216 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -117,7 +117,7 @@ base:
     {%- endif %}
 
 
-  # Storage node logic
+  # Search node logic
 
   'G@role:so-node and I@node:node_type:parser':
     - match: pillar
@@ -151,7 +151,7 @@ base:
     {%- endif %}
     - schedule
 
-  'G@role:so-node and I@node:node_type:storage':
+  'G@role:so-node and I@node:node_type:search':
     - match: compound
     - ca
     - ssl
diff --git a/salt/utility/bin/crossthestreams.sh b/salt/utility/bin/crossthestreams.sh
index 3cd8b005c..23279ff13 100644
--- a/salt/utility/bin/crossthestreams.sh
+++ b/salt/utility/bin/crossthestreams.sh
@@ -29,7 +29,7 @@ echo "Applying cross cluster search config..."
          -H 'Content-Type: application/json' \
          -d "{\"persistent\": {\"search\": {\"remote\": {\"{{ MASTER }}\": {\"seeds\": [\"127.0.0.1:9300\"]}}}}}"
 
-# Add all the storage nodes to cross cluster searching.
+# Add all the search nodes to cross cluster searching.
 
 {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
 curl -XPUT http://{{ ES }}:9200/_cluster/settings -H'Content-Type: application/json' -d '{"persistent": {"search": {"remote": {"{{ SN }}": {"skip_unavailable": "true", "seeds": ["{{ SNDATA.ip }}:9300"]}}}}}'