Skip to content

Commit 37b2da3

Browse files
julianocosta89rnjn
authored andcommitted
[image-provider] Add nginx metrics receiver and dashboard (open-telemetry#2330)
1 parent 6f7e014 commit 37b2da3

File tree

7 files changed

+366
-7
lines changed

7 files changed

+366
-7
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ OTEL_JAVA_AGENT_VERSION=2.17.0
1111
OPENTELEMETRY_CPP_VERSION=1.21.0
1212

1313
# Dependent images
14-
COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.128.0
14+
COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.129.1
1515
FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.5
1616
GRAFANA_IMAGE=grafana/grafana:12.0.2
1717
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.70.0

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ the release.
5151
([#2321](https://github.com/open-telemetry/opentelemetry-demo/pull/2321))
5252
* [product-catalog] Add OTel grpc Logs to Product Catalog
5353
([#2285](https://github.com/open-telemetry/opentelemetry-demo/pull/2285))
54+
* [currency] update alpine to 3.21
55+
([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
5456
* [shipping]: replace debian image with distroless image
5557
([#2294](https://github.com/open-telemetry/opentelemetry-demo/pull/2294))
5658
* [currency] Update code to use new semconv and remove unused file
5759
([#2319](https://github.com/open-telemetry/opentelemetry-demo/pull/2319))
58-
* [currency] update alpine to 3.21
59-
([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
60+
* [image-provider] Add nginx metrics receiver and dashboard
61+
([#2330](https://github.com/open-telemetry/opentelemetry-demo/pull/2330))
6062

6163
## 2.0.2
6264

docker-compose.minimal.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,9 @@ services:
622622
condition: service_healthy
623623
logging: *logging
624624
environment:
625-
- ENVOY_PORT
625+
- FRONTEND_PROXY_ADDR
626+
- IMAGE_PROVIDER_HOST
627+
- IMAGE_PROVIDER_PORT
626628
- HOST_FILESYSTEM
627629
- OTEL_COLLECTOR_HOST
628630
- OTEL_COLLECTOR_PORT_GRPC

docker-compose.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ services:
691691
# Postgresql used by Accounting service
692692
postgresql:
693693
image: ${POSTGRES_IMAGE}
694+
container_name: postgresql
695+
restart: unless-stopped
694696
ports:
695697
- "5432"
696698
environment:
@@ -699,6 +701,7 @@ services:
699701
POSTGRES_DB: otel
700702
volumes:
701703
- ${PWD}/src/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
704+
logging: *logging
702705

703706
# Valkey used by Cart service
704707
valkey-cart:
@@ -784,7 +787,9 @@ services:
784787
condition: service_healthy
785788
logging: *logging
786789
environment:
787-
- ENVOY_PORT
790+
- FRONTEND_PROXY_ADDR
791+
- IMAGE_PROVIDER_HOST
792+
- IMAGE_PROVIDER_PORT
788793
- HOST_FILESYSTEM
789794
- OTEL_COLLECTOR_HOST
790795
- OTEL_COLLECTOR_PORT_GRPC

0 commit comments

Comments
 (0)