From bafadb0d4261ac519f19d6d69fe393c971586525 Mon Sep 17 00:00:00 2001
From: Juliano Costa <julianocosta89@outlook.com>
Date: Wed, 30 Oct 2024 16:50:55 +0100
Subject: [PATCH] Revert #1743 (#1760)

---
 .env                                                 | 4 ++--
 CHANGELOG.md                                         | 2 --
 docker-compose.minimal.yml                           | 2 +-
 docker-compose.yml                                   | 2 +-
 src/grafana/provisioning/datasources/opensearch.yaml | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 1884a7157f..6d3f9edca2 100644
--- a/.env
+++ b/.env
@@ -10,8 +10,8 @@ COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.108.0
 FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.2
 GRAFANA_IMAGE=grafana/grafana:11.2.0
 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.60
-OPENSEARCH_IMAGE_VERSION=2.17.1
-OPENSEARCH_IMAGE=opensearchproject/opensearch:${OPENSEARCH_IMAGE_VERSION}
+# must also update version field in
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.17.1
 POSTGRES_IMAGE=postgres:16.4
 PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.54.1
 VALKEY_IMAGE=valkey/valkey:8.0-alpine
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51f4f5196a..a23b5cff72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,8 +23,6 @@ the release.
 * [frontend] fix imageSlowLoad headers not applied
   to 1.8.0 together with other dependencies
   ([#1733](https://github.com/open-telemetry/opentelemetry-demo/pull/1733))
-* [chore] Move opensearch image version to .env file
-  ([#1743](https://github.com/open-telemetry/opentelemetry-demo/pull/1743))
 * [cartservice] Propagate cartservice exceptions
   ([#1744](https://github.com/open-telemetry/opentelemetry-demo/pull/1744))
 * [cartservice] Update cart service to fail when cartServiceFailure is enabled
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index ac53c88be9..f5b65faa91 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -565,7 +565,7 @@ services:
           memory: 100M
     restart: unless-stopped
     environment:
-      - "GF_INSTALL_PLUGINS=grafana-opensearch-datasource ${OPENSEARCH_IMAGE_VERSION}"
+      - "GF_INSTALL_PLUGINS=grafana-opensearch-datasource"
     volumes:
       - ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
       - ./src/grafana/provisioning/:/etc/grafana/provisioning/
diff --git a/docker-compose.yml b/docker-compose.yml
index 9225ab1fd0..39ec207aa9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -707,7 +707,7 @@ services:
           memory: 100M
     restart: unless-stopped
     environment:
-      - "GF_INSTALL_PLUGINS=grafana-opensearch-datasource ${OPENSEARCH_IMAGE_VERSION}"
+      - "GF_INSTALL_PLUGINS=grafana-opensearch-datasource"
     volumes:
       - ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
       - ./src/grafana/provisioning/:/etc/grafana/provisioning/
diff --git a/src/grafana/provisioning/datasources/opensearch.yaml b/src/grafana/provisioning/datasources/opensearch.yaml
index d1c1671762..fae6dec8ed 100644
--- a/src/grafana/provisioning/datasources/opensearch.yaml
+++ b/src/grafana/provisioning/datasources/opensearch.yaml
@@ -17,3 +17,4 @@ datasources:
       logMessageField: body
       pplEnabled: true
       timeField: observedTimestamp
+      version: 2.17.1