Deploy: updated env vars for metric/filebeat image(s).

CogStack · Sep 11, 2023 · 6b5c5ed · 6b5c5ed
1 parent 01f4e02
commit 6b5c5ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/deploy/elasticsearch.env b/deploy/elasticsearch.env
@@ -191,6 +191,12 @@ ELASTICSEARCH_XPACK_SECURITY_SAVED_OBJECTS_ENCRYPTION_KEY="+tcwakgxUu+SJcMJbdGQe
 ELASTICSEARCH_XPACK_SECURITY_REPORTING_ENCRYPTION_KEY="e0Y1gTxHWOopIWMTtpjQsDS6Kv8wUxofg0xRTai0mNg="
 
 
+
+######################################################################### METRICBEAT Env vars ##########################################################################
+
+METRICBEAT_IMAGE="docker.elastic.co/beats/metricbeat:8.3.3"
+
+
 ########################################################################## FILEBEAT Env vars ###########################################################################
 
 # Possible values:
@@ -199,4 +205,6 @@ ELASTICSEARCH_XPACK_SECURITY_REPORTING_ENCRYPTION_KEY="e0Y1gTxHWOopIWMTtpjQsDS6K
 FILEBEAT_STARTUP_COMMAND="-e --strict.perms=false"
 
 
-FILEBEAT_HOST="https://elasticsearch-1:9200"
+FILEBEAT_HOST="https://elasticsearch-1:9200"
+
+FILEBEAT_IMAGE="docker.elastic.co/beats/filebeat:8.3.3"
diff --git a/deploy/services.yml b/deploy/services.yml
@@ -424,7 +424,7 @@ services:
 #---------------------------------------------------------------------------#
   es_native_create_certs:
     container_name: es_create_certs
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3
+    image: ${ELASTICSEARCH_DOCKER_IMAGE:-opensearchproject/opensearch:2.6.0}
     env_file:
       - ../security/certificates_elasticsearch.env
     environment:
@@ -724,7 +724,7 @@ services:
 
   metricbeat-1:
     container_name: cogstack-metricbeat-1
-    image: docker.elastic.co/beats/metricbeat:8.3.3
+    image: ${METRICBEAT_IMAGE:docker.elastic.co/beats/metricbeat:8.3.3}
     command: -e --strict.perms=false
     env_file:
          - ./elasticsearch.env
@@ -765,7 +765,7 @@ services:
 
   metricbeat-2:
     container_name: cogstack-metricbeat-2
-    image: docker.elastic.co/beats/metricbeat:8.3.3
+    image: ${METRICBEAT_IMAGE:docker.elastic.co/beats/metricbeat:8.3.3}
     command: -e --strict.perms=false
     env_file:
          - ./elasticsearch.env
@@ -804,7 +804,7 @@ services:
 
   filebeat-1:
     container_name: cogstack-filebeat-1
-    image: docker.elastic.co/beats/filebeat:8.3.3
+    image: ${FILEBEAT_IMAGE:-docker.elastic.co/beats/filebeat:8.3.3}
     command: ${FILEBEAT_STARTUP_COMMAND:-'-e --strict.perms=false'}
     env_file:
         - ./elasticsearch.env
@@ -846,7 +846,7 @@ services:
 
   filebeat-2:
     container_name: cogstack-filebeat-2
-    image: docker.elastic.co/beats/filebeat:8.3.3
+    image: ${FILEBEAT_IMAGE:-docker.elastic.co/beats/filebeat:8.3.3}
     command: ${FILEBEAT_STARTUP_COMMAND:-'-e --strict.perms=false'}
     env_file:
         - ./elasticsearch.env
@@ -888,7 +888,7 @@ services:
 
   filebeat-3:
     container_name: cogstack-filebeat-3
-    image: docker.elastic.co/beats/filebeat:8.3.3
+    image: ${FILEBEAT_IMAGE:-docker.elastic.co/beats/filebeat:8.3.3}
     command: ${FILEBEAT_STARTUP_COMMAND:-'-e --strict.perms=false'}
     env_file:
         - ./elasticsearch.env