commit 97705c8390a93a745a84e5a80d1f7f146d979099
author ac2550 <ac2550@intl.att.com> Tue Oct 09 16:43:55 2018 +0200
committer ac2550 <ac2550@intl.att.com> Tue Oct 09 16:45:29 2018 +0200
tree bc295907e081d0c324e468195022fc2fcec36fa0
parent 50fbbca6bd81cd03ea54b29ac948522dc1f71bb1

Restore ELK5.x configuration on ELK6.x

Issue-ID: CLAMP-226
Change-Id: Ibc45fb78aae271d275c89c8a6723fa9f0a95fcb0
Signed-off-by: ac2550 <ac2550@intl.att.com>

src/main/docker/kibana/restore.py

diff --git a/src/main/docker/kibana/restore.py b/src/main/docker/kibana/restore.py
index f58701b..70f430c 100755
--- a/src/main/docker/kibana/restore.py
+++ b/src/main/docker/kibana/restore.py
@@ -90,7 +90,10 @@
 
             obj_id = obj['id']
             for key in ('id', 'version', 'type', 'updated_at'):
-                del obj[key]
+                try:
+                    del obj[key]
+                except KeyError:
+                    logger.info("Could not find key %s in %s[%s]", key, obj_type, obj_id)
 
             logger.info('Restoring %s id:%s (overwrite:%s)', obj_type, obj_id, args.force)
             url = "%s/api/saved_objects/%s/%s" % (args.kibana_host.rstrip("/"), obj_type, obj_id)