From 947285e932967fa597a3e081483c4a8cc98384e6 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 15 Oct 2021 16:06:25 -0400
Subject: [PATCH] update cmd.run amd s_o files

---
 salt/kibana/bin/so-kibana-config-load                   | 2 +-
 salt/kibana/files/config_saved_objects.ndjson           | 2 +-
 salt/kibana/files/securitySolution_saved_objects.ndjson | 2 +-
 salt/kibana/so_dashboard_load.sls                       | 2 +-
 salt/kibana/so_securitySolution_load.sls                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index 8d246819c..a1619f5ce 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -36,7 +36,7 @@ update() {
   wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}"  
   IFS=$'\r\n' GLOBIGNORE='*' command eval  'LINES=($(cat $1))'
   for i in "${LINES[@]}"; do
-    {{ ELASTICCURL }} -X PUT "localhost:5601/api/saved_objects/config/7.15.0" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d " $i "
+    {{ ELASTICCURL }} -X PUT "localhost:5601/api/saved_objects/config/securityonion" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d " $i "
   done
 
 }
diff --git a/salt/kibana/files/config_saved_objects.ndjson b/salt/kibana/files/config_saved_objects.ndjson
index b62396ce2..303c0636d 100644
--- a/salt/kibana/files/config_saved_objects.ndjson
+++ b/salt/kibana/files/config_saved_objects.ndjson
@@ -1 +1 @@
-{"attributes": {"buildNum": 39457,"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize": 100,"theme:darkMode": true,"timepicker:timeDefaults": "{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"},"coreMigrationVersion": "7.15.0","id": "7.15.0","migrationVersion": {"config": "7.13.0"},"references": [],"type": "config","updated_at": "2021-10-10T10:10:10.105Z","version": "WzI5NzUsMl0="}
+{"attributes": {"buildNum": 39457,"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize": 100,"theme:darkMode": true,"timepicker:timeDefaults": "{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"},"coreMigrationVersion": "7.15.0","id": "securityonion","migrationVersion": {"config": "7.13.0"},"references": [],"type": "config","updated_at": "2021-10-10T10:10:10.105Z","version": "WzI5NzUsMl0="}
diff --git a/salt/kibana/files/securitySolution_saved_objects.ndjson b/salt/kibana/files/securitySolution_saved_objects.ndjson
index b0df37ffe..4bb176a80 100644
--- a/salt/kibana/files/securitySolution_saved_objects.ndjson
+++ b/salt/kibana/files/securitySolution_saved_objects.ndjson
@@ -1 +1 @@
-{"attributes": {"securitySolution:defaultIndex": ["apm-*-transaction*", "traces-apm*", "auditbeat-*", "endgame-*", "filebeat-*", "logs-*", "packetbeat-*", "winlogbeat-*", "so-*"]},"type": "config","updated_at": "2021-10-10T10:10:10.105Z","version": "WzI5NzUsMl0="}
+{"attributes": {"securitySolution:defaultIndex": ["apm-*-transaction*", "traces-apm*", "auditbeat-*", "endgame-*", "filebeat-*", "logs-*", "packetbeat-*", "winlogbeat-*", "so-*"]}}
diff --git a/salt/kibana/so_dashboard_load.sls b/salt/kibana/so_dashboard_load.sls
index 0088a4203..4ee6b8f37 100644
--- a/salt/kibana/so_dashboard_load.sls
+++ b/salt/kibana/so_dashboard_load.sls
@@ -10,7 +10,7 @@ dashboard_saved_objects_template:
 
 so-kiba-dashboard-load:
   cmd.run:
-    - name: /usr/sbin/so-kibana-config-load /opt/so/conf/kibana/saved_objects.ndjson
+    - name: /usr/sbin/so-kibana-config-load -u /opt/so/conf/kibana/saved_objects.ndjson
     - cwd: /opt/so
     - require:
       - sls: kibana
diff --git a/salt/kibana/so_securitySolution_load.sls b/salt/kibana/so_securitySolution_load.sls
index 082e414d3..af0ba5b46 100644
--- a/salt/kibana/so_securitySolution_load.sls
+++ b/salt/kibana/so_securitySolution_load.sls
@@ -10,7 +10,7 @@ securitySolution_saved_objects:
 
 so-kiba-securitySolution_saved_objects-load:
   cmd.run:
-    - name: /usr/sbin/so-kibana-config-load /opt/so/conf/kibana/securitySolution_saved_objects.ndjson
+    - name: /usr/sbin/so-kibana-config-load -i /opt/so/conf/kibana/securitySolution_saved_objects.ndjson
     - cwd: /opt/so
     - require:
       - sls: kibana