merge: #8378

8378: chore(elastic): update to elasticsearch 7.16.1 r=npepinpe a=menski ## Description Update Elasticsearch to 7.16.1 for Zeebe 1.2 branch, related to https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-7.16.1.html Co-authored-by: Sebastian Menski <[email protected]> Co-authored-by: Deepthi Devaki Akkoorath <[email protected]> Co-authored-by: Nicolas Pepin-Perreault <[email protected]>
camunda · Dec 15, 2021 · 60db5a4 · 60db5a4
2 parents 3b687a6 + 6d6cda1
commit 60db5a4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/...c/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java b/...c/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java
@@ -107,12 +107,18 @@ public void shouldDistributeExporterPositions() {
   }
 
   @Test
-  public void shouldNotResetExporterPositionWhenOldPositionReceived() throws Exception {
+  public void shouldNotResetExporterPositionWhenOldPositionReceived() {
     // given
     exporters.forEach(e -> e.shouldAutoUpdatePosition(true));
     startExporters(exporterDescriptors);
-    final long position = 10L;
 
+    Awaitility.await("Exporter has recovered and started exporting.")
+        .untilAsserted(
+            () ->
+                assertThat(activeExporters.getDirector().getPhase().join())
+                    .isEqualTo(ExporterPhase.EXPORTING));
+
+    final long position = 10L;
     activeExporters.getExportersState().setPosition(EXPORTER_ID_1, position);
     activeExporters.getExportersState().setPosition(EXPORTER_ID_2, position);
 

diff --git a/exporters/elasticsearch-exporter/docker-compose.yml b/exporters/elasticsearch-exporter/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.12.1
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.16.1
         ports:
             - "9200:9200"
             - "9300:9300"
@@ -12,7 +12,7 @@ services:
             - ES_JAVA_OPTS=-Xmx750m -Xms750m
 
     kibana:
-        image: docker.elastic.co/kibana/kibana:7.12.1
+        image: docker.elastic.co/kibana/kibana:7.16.1
         ports:
             - "5601:5601"
         links:

diff --git a/...s/elasticsearch-exporter/src/main/java/io/camunda/zeebe/exporter/ElasticsearchClient.java b/...s/elasticsearch-exporter/src/main/java/io/camunda/zeebe/exporter/ElasticsearchClient.java
@@ -42,11 +42,11 @@
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.common.xcontent.DeprecationHandler;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.XContent;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.XContent;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentType;
 import org.slf4j.Logger;
 
 public class ElasticsearchClient {

diff --git a/monitor/docker-compose.ope-ztl.yml b/monitor/docker-compose.ope-ztl.yml
@@ -7,7 +7,7 @@ volumes:
 services:
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.1
     container_name: elasticsearch
     environment:
       - discovery.type=single-node

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -46,7 +46,7 @@
     <version.commons-math>3.6.1</version.commons-math>
     <version.commons-codec>1.15</version.commons-codec>
     <version.docker-java-api>3.2.12</version.docker-java-api>
-    <version.elasticsearch>7.14.1</version.elasticsearch>
+    <version.elasticsearch>7.16.1</version.elasticsearch>
     <version.error-prone>2.9.0</version.error-prone>
     <version.grpc>1.40.1</version.grpc>
     <version.gson>2.8.9</version.gson>