SC-9475: Kibana 7 ARM support (#332)

* SC-9575: updated es and kibana versions * SC-9575: updated kibana configs * Update ARM images for Kibana * Update secrets.sdk.auto.tfvars.twig Co-authored-by: alexanderM91 <oleksandr.myrnyi@spryker.com>
spryker · Jun 9, 2022 · 61e8a0d · 61e8a0d
1 parent 7561a90
commit 61e8a0d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/context/kibana/7.10/kibana.yml b/context/kibana/7.10/kibana.yml
@@ -0,0 +1,8 @@
+# Kibana is served by a back end server. This setting specifies the port to use.
+server.port: 5601
+# Specifies the address to which the Kibana server will bind. IP addresses and host names are both valid values.
+# The default is 'localhost', which usually means remote machines will not be able to connect.
+# To allow connections from remote users, set this parameter to a non-loopback address.
+server.host: "0"
+# The URL of the Elasticsearch instance to use for all your queries.
+elasticsearch.hosts: ["http://search:9200"]
diff --git a/context/kibana/7.6/kibana.yml b/context/kibana/7.6/kibana.yml
@@ -6,11 +6,3 @@ server.port: 5601
 server.host: "0"
 # The URL of the Elasticsearch instance to use for all your queries.
 elasticsearch.hosts: ["http://search:9200"]
-# X-Pack extension configuration.
-xpack.monitoring.ui.container.elasticsearch.enabled: false
-xpack.security.enabled: false
-xpack.monitoring.enabled: false
-xpack.graph.enabled: false
-xpack.reporting.enabled: false
-xpack.ml.enabled: false
-xpack.watcher.enabled: false
diff --git a/generator/src/templates/service/elastic/7.6/elastic.yml.twig b/generator/src/templates/service/elastic/7.6/elastic.yml.twig
@@ -1,5 +1,5 @@
   {{ serviceName }}:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
+    image: spryker/elasticsearch:7.6.2
     networks:
         - private
     labels:

diff --git a/generator/src/templates/service/kibana/7.10/kibana.yml.twig b/generator/src/templates/service/kibana/7.10/kibana.yml.twig
@@ -1,5 +1,5 @@
   {{ serviceName }}:
-    image: docker.elastic.co/kibana/kibana:7.10.1
+    image: spryker/kibana:7.10.1
     networks:
         - private
     labels:
@@ -17,4 +17,4 @@
         - search
     volumes:
         - {{ serviceName }}-{{ serviceData['engine'] }}-data:/usr/share/kibana/data:rw
-        - ./${DEPLOYMENT_PATH}/context/kibana/7.6/kibana.yml:/usr/share/kibana/config/kibana.yml:ro
+        - ./${DEPLOYMENT_PATH}/context/kibana/7.10/kibana.yml:/usr/share/kibana/config/kibana.yml:ro
diff --git a/generator/src/templates/service/kibana/7.6/kibana.yml.twig b/generator/src/templates/service/kibana/7.6/kibana.yml.twig
@@ -1,5 +1,5 @@
   {{ serviceName }}:
-    image: docker.elastic.co/kibana/kibana:7.6.2
+    image: spryker/kibana:7.6.2
     networks:
         - private
     labels:

diff --git a/generator/src/templates/terraform/secrets.sdk.auto.tfvars.twig b/generator/src/templates/terraform/secrets.sdk.auto.tfvars.twig
@@ -3,4 +3,5 @@ spryker_secrets = {
     {{ secretKey | raw }} = {{ secretValue | tf_var }}
 {% endfor %}
     SPRYKER_PAAS_SERVICES = {{ '{"version": "1.0", "databases": []}' | tf_var }}
+    SPRYKER_FEATURES = {{ '{}' | tf_var }}
 }