Merge pull request #445 from Security-Onion-Solutions/fix/kibana_config

more Kibana config

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

@@ -0,0 +1,17 @@
+#!/bin/bash
+VERSION="7.6.1"
+curl -X PUT "localhost:5601/api/saved_objects/config/$VERSION" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
+{ "attributes":
+        {
+          "defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29",
+          "defaultRoute":"/app/kibana#/dashboard/a8411b30-6d03-11ea-b301-3d6c35840645",
+          "discover:sampleSize":"100",
+          "dashboard:defaultDarkTheme":true,
+          "theme:darkMode":true,
+          "timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\",\n  \"mode\": \"quick\"\n}"
+        }
+}'
+
+
+curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/saltstack/salt/kibana/etc/saved_objects.ndjson
+

salt/kibana/etc/config.json

@@ -1,9 +1,10 @@
 { "attributes":
-	{
+        {
-    "defaultIndex": "*:so-*",
+          "defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29",
-		"discover:sampleSize":"100",
+          "defaultRoute":"/app/kibana#/dashboard/a8411b30-6d03-11ea-b301-3d6c35840645",
-	  "dashboard:defaultDarkTheme":true,
+          "discover:sampleSize":"100",
-	  "theme:darkMode":true,
+          "dashboard:defaultDarkTheme":true,
-	  "timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\",\n  \"mode\": \"quick\"\n}"
+          "theme:darkMode":true,
-	}
+          "timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\",\n  \"mode\": \"quick\"\n}"
+        }
 }

salt/kibana/init.sls

@@ -1,11 +1,4 @@
-{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %}
+{% set master = salt['grains.get']('master') %}
-{% set MASTER = salt['grains.get']('master') %}
-{% set FEATURES = salt['pillar.get']('elastic:features', False) %}
-{% if FEATURES %}
-  {% set FEATURES = "-features" %}
-{% else %}
-  {% set FEATURES = '' %}
-{% endif %}
 
 # Add ES Group
 kibanasearchgroup:
@@ -59,17 +52,25 @@ synckibanacustom:
     - user: 932
     - group: 939
 
+# File.Recurse for custom saved dashboards
+
+so-kibanaimage:
+ cmd.run:
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-kibana:HH1.1.1
+
 # Start the kibana docker
 so-kibana:
   docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-kibana:{{ VERSION }}{{ FEATURES }}
+    - require:
+      - so-kibanaimage
+    - image: docker.io/soshybridhunter/so-kibana:HH1.1.1
     - hostname: kibana
     - user: kibana
     - environment:
       - KIBANA_DEFAULTAPPID=dashboard/94b52620-342a-11e7-9d52-4f090484f59e
-      - ELASTICSEARCH_HOST={{ MASTER }}
+      - ELASTICSEARCH_HOST={{ master }}
       - ELASTICSEARCH_PORT=9200
-      - MASTER={{ MASTER }}
+      - MASTER={{ master }}
     - binds:
       - /opt/so/conf/kibana/etc:/usr/share/kibana/config:rw
       - /opt/so/log/kibana:/var/log/kibana:rw
@@ -77,3 +78,17 @@ so-kibana:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     - port_bindings:
       - 0.0.0.0:5601:5601
+
+so-kibana-config-load:
+  cmd.script:
+    - shell: /bin/bash
+    - runas: socore
+    - source: salt://kibana/bin/so-kibana-config-load
+
+# Keep the setting correct
+#KibanaHappy:
+#  cmd.script:
+#    - shell: /bin/bash
+#    - runas: socore
+#    - source: salt://kibana/bin/keepkibanahappy.sh
+#    - template: jinja