summaryrefslogtreecommitdiffstats
path: root/src/main/docker
diff options
context:
space:
mode:
authorosgn422w <gervais-martial.ngueko@intl.att.com>2020-02-04 00:43:45 +0100
committerosgn422w <gervais-martial.ngueko@intl.att.com>2020-02-04 00:43:45 +0100
commitbc33254bd75ba75022cc7e03dacea872787b51a3 (patch)
tree9632f5ed61b49fc5129f98c2e980ab660f729a2b /src/main/docker
parentb15dad0600c4888da658448b89e41d7f18262716 (diff)
correct https settings
correction of some https settings preventing ES and kibana startup Issue-ID: CLAMP-483 Change-Id: Ib2df35dca262b59121a60d2c8571a9ee396951fa Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
Diffstat (limited to 'src/main/docker')
-rw-r--r--src/main/docker/elasticsearch/config/elasticsearch.yml9
-rwxr-xr-xsrc/main/docker/kibana/startup.sh2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/docker/elasticsearch/config/elasticsearch.yml b/src/main/docker/elasticsearch/config/elasticsearch.yml
index 9380de5..55c2de4 100644
--- a/src/main/docker/elasticsearch/config/elasticsearch.yml
+++ b/src/main/docker/elasticsearch/config/elasticsearch.yml
@@ -4,16 +4,17 @@
#
cluster.name: "docker-cluster"
network.host: 0.0.0.0
+node.name: "cldash-es-node1"
# # minimum_master_nodes need to be explicitly set when bound on a public IP
# # set to 1 to allow single node clusters
# # Details: https://github.com/elastic/elasticsearch/pull/17288
-# discovery.zen.minimum_master_nodes: 1
-
+discovery.zen.minimum_master_nodes: 1
+discovery.seed_hosts: "cldash-es-node1"
# # Breaking change in 7.0
# # https://www.elastic.co/guide/en/elasticsearch/reference/7.0/breaking-changes-7.0.html#breaking_70_discovery_changes
-# cluster.initial_master_nodes:
-# - elasticsearch1
+cluster.initial_master_nodes:
+ - cldash-es-node1
# - docker-test-node-1
######## Start OpenDistro for Elasticsearch Security Demo Configuration ########
# WARNING: revise all the lines below before you go into production
diff --git a/src/main/docker/kibana/startup.sh b/src/main/docker/kibana/startup.sh
index da289ae..1ea475a 100755
--- a/src/main/docker/kibana/startup.sh
+++ b/src/main/docker/kibana/startup.sh
@@ -43,7 +43,7 @@ then
elastic_url=$(grep elasticsearch.host /usr/share/kibana/config/kibana.yml | cut -d\ -f2)
while [ ! "$RES" -eq "0" ] && [ "$PING_TIMEOUT" -gt "0" ];
do
- curl $elastic_url
+ curl -k $elastic_url
RES=$?
sleep $WAIT_TIME
let PING_TIMEOUT=$PING_TIMEOUT-$WAIT_TIME