Merge pull request #7020 from Security-Onion-Solutions/feature/dash_updates

EG and HL Dashboard Updates

salt/kibana/bin/so-kibana-config-load

@@ -1,5 +1,6 @@
 #!/bin/bash
 {%- set MANAGER = salt['pillar.get']('global:url_base', '') %}
+{%- set ENDGAMEHOST = salt['pillar.get']('soc:endgamehost', 'ENDGAMEHOST') %}
 . /usr/sbin/so-common
 
 check_file() {
@@ -24,6 +25,11 @@ import() {
     sed -i "s/PLACEHOLDER/{{ MANAGER }}/g" "$ndjson_file"
   fi
   
+  # Endgame
+  if grep -lq 'ENDGAMEHOST' "$ndjson_file"; then
+    sed -i "s/ENDGAMEHOST/{{ ENDGAMEHOST }}/g" "$ndjson_file"
+  fi
+ 
   wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}"
 
   SESSIONCOOKIE=$({{ ELASTICCURL }} -c - -X GET http://localhost:5601/ | grep sid | awk '{print $7}')

salt/kibana/so_dashboard_load.sls

@@ -1,3 +1,4 @@
+{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 include:
   - kibana
 
@@ -16,3 +17,20 @@ so-kibana-dashboard-load:
     - require:
       - sls: kibana
       - file: dashboard_saved_objects_template
+{%- if HIGHLANDER %}
+dashboard_saved_objects_template_hl:
+  file.managed:
+    - name: /opt/so/conf/kibana/hl.ndjson
+    - source: salt://kibana/files/hl.ndjson
+    - user: 932
+    - group: 939
+    - show_changes: False
+
+so-kibana-dashboard-load_hl:
+  cmd.run:
+    - name: /usr/sbin/so-kibana-config-load -i /opt/so/conf/kibana/hl.ndjson
+    - cwd: /opt/so
+    - require:
+      - sls: kibana
+      - file: dashboard_saved_objects_template_hl
+{%- endif %}