From ca08f732ca4e986d49b43601081e23ad8d33b623 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Wed, 4 Aug 2021 13:46:43 +0200
Subject: [PATCH 1/3] Pin elasticsearch-py to older version without elastic.co
product check
Signed-off-by: Pavol Loffay
---
plugin/storage/es/Dockerfile | 1 +
plugin/storage/es/Dockerfile.rollover | 1 +
2 files changed, 2 insertions(+)
diff --git a/plugin/storage/es/Dockerfile b/plugin/storage/es/Dockerfile
index 5fd9fc8b65e..efa559ee600 100644
--- a/plugin/storage/es/Dockerfile
+++ b/plugin/storage/es/Dockerfile
@@ -2,6 +2,7 @@ FROM python:3-alpine3.11
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
+RUN pip install elasticsearch-py==7.13.0
RUN pip install elasticsearch elasticsearch-curator
COPY esCleaner.py /es-index-cleaner/
diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover
index 223e39814d5..a6f249a1bf3 100644
--- a/plugin/storage/es/Dockerfile.rollover
+++ b/plugin/storage/es/Dockerfile.rollover
@@ -3,6 +3,7 @@ ARG TARGETARCH
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
+RUN pip install elasticsearch-py==7.13.0
RUN pip install elasticsearch elasticsearch-curator
COPY ./mappings/* /mappings/
From fbbc4380e7d797952c272773ff0d01532ae91bc7 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Wed, 4 Aug 2021 13:59:45 +0200
Subject: [PATCH 2/3] Fix
Signed-off-by: Pavol Loffay
---
plugin/storage/es/Dockerfile | 3 ++-
plugin/storage/es/Dockerfile.rollover | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugin/storage/es/Dockerfile b/plugin/storage/es/Dockerfile
index efa559ee600..847f4a2748a 100644
--- a/plugin/storage/es/Dockerfile
+++ b/plugin/storage/es/Dockerfile
@@ -2,7 +2,8 @@ FROM python:3-alpine3.11
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
-RUN pip install elasticsearch-py==7.13.0
+# Temporary fix https://github.com/jaegertracing/jaeger/issues/3179
+RUN pip install elasticsearch==7.13.0
RUN pip install elasticsearch elasticsearch-curator
COPY esCleaner.py /es-index-cleaner/
diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover
index a6f249a1bf3..e7dd0892658 100644
--- a/plugin/storage/es/Dockerfile.rollover
+++ b/plugin/storage/es/Dockerfile.rollover
@@ -3,7 +3,8 @@ ARG TARGETARCH
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
-RUN pip install elasticsearch-py==7.13.0
+# Temporary fix https://github.com/jaegertracing/jaeger/issues/3179
+RUN pip install elasticsearch==7.13.0
RUN pip install elasticsearch elasticsearch-curator
COPY ./mappings/* /mappings/
From 93cb1bde3c5a95f9ec8a115b960e8871596139ef Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Wed, 4 Aug 2021 14:01:16 +0200
Subject: [PATCH 3/3] Fix
Signed-off-by: Pavol Loffay
---
plugin/storage/es/Dockerfile | 2 +-
plugin/storage/es/Dockerfile.rollover | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin/storage/es/Dockerfile b/plugin/storage/es/Dockerfile
index 847f4a2748a..4fab7e98012 100644
--- a/plugin/storage/es/Dockerfile
+++ b/plugin/storage/es/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3-alpine3.11
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
-# Temporary fix https://github.com/jaegertracing/jaeger/issues/3179
+# Temporary fix for https://github.com/jaegertracing/jaeger/issues/3179
RUN pip install elasticsearch==7.13.0
RUN pip install elasticsearch elasticsearch-curator
diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover
index e7dd0892658..ad002a21e4c 100644
--- a/plugin/storage/es/Dockerfile.rollover
+++ b/plugin/storage/es/Dockerfile.rollover
@@ -3,7 +3,7 @@ ARG TARGETARCH
# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
RUN pip install urllib3==1.24.3
-# Temporary fix https://github.com/jaegertracing/jaeger/issues/3179
+# Temporary fix for https://github.com/jaegertracing/jaeger/issues/3179
RUN pip install elasticsearch==7.13.0
RUN pip install elasticsearch elasticsearch-curator