Skip to content

Commit 5c4b58d

Browse files
[chore] Move opensearch image version to .env file (#1743)
* [chore] Move opensearch image version to .env file * changelog
1 parent db1be1d commit 5c4b58d

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.108.0
1010
FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.2
1111
GRAFANA_IMAGE=grafana/grafana:11.2.0
1212
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.60
13-
# must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml
14-
OPENSEARCH_IMAGE=opensearchproject/opensearch:2.16.0
13+
OPENSEARCH_IMAGE_VERSION=2.17.1
14+
OPENSEARCH_IMAGE=opensearchproject/opensearch:${OPENSEARCH_IMAGE_VERSION}
1515
POSTGRES_IMAGE=postgres:16.4
1616
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.54.1
1717
VALKEY_IMAGE=valkey/valkey:8.0-alpine

CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ the release.
1515
([#1709](https://github.com/open-telemetry/opentelemetry-demo/pull/1709))
1616
* [chore] Add depends on to otelcol to wait on healthy opensearch
1717
([#1724](https://github.com/open-telemetry/opentelemetry-demo/pull/1724))
18+
* [flagd-ui] Add UI for managing Flagd feature flags
19+
([#1725](https://github.com/open-telemetry/opentelemetry-demo/pull/1725))
1820
* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
1921
to 1.8.0 together with other dependencies
2022
([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727))
@@ -23,8 +25,8 @@ the release.
2325
* [frontend] fix imageSlowLoad headers not applied
2426
to 1.8.0 together with other dependencies
2527
([#1733](https://github.com/open-telemetry/opentelemetry-demo/pull/1733))
26-
* [flagd-ui] Add UI for managing Flagd feature flags
27-
([#1725](https://github.com/open-telemetry/opentelemetry-demo/pull/1725))
28+
* [chore] Move opensearch image version to .env file
29+
([#1743](https://github.com/open-telemetry/opentelemetry-demo/pull/1743))
2830

2931
## 1.11.1
3032

docker-compose.minimal.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ services:
565565
memory: 100M
566566
restart: unless-stopped
567567
environment:
568-
- "GF_INSTALL_PLUGINS=grafana-opensearch-datasource"
568+
- "GF_INSTALL_PLUGINS=grafana-opensearch-datasource ${OPENSEARCH_IMAGE_VERSION}"
569569
volumes:
570570
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
571571
- ./src/grafana/provisioning/:/etc/grafana/provisioning/

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ services:
707707
memory: 100M
708708
restart: unless-stopped
709709
environment:
710-
- "GF_INSTALL_PLUGINS=grafana-opensearch-datasource"
710+
- "GF_INSTALL_PLUGINS=grafana-opensearch-datasource ${OPENSEARCH_IMAGE_VERSION}"
711711
volumes:
712712
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
713713
- ./src/grafana/provisioning/:/etc/grafana/provisioning/

src/grafana/provisioning/datasources/opensearch.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ datasources:
1717
logMessageField: body
1818
pplEnabled: true
1919
timeField: observedTimestamp
20-
version: 2.16.0

0 commit comments

Comments
 (0)