From 5b6109d1b3b7d15425789de741f21ff1e4647897 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 27 Jun 2019 18:04:25 +0200
Subject: [PATCH 1/3] Use sonatype mirror to download jolokia (#12707)

Central maven is failing on Travis.
---
 metricbeat/module/jolokia/_meta/Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/metricbeat/module/jolokia/_meta/Dockerfile b/metricbeat/module/jolokia/_meta/Dockerfile
index 91f2e6d284d..0a987918a8a 100644
--- a/metricbeat/module/jolokia/_meta/Dockerfile
+++ b/metricbeat/module/jolokia/_meta/Dockerfile
@@ -5,22 +5,22 @@ ENV TOMCAT_VERSION 7.0.86
 ENV TC apache-tomcat-${TOMCAT_VERSION}
 ENV JOLOKIA_VERSION 1.5.0
 
-RUN apk update;\
-    apk add curl
+RUN apk update && \
+    apk add curl openssl ca-certificates
 
 HEALTHCHECK --interval=1s --retries=90 CMD curl -f localhost:8778/jolokia/
 EXPOSE 8778
 
 # Prepare a server where jolokia runs in proxy mode
-RUN wget http://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/${TC}.tar.gz;\
-    tar xzf ${TC}.tar.gz -C /usr;\
-    rm ${TC}.tar.gz;\
-    sed -i -e 's/Connector port="8080"/Connector port="8778"/g' /usr/${TC}/conf/server.xml;\
-    wget http://central.maven.org/maven2/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war -O /usr/${TC}/webapps/jolokia.war
+RUN wget http://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/${TC}.tar.gz && \
+    tar xzf ${TC}.tar.gz -C /usr && \
+    rm ${TC}.tar.gz && \
+    sed -i -e 's/Connector port="8080"/Connector port="8778"/g' /usr/${TC}/conf/server.xml && \
+    wget https://oss.sonatype.org/content/repositories/releases/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war -O /usr/${TC}/webapps/jolokia.war
 
 # JMX setting to request authentication with remote connection
-RUN echo "monitorRole QED" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password;\
-    echo "controlRole R&D" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password;\
+RUN echo "monitorRole QED" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password && \
+    echo "controlRole R&D" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password && \
     chmod 600 /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password
 
 ADD jolokia.xml /usr/${TC}/conf/Catalina/localhost/jolokia.xml

From 67b4e986f561f6532a015f4e95787d546dd98557 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 9 Aug 2019 13:07:38 +0200
Subject: [PATCH 2/3] Try to make jolokia downloads more robust (#13201)

Add retries and better error handling as done for kafka in #12715.
---
 metricbeat/module/jolokia/_meta/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/metricbeat/module/jolokia/_meta/Dockerfile b/metricbeat/module/jolokia/_meta/Dockerfile
index 0a987918a8a..9eae5455d3b 100644
--- a/metricbeat/module/jolokia/_meta/Dockerfile
+++ b/metricbeat/module/jolokia/_meta/Dockerfile
@@ -6,7 +6,7 @@ ENV TC apache-tomcat-${TOMCAT_VERSION}
 ENV JOLOKIA_VERSION 1.5.0
 
 RUN apk update && \
-    apk add curl openssl ca-certificates
+    apk add curl openssl ca-certificates bash
 
 HEALTHCHECK --interval=1s --retries=90 CMD curl -f localhost:8778/jolokia/
 EXPOSE 8778
@@ -16,7 +16,9 @@ RUN wget http://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/$
     tar xzf ${TC}.tar.gz -C /usr && \
     rm ${TC}.tar.gz && \
     sed -i -e 's/Connector port="8080"/Connector port="8778"/g' /usr/${TC}/conf/server.xml && \
-    wget https://oss.sonatype.org/content/repositories/releases/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war -O /usr/${TC}/webapps/jolokia.war
+    curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \
+    retry --min 1 --max 180 -- curl -J -L -s -f --show-error -o /usr/${TC}/webapps/jolokia.war \
+        "https://oss.sonatype.org/content/repositories/releases/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war"
 
 # JMX setting to request authentication with remote connection
 RUN echo "monitorRole QED" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password && \

From 776783bda2257f616e64a7dc8b09b590eb9679e6 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Tue, 16 Feb 2021 18:36:48 +0100
Subject: [PATCH 3/3] Re-enable integration tests

---
 metricbeat/Jenkinsfile.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml
index c1590dfbf1a..c6a08152295 100644
--- a/metricbeat/Jenkinsfile.yml
+++ b/metricbeat/Jenkinsfile.yml
@@ -20,8 +20,6 @@ stages:
           make check-no-changes;
     build:
         make: "RACE_DETECTOR=1 make -C metricbeat check testsuite integration-tests-environment"
-        when:
-            disabled: true     ## Disabled since Integration Testing is broken. See https://github.com/elastic/beats/issues/21961
     crosscompile:
         make: "make -C metricbeat crosscompile"
     windows: