aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/docker
diff options
context:
space:
mode:
authorXue Gao <xg353y@intl.att.com>2019-07-30 08:31:53 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-30 08:31:53 +0000
commitfa6dd7312e06dd5a6e70d79c1a00438f3c80e7eb (patch)
tree5dc7bf53de88f5b032dbc0e719a48d57ef4f17c3 /src/main/docker
parent4453cc6abdd95f5ee30c205731237dd7f2d6ae52 (diff)
parentb1a5ff06d333c6bcca7c51bfbb0f79b98638e387 (diff)
Merge "kibana authentication"
Diffstat (limited to 'src/main/docker')
-rwxr-xr-xsrc/main/docker/kibana/backup.py4
-rwxr-xr-xsrc/main/docker/kibana/restore.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/docker/kibana/backup.py b/src/main/docker/kibana/backup.py
index a2dab2222..b1e45181b 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 70f430c57..eee2e6b76 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,