Merge pull request #160 from Security-Onion-Solutions/mastersearch

Mastersearch Menu Option

salt/common/grafana/etc/dashboards/dashboard.yml

@@ -17,13 +17,13 @@ providers:
   editable: true
   options:
     path: /etc/grafana/grafana_dashboards/forward_nodes
-- name: 'Storage Nodes'
-  folder: 'Storage Nodes'
+- name: 'Search Nodes'
+  folder: 'Search Nodes'
   type: file
   disableDeletion: false
   editable: true
   options:
-    path: /etc/grafana/grafana_dashboards/storage_nodes
+    path: /etc/grafana/grafana_dashboards/search_nodes
 {%- else %}
 - name: 'Security Onion'
   folder: 'Eval Mode'

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
 }

salt/firewall/init.sls

@@ -410,9 +410,9 @@ enable_forwardnode_sensoroni_9822_{{ip}}:
 
 {% endfor %}
 
-{% for ip in pillar.get('storage_nodes')  %}
+{% for ip in pillar.get('search_nodes')  %}
 
-enable_storagenode_redis_6379_{{ip}}:
+enable_searchnode_redis_6379_{{ip}}:
   iptables.insert:
     - table: filter
     - chain: DOCKER-USER
@@ -423,7 +423,7 @@ enable_storagenode_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,12 +578,12 @@ enable_standard_analyst_443_{{ip}}:
 
 {% endfor %}
 
-# Rules for storage nodes connecting to master
+# Rules for search nodes connecting to master
 
 
 {% endif %}
 
-# Rules if you are a Storage Node
+# Rules if you are a Node
 {% if grains['role'] == 'so-node' %}
 
 #This should be more granular

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

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"]}}}}}'