From bdd2742eef0d01d7baf7a498b8b85c9e72171f18 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Tue, 18 Apr 2017 17:39:52 +0200
Subject: Cleanup load.sh script.

---
 elastic/load.sh | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/elastic/load.sh b/elastic/load.sh
index f46466a..c68634b 100755
--- a/elastic/load.sh
+++ b/elastic/load.sh
@@ -13,7 +13,6 @@
 ELASTICSEARCH=http://localhost:9200
 CURL='curl --netrc'
 KIBANA_INDEX=".kibana"
-BEAT_CONFIG=".beatconfig"
 
 print_usage() {
   echo "
@@ -86,35 +85,21 @@ esac
 shift 2
 done
 
-if [ -f ${BEAT_CONFIG} ]; then
-  for ln in `cat ${BEAT_CONFIG}`; do
-    BUILD_STRING="${BUILD_STRING}s/${ln}/g;"
-  done
-  SED_STRING=`echo ${BUILD_STRING} | sed 's/;$//'`
-fi
-# Failsafe
-if [ -z ${SED_STRING} ]; then
-  SED_STRING="s/packetbeat-/packetbeat-/g;s/filebeat-/filebeat-/g;s/topbeat-/topbeat-/g;s/winlogonbeat-/winlogonbeat-/g"
-fi
-
 DIR=.
 echo "Loading dashboards to ${ELASTICSEARCH} in ${KIBANA_INDEX}"
 
 # Workaround for: https://github.com/elastic/beats-dashboards/issues/94
-${CURL} -XPUT "${ELASTICSEARCH}/${KIBANA_INDEX}"
-${CURL} -XPUT "${ELASTICSEARCH}/${KIBANA_INDEX}/_mapping/search" -d'{"search": {"properties": {"hits": {"type": "integer"}, "version": {"type": "integer"}}}}'
+#${CURL} -XPUT "${ELASTICSEARCH}/${KIBANA_INDEX}"
+#${CURL} -XPUT "${ELASTICSEARCH}/${KIBANA_INDEX}/_mapping/search" -d'{"search": {"properties": {"hits": {"type": "integer"}, "version": {"type": "integer"}}}}'
 
-TMP_SED_FILE="${DIR}/search/tmp_search.json"
 for file in ${DIR}/search/*.json
 do
     NAME=`basename ${file} .json`
     echo "Loading search ${NAME}:"
-    sed ${SED_STRING} ${file} > ${TMP_SED_FILE}
     ${CURL} -XPUT ${ELASTICSEARCH}/${KIBANA_INDEX}/search/${NAME} \
-        -d @${TMP_SED_FILE} || exit 1
+        -d @${file} || exit 1
     echo
 done
-rm ${TMP_SED_FILE}
 
 for file in ${DIR}/index-pattern/*.json
 do
-- 
cgit v1.2.3