diff options
| -rw-r--r-- | INFO.yaml | 3 | ||||
| -rw-r--r-- | src/main/docker/elasticsearch/Dockerfile | 2 | ||||
| -rw-r--r-- | src/main/docker/elasticsearch/config/elasticsearch.yml | 4 | ||||
| -rw-r--r-- | src/main/docker/kibana/conf/kibana.yml | 2 |
4 files changed, 5 insertions, 6 deletions
@@ -64,11 +64,10 @@ tsc: link: 'https://lists.onap.org/g/ONAP-TSC/message/3311' - type: 'Addition' name: 'Adam Krysiak' - link: 'https://lists.onap.org/g/ONAP-TSC/message/3311' + link: 'https://lists.onap.org/g/ONAP-TSC/message/4178' - type: 'Removal' name: 'Pierre Close' link: 'https://lists.onap.org/g/ONAP-TSC/message/4581' - type: 'Removal' name: 'Wang Xinyuan1' link: 'https://lists.onap.org/g/ONAP-TSC/message/4581' - diff --git a/src/main/docker/elasticsearch/Dockerfile b/src/main/docker/elasticsearch/Dockerfile index 41252be15..24352429e 100644 --- a/src/main/docker/elasticsearch/Dockerfile +++ b/src/main/docker/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # https://github.com/elastic/elasticsearch-docker -FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2 +FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2 COPY config/sg/ config/sg/ COPY config/ config/ diff --git a/src/main/docker/elasticsearch/config/elasticsearch.yml b/src/main/docker/elasticsearch/config/elasticsearch.yml index 72ce137ab..4d46ca01e 100644 --- a/src/main/docker/elasticsearch/config/elasticsearch.yml +++ b/src/main/docker/elasticsearch/config/elasticsearch.yml @@ -18,8 +18,8 @@ discovery.type: single-node ## X-Pack settings ## see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-xpack.html # -xpack.license.self_generated.type: basic -xpack.security.enabled: false +#xpack.license.self_generated.type: basic +#xpack.security.enabled: false ## Search Guard # diff --git a/src/main/docker/kibana/conf/kibana.yml b/src/main/docker/kibana/conf/kibana.yml index 2edcb803f..cfec41e3b 100644 --- a/src/main/docker/kibana/conf/kibana.yml +++ b/src/main/docker/kibana/conf/kibana.yml @@ -10,7 +10,7 @@ server.ssl.certificate: /usr/share/kibana/config/keystore/org.onap.clamp.crt.pem ## Search Guard # -xpack.security.enabled: false +#xpack.security.enabled: false elasticsearch.username: kibanaserver elasticsearch.password: kibanaserver |