From: osgn422w <gervais-martial.ngueko@intl.att.com>
Date: Mon, 29 Jul 2019 17:37:23 +0000 (+0200)
Subject: kibana authentication
X-Git-Tag: 4.1.0~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=clamp.git;a=commitdiff_plain;h=b1a5ff06d333c6bcca7c51bfbb0f79b98638e387

kibana authentication

add kibana authentication to load script

Issue-ID: CLAMP-419

Change-Id: I02851f26a3916110a5e3544746db04aed274c5ab
Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
---

diff --git a/src/main/docker/kibana/backup.py b/src/main/docker/kibana/backup.py
index a2dab222..b1e45181 100755
--- a/src/main/docker/kibana/backup.py
+++ b/src/main/docker/kibana/backup.py
@@ -48,7 +48,7 @@ def parse_args(args):
                               ' matching a configuration item that should be written.'
                               ' Files already in the folder that do not match are'
                               ' left as-is.'))
-    parser.add_argument('-H', '--kibana-host', default='http://localhost:5601',
+    parser.add_argument('-H', '--kibana-host', default='https://localhost:5601',
                         help='Kibana endpoint.')
 
     return parser.parse_args(args)
@@ -68,7 +68,7 @@ def main():
 
     # get list of the set of objects we update
     url = "%s/api/saved_objects/_find" % (args.kibana_host.rstrip("/"),)
-    saved_objects_req = requests.get(url,
+    saved_objects_req = requests.get(url, auth=('admin', 'admin'), verify=False,
                                      params={'per_page': PER_PAGE,'type':['config','search','dashboard','visualization','index-pattern']})
 
     saved_objects = saved_objects_req.json()['saved_objects']
diff --git a/src/main/docker/kibana/restore.py b/src/main/docker/kibana/restore.py
index 70f430c5..eee2e6b7 100755
--- a/src/main/docker/kibana/restore.py
+++ b/src/main/docker/kibana/restore.py
@@ -53,7 +53,7 @@ def parse_args(args):
                               (','.join(OBJECT_TYPES[:-1]), OBJECT_TYPES[-1])
                              )
                        )
-    parser.add_argument('-H', '--kibana-host', default='http://localhost:5601',
+    parser.add_argument('-H', '--kibana-host', default='https://localhost:5601',
                         help='Kibana endpoint.')
     parser.add_argument('-f', '--force', action='store_const',
                         const=True, default=False,
@@ -98,7 +98,7 @@ def main():
             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)
             params = {'overwrite': True} if args.force else {}
-            post_object_req = requests.post(url,
+            post_object_req = requests.post(url, auth=('admin', 'admin'), verify=False,
                                             headers={'content-type': 'application/json',
                                                      'kbn-xsrf': 'True'},
                                             params=params,