From b6d9ea1a0c50fb0bdcddcb9274a1546b05b8a580 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 10 Aug 2023 22:19:49 -0400 Subject: [PATCH 1/8] update chart dependencies Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.yaml | 10 +-- charts/opentelemetry-demo/UPGRADING.md | 6 ++ .../rendered/component.yaml | 72 +++++++++--------- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../configmap-agent.yaml | 4 +- .../opentelemetry-collector/daemonset.yaml | 8 +- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 72 +++++++++--------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 74 +++++++++---------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 4 +- .../opentelemetry-collector/deployment.yaml | 8 +- .../opentelemetry-collector/ingress.yaml | 4 +- .../opentelemetry-collector/service.yaml | 4 +- .../serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- 32 files changed, 241 insertions(+), 235 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index cb1512f33..ec859120e 100644 --- a/charts/opentelemetry-demo/Chart.yaml +++ b/charts/opentelemetry-demo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: opentelemetry-demo -version: 0.22.4 +version: 0.23.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -14,18 +14,18 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png appVersion: "1.4.0" dependencies: - name: opentelemetry-collector - version: 0.57.2 + version: 0.65.1 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled - name: jaeger - version: 0.69.1 + version: 0.71.11 repository: https://jaegertracing.github.io/helm-charts condition: jaeger.enabled - name: prometheus - version: 20.2.0 + version: 23.3.0 repository: https://prometheus-community.github.io/helm-charts condition: prometheus.enabled - name: grafana - version: 6.52.8 + version: 6.58.8 repository: https://grafana.github.io/helm-charts condition: grafana.enabled diff --git a/charts/opentelemetry-demo/UPGRADING.md b/charts/opentelemetry-demo/UPGRADING.md index c04e6ba4f..2b51e54b8 100644 --- a/charts/opentelemetry-demo/UPGRADING.md +++ b/charts/opentelemetry-demo/UPGRADING.md @@ -1,5 +1,11 @@ # Upgrade guidelines +## To 0.23 + +The Prometheus sub-chart dependency made updates to pod labels. You may need to +use the `--force` option with your Helm upgrade command, or delete the release +and re-install it. + ## To 0.22 This release moves to using the `connectors` functionality in the OpenTelemetry diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml index 06ab78719..57f6575f0 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml index 2d936dbf2..386fdd068 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index 6085a0099..bee0c9cf8 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index f1b1fe0d3..57a061ba5 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index 0d4759de1..345f01cff 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index c784ea87f..96f550d9c 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -5,10 +5,10 @@ kind: DaemonSet metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 19f2931042e627b07e3bf0e0b69778e9bcb40885393993fb6b7e8acebdc5c357 + checksum/config: 627ef43facddeaa6c6e7f91d8b1e04c1c7f292cbacad373de913a5a337dfc669 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.77.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml index 0b75edfb5..2e262e6fb 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index 2d936dbf2..386fdd068 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index 2dcc807f3..f36cbc8f8 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -520,7 +520,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -604,7 +604,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -696,7 +696,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -798,7 +798,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -878,7 +878,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -960,7 +960,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1062,7 +1062,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1146,7 +1146,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1230,7 +1230,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1334,7 +1334,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1524,7 +1524,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1616,7 +1616,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1700,7 +1700,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1782,7 +1782,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1868,7 +1868,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1956,7 +1956,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2034,7 +2034,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index f1b1fe0d3..57a061ba5 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index e11c3b0cf..65cc605f7 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index a3c34ed9a..ca63bd8de 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: f85af59ffecbb732ad2cb7dddd076c5820e389485040b4cdedf8ad9e9cbe49b2 + checksum/config: a3a9263b6d6111b94da158ff4c9d9fd67c6cb3aed729b134ea907554519dfa6e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.77.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml index 5247e48b6..38af05c71 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml index 0b75edfb5..2e262e6fb 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index 2d936dbf2..386fdd068 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 7cc1a795a..15b691cb0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index f1b1fe0d3..57a061ba5 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index dcf824542..cb58ac717 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 71c2f5649..a8cc31e28 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 + checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.77.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml index 5247e48b6..38af05c71 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml index 0b75edfb5..2e262e6fb 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 2d936dbf2..386fdd068 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 39f398a69..2611a3fbf 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -690,7 +690,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +790,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +868,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +948,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1048,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1132,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1214,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1316,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1420,7 +1420,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1506,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1596,7 +1596,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1758,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1842,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1928,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2006,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2086,7 +2086,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index f1b1fe0d3..57a061ba5 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index dcf824542..cb58ac717 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 71c2f5649..a8cc31e28 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 + checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.77.0" + image: "otel/opentelemetry-collector-contrib:0.76.1" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml index 16756a929..8ebb61918 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml @@ -5,10 +5,10 @@ kind: Ingress metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml index 5247e48b6..38af05c71 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml index 0b75edfb5..2e262e6fb 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.57.2 + helm.sh/chart: opentelemetry-collector-0.55.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.77.0" + app.kubernetes.io/version: "0.76.1" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index 2d936dbf2..386fdd068 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.22.4 + helm.sh/chart: opentelemetry-demo-0.23.0 opentelemetry.io/name: example app.kubernetes.io/instance: example From 76fb07e708ecf208be5b332ce1da968d76ca166b Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 10 Aug 2023 22:36:29 -0400 Subject: [PATCH 2/8] update chart dependencies Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock index e1074a520..48c6a112f 100644 --- a/charts/opentelemetry-demo/Chart.lock +++ b/charts/opentelemetry-demo/Chart.lock @@ -1,15 +1,15 @@ dependencies: - name: opentelemetry-collector repository: https://open-telemetry.github.io/opentelemetry-helm-charts - version: 0.57.2 + version: 0.65.1 - name: jaeger repository: https://jaegertracing.github.io/helm-charts - version: 0.69.1 + version: 0.71.11 - name: prometheus repository: https://prometheus-community.github.io/helm-charts - version: 20.2.0 + version: 23.3.0 - name: grafana repository: https://grafana.github.io/helm-charts - version: 6.52.8 -digest: sha256:29bfb18c99b19d1f1476b543b7a87b4a72b605407e2e5db87ffa81932feccfa9 -generated: "2023-06-27T19:07:05.571632+02:00" + version: 6.58.8 +digest: sha256:07407bf09ca623b169850105796321e569cf9f0934b667ab44dd8a3e611c9534 +generated: "2023-08-10T22:36:06.487161-04:00" From 11b8daf5a17f2c3e1f39f7591996d4efdc9d5238 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 10 Aug 2023 22:40:20 -0400 Subject: [PATCH 3/8] use frontendProxy for all communication Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/values.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index f89805519..ef294bac3 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -351,7 +351,7 @@ components: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces # This expects users to use `kubectl port-forward ...` + value: http://localhost:8080/otlp-http/v1/traces # This expects users to use `kubectl port-forward ...` resources: limits: memory: 200Mi @@ -389,8 +389,10 @@ components: value: "16686" - name: JAEGER_SERVICE_HOST value: '{{ include "otel-demo.name" . }}-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) resources: @@ -415,7 +417,7 @@ components: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: 'http://{{ include "otel-demo.name" . }}-frontend:8080' + value: 'http://{{ include "otel-demo.name" . }}-frontendproxy:8080' - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART From b042299487059839d9a7e0669d00175c7723ab01 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Thu, 10 Aug 2023 22:42:59 -0400 Subject: [PATCH 4/8] update chart dependencies Signed-off-by: Pierre Tessier --- .../rendered/grafana/clusterrole.yaml | 4 +-- .../rendered/grafana/clusterrolebinding.yaml | 4 +-- .../rendered/grafana/configmap.yaml | 4 +-- .../rendered/grafana/deployment.yaml | 19 ++++++++--- .../rendered/grafana/role.yaml | 4 +-- .../rendered/grafana/rolebinding.yaml | 4 +-- .../rendered/grafana/secret.yaml | 4 +-- .../rendered/grafana/service.yaml | 4 +-- .../rendered/grafana/serviceaccount.yaml | 4 +-- .../grafana/tests/test-configmap.yaml | 4 +-- .../grafana/tests/test-serviceaccount.yaml | 4 +-- .../rendered/grafana/tests/test.yaml | 6 ++-- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +-- .../jaeger/allinone-collector-svc.yaml | 4 +-- .../rendered/jaeger/allinone-deploy.yaml | 8 +++-- .../rendered/jaeger/allinone-query-svc.yaml | 4 +-- .../rendered/jaeger/allinone-sa.yaml | 4 +-- .../configmap-agent.yaml | 4 +-- .../opentelemetry-collector/daemonset.yaml | 8 ++--- .../serviceaccount.yaml | 4 +-- .../rendered/prometheus/clusterrole.yaml | 12 ++++--- .../prometheus/clusterrolebinding.yaml | 12 ++++--- .../rendered/prometheus/cm.yaml | 12 ++++--- .../rendered/prometheus/deploy.yaml | 33 +++++++++++-------- .../rendered/prometheus/service.yaml | 18 +++++----- .../rendered/prometheus/serviceaccount.yaml | 12 ++++--- .../rendered/grafana/clusterrole.yaml | 4 +-- .../rendered/grafana/clusterrolebinding.yaml | 4 +-- .../rendered/grafana/configmap.yaml | 4 +-- .../rendered/grafana/deployment.yaml | 19 ++++++++--- .../rendered/grafana/role.yaml | 4 +-- .../rendered/grafana/rolebinding.yaml | 4 +-- .../rendered/grafana/secret.yaml | 4 +-- .../rendered/grafana/service.yaml | 4 +-- .../rendered/grafana/serviceaccount.yaml | 4 +-- .../grafana/tests/test-configmap.yaml | 4 +-- .../grafana/tests/test-serviceaccount.yaml | 4 +-- .../rendered/grafana/tests/test.yaml | 6 ++-- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +-- .../jaeger/allinone-collector-svc.yaml | 4 +-- .../rendered/jaeger/allinone-deploy.yaml | 8 +++-- .../rendered/jaeger/allinone-query-svc.yaml | 4 +-- .../rendered/jaeger/allinone-sa.yaml | 4 +-- .../opentelemetry-collector/configmap.yaml | 4 +-- .../opentelemetry-collector/deployment.yaml | 8 ++--- .../opentelemetry-collector/service.yaml | 5 +-- .../serviceaccount.yaml | 4 +-- .../rendered/prometheus/clusterrole.yaml | 12 ++++--- .../prometheus/clusterrolebinding.yaml | 12 ++++--- .../rendered/prometheus/cm.yaml | 12 ++++--- .../rendered/prometheus/deploy.yaml | 33 +++++++++++-------- .../rendered/prometheus/service.yaml | 18 +++++----- .../rendered/prometheus/serviceaccount.yaml | 12 ++++--- .../default/rendered/grafana/clusterrole.yaml | 4 +-- .../rendered/grafana/clusterrolebinding.yaml | 4 +-- .../default/rendered/grafana/configmap.yaml | 4 +-- .../default/rendered/grafana/deployment.yaml | 19 ++++++++--- .../default/rendered/grafana/role.yaml | 4 +-- .../default/rendered/grafana/rolebinding.yaml | 4 +-- .../default/rendered/grafana/secret.yaml | 4 +-- .../default/rendered/grafana/service.yaml | 4 +-- .../rendered/grafana/serviceaccount.yaml | 4 +-- .../grafana/tests/test-configmap.yaml | 4 +-- .../grafana/tests/test-serviceaccount.yaml | 4 +-- .../default/rendered/grafana/tests/test.yaml | 6 ++-- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +-- .../jaeger/allinone-collector-svc.yaml | 4 +-- .../rendered/jaeger/allinone-deploy.yaml | 8 +++-- .../rendered/jaeger/allinone-query-svc.yaml | 4 +-- .../default/rendered/jaeger/allinone-sa.yaml | 4 +-- .../opentelemetry-collector/configmap.yaml | 4 +-- .../opentelemetry-collector/deployment.yaml | 8 ++--- .../opentelemetry-collector/service.yaml | 5 +-- .../serviceaccount.yaml | 4 +-- .../rendered/prometheus/clusterrole.yaml | 12 ++++--- .../prometheus/clusterrolebinding.yaml | 12 ++++--- .../default/rendered/prometheus/cm.yaml | 12 ++++--- .../default/rendered/prometheus/deploy.yaml | 33 +++++++++++-------- .../default/rendered/prometheus/service.yaml | 18 +++++----- .../rendered/prometheus/serviceaccount.yaml | 12 ++++--- .../rendered/grafana/clusterrole.yaml | 4 +-- .../rendered/grafana/clusterrolebinding.yaml | 4 +-- .../rendered/grafana/configmap.yaml | 4 +-- .../rendered/grafana/deployment.yaml | 19 ++++++++--- .../rendered/grafana/role.yaml | 4 +-- .../rendered/grafana/rolebinding.yaml | 4 +-- .../rendered/grafana/secret.yaml | 4 +-- .../rendered/grafana/service.yaml | 4 +-- .../rendered/grafana/serviceaccount.yaml | 4 +-- .../grafana/tests/test-configmap.yaml | 4 +-- .../grafana/tests/test-serviceaccount.yaml | 4 +-- .../rendered/grafana/tests/test.yaml | 6 ++-- .../rendered/jaeger/allinone-agent-svc.yaml | 4 +-- .../jaeger/allinone-collector-svc.yaml | 4 +-- .../rendered/jaeger/allinone-deploy.yaml | 8 +++-- .../rendered/jaeger/allinone-query-svc.yaml | 4 +-- .../rendered/jaeger/allinone-sa.yaml | 4 +-- .../opentelemetry-collector/configmap.yaml | 4 +-- .../opentelemetry-collector/deployment.yaml | 8 ++--- .../opentelemetry-collector/ingress.yaml | 4 +-- .../opentelemetry-collector/service.yaml | 5 +-- .../serviceaccount.yaml | 4 +-- .../rendered/prometheus/clusterrole.yaml | 12 ++++--- .../prometheus/clusterrolebinding.yaml | 12 ++++--- .../rendered/prometheus/cm.yaml | 12 ++++--- .../rendered/prometheus/deploy.yaml | 33 +++++++++++-------- .../rendered/prometheus/service.yaml | 18 +++++----- .../rendered/prometheus/serviceaccount.yaml | 12 ++++--- 108 files changed, 471 insertions(+), 364 deletions(-) diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml index 37dd3e814..41ad3ca81 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml index 1bb386013..b29ae8821 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml index d85c20ab6..1be423a56 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index 703abeec6..b65d0eb83 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,11 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b + checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 + checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da + kubectl.kubernetes.io/default-container: grafana spec: serviceAccountName: example-grafana @@ -37,12 +38,20 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 + runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "grafana/grafana:9.4.7" + image: "docker.io/grafana/grafana:10.0.3" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml index ffe05e274..4bb6ab1b9 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml index 2ff6b3d95..3fb842746 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml index 8ca5ebfc6..5945da59c 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml index 20e30b774..397a3d56c 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml index 2d4090b96..7bdd349a1 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml index 783067d38..22511fc1f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml index 5b43f7194..9cf86f6c9 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml index 27a0e8224..ae03b9581 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "bats/bats:v1.4.1" + image: "docker.io/bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml index 13c4b0a18..19d9ec47c 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml index 8786c0e7b..1232c2f82 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index 4518b9fe4..d492c2124 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.42.0 + image: jaegertracing/all-in-one:1.45.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,4 +96,6 @@ spec: resources: limits: memory: 300Mi + volumeMounts: serviceAccountName: example-jaeger + volumes: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml index da5bade96..032bee30f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml index a5ae7bb57..fa14f6868 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index 345f01cff..a6e36ebb5 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index 96f550d9c..6f60463bd 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -5,10 +5,10 @@ kind: DaemonSet metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 627ef43facddeaa6c6e7f91d8b1e04c1c7f292cbacad373de913a5a337dfc669 + checksum/config: e62fcdf5b3a33ec3cdb0ad02e110fcaa5f3ec9f29067a643b7413b0bd7623171 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.82.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml index 2e262e6fb..5601241bf 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml index f33254581..dc9341909 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml index 114cb7979..5b48ce6a0 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml index 149a9bebf..a1d733410 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml index b5578f03b..cbf307609 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml @@ -4,38 +4,43 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: selector: matchLabels: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example replicas: 1 + revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.43.0" + image: "quay.io/prometheus/prometheus:v2.46.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml index 8e4cc196d..e184e9f0d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: Service metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: @@ -18,8 +20,8 @@ spec: protocol: TCP targetPort: 9090 selector: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml index c9d51410f..1ebd2db1e 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml index 37dd3e814..41ad3ca81 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml index 1bb386013..b29ae8821 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml index d85c20ab6..1be423a56 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index 703abeec6..b65d0eb83 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,11 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b + checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 + checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da + kubectl.kubernetes.io/default-container: grafana spec: serviceAccountName: example-grafana @@ -37,12 +38,20 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 + runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "grafana/grafana:9.4.7" + image: "docker.io/grafana/grafana:10.0.3" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml index ffe05e274..4bb6ab1b9 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml index 2ff6b3d95..3fb842746 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml index 8ca5ebfc6..5945da59c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml index 20e30b774..397a3d56c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml index 2d4090b96..7bdd349a1 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml index 783067d38..22511fc1f 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml index 5b43f7194..9cf86f6c9 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml index 27a0e8224..ae03b9581 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "bats/bats:v1.4.1" + image: "docker.io/bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml index 13c4b0a18..19d9ec47c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml index 8786c0e7b..1232c2f82 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index 4518b9fe4..d492c2124 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.42.0 + image: jaegertracing/all-in-one:1.45.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,4 +96,6 @@ spec: resources: limits: memory: 300Mi + volumeMounts: serviceAccountName: example-jaeger + volumes: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml index da5bade96..032bee30f 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml index a5ae7bb57..fa14f6868 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index 65cc605f7..f201a599a 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index ca63bd8de..6480aa00d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a3a9263b6d6111b94da158ff4c9d9fd67c6cb3aed729b134ea907554519dfa6e + checksum/config: 20851ed0c4bdafbefc52a90b489ba1a5a377b40e2add9425e2e4de2dcfce0f2d opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.82.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml index 38af05c71..d431f6ea5 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,3 +52,4 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml index 2e262e6fb..5601241bf 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml index f33254581..dc9341909 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml index 114cb7979..5b48ce6a0 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml index 149a9bebf..a1d733410 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml index b5578f03b..cbf307609 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml @@ -4,38 +4,43 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: selector: matchLabels: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example replicas: 1 + revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.43.0" + image: "quay.io/prometheus/prometheus:v2.46.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml index 8e4cc196d..e184e9f0d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: Service metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: @@ -18,8 +20,8 @@ spec: protocol: TCP targetPort: 9090 selector: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml index c9d51410f..1ebd2db1e 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index 37dd3e814..41ad3ca81 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml index 1bb386013..b29ae8821 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml index d85c20ab6..1be423a56 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index 703abeec6..b65d0eb83 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,11 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b + checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 + checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da + kubectl.kubernetes.io/default-container: grafana spec: serviceAccountName: example-grafana @@ -37,12 +38,20 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 + runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "grafana/grafana:9.4.7" + image: "docker.io/grafana/grafana:10.0.3" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml index ffe05e274..4bb6ab1b9 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml index 2ff6b3d95..3fb842746 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml index 8ca5ebfc6..5945da59c 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml index 20e30b774..397a3d56c 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml index 2d4090b96..7bdd349a1 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml index 783067d38..22511fc1f 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml index 5b43f7194..9cf86f6c9 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml index 27a0e8224..ae03b9581 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "bats/bats:v1.4.1" + image: "docker.io/bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml index 13c4b0a18..19d9ec47c 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml index 8786c0e7b..1232c2f82 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index 4518b9fe4..d492c2124 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.42.0 + image: jaegertracing/all-in-one:1.45.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,4 +96,6 @@ spec: resources: limits: memory: 300Mi + volumeMounts: serviceAccountName: example-jaeger + volumes: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml index da5bade96..032bee30f 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml index a5ae7bb57..fa14f6868 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index cb58ac717..1e65a6edd 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index a8cc31e28..13c7ec436 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 + checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.82.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml index 38af05c71..d431f6ea5 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,3 +52,4 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml index 2e262e6fb..5601241bf 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml index f33254581..dc9341909 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml index 114cb7979..5b48ce6a0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index 149a9bebf..a1d733410 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml index b5578f03b..cbf307609 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml @@ -4,38 +4,43 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: selector: matchLabels: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example replicas: 1 + revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.43.0" + image: "quay.io/prometheus/prometheus:v2.46.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml index 8e4cc196d..e184e9f0d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: Service metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: @@ -18,8 +20,8 @@ spec: protocol: TCP targetPort: 9090 selector: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml index c9d51410f..1ebd2db1e 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml index 37dd3e814..41ad3ca81 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml index 1bb386013..b29ae8821 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml index d85c20ab6..1be423a56 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index 703abeec6..b65d0eb83 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,11 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b + checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 + checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da + kubectl.kubernetes.io/default-container: grafana spec: serviceAccountName: example-grafana @@ -37,12 +38,20 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 + runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "grafana/grafana:9.4.7" + image: "docker.io/grafana/grafana:10.0.3" imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml index ffe05e274..4bb6ab1b9 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml index 2ff6b3d95..3fb842746 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml index 8ca5ebfc6..5945da59c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml index 20e30b774..397a3d56c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml index 2d4090b96..7bdd349a1 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml index 783067d38..22511fc1f 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml index 5b43f7194..9cf86f6c9 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml index 27a0e8224..ae03b9581 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.52.8 + helm.sh/chart: grafana-6.58.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "9.4.7" + app.kubernetes.io/version: "10.0.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "bats/bats:v1.4.1" + image: "docker.io/bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml index 13c4b0a18..19d9ec47c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml index 8786c0e7b..1232c2f82 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index 4518b9fe4..d492c2124 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.42.0 + image: jaegertracing/all-in-one:1.45.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,4 +96,6 @@ spec: resources: limits: memory: 300Mi + volumeMounts: serviceAccountName: example-jaeger + volumes: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml index da5bade96..032bee30f 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml index a5ae7bb57..fa14f6868 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.69.1 + helm.sh/chart: jaeger-0.71.11 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.42.0" + app.kubernetes.io/version: "1.45.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index cb58ac717..1e65a6edd 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index a8cc31e28..13c7ec436 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 70766a04d09e3d8f05813f244cafb07d295308fbae0aa3750f667c41619a50c1 + checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.76.1" + image: "otel/opentelemetry-collector-contrib:0.82.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml index 8ebb61918..2bc7209e9 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml @@ -5,10 +5,10 @@ kind: Ingress metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml index 38af05c71..d431f6ea5 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,3 +52,4 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml index 2e262e6fb..5601241bf 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.55.1 + helm.sh/chart: opentelemetry-collector-0.65.1 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.76.1" + app.kubernetes.io/version: "0.82.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml index f33254581..dc9341909 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml index 114cb7979..5b48ce6a0 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml @@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml index 149a9bebf..a1d733410 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml index b5578f03b..cbf307609 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml @@ -4,38 +4,43 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: selector: matchLabels: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example replicas: 1 + revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.43.0" + image: "quay.io/prometheus/prometheus:v2.46.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml index 8e4cc196d..e184e9f0d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: Service metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default spec: @@ -18,8 +20,8 @@ spec: protocol: TCP targetPort: 9090 selector: - component: "server" - app: prometheus - release: example + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml index c9d51410f..1ebd2db1e 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml @@ -4,11 +4,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - component: "server" - app: prometheus - release: example - chart: prometheus-20.2.0 - heritage: Helm + app.kubernetes.io/component: server + app.kubernetes.io/name: prometheus + app.kubernetes.io/instance: example + app.kubernetes.io/version: v2.46.0 + helm.sh/chart: prometheus-23.3.0 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/part-of: prometheus name: example-prometheus-server namespace: default annotations: From 68912948f8d137c19ec13ca878f2e6e4a12e3fa9 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Mon, 21 Aug 2023 22:05:59 -0400 Subject: [PATCH 5/8] demo 1.5 release Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 86 +++++------ .../default/rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 86 +++++------ .../rendered/grafana-dashboards.yaml | 134 +++++++++++++++--- .../rendered/serviceaccount.yaml | 2 +- .../grafana-dashboards/demo-dashboard.json | 132 ++++++++++++++--- charts/opentelemetry-demo/templates/NOTES.txt | 11 -- charts/opentelemetry-demo/values.yaml | 6 +- 18 files changed, 804 insertions(+), 323 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index ec859120e..724a9ba48 100644 --- a/charts/opentelemetry-demo/Chart.yaml +++ b/charts/opentelemetry-demo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: opentelemetry-demo -version: 0.23.0 +version: 0.24.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml index 57f6575f0..779fdb06e 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -666,6 +666,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: 'example-featureflagservice:50053' - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -690,7 +692,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +792,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +870,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +950,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1050,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1134,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1216,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1299,7 +1301,7 @@ spec: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces + value: http://localhost:8080/otlp-http/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1316,7 +1318,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1400,8 +1402,10 @@ spec: value: "16686" - name: JAEGER_SERVICE_HOST value: 'example-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES @@ -1420,7 +1424,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1510,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1575,15 +1579,15 @@ spec: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: http://example-frontend:8080 + value: http://example-frontendproxy:8080 - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1596,7 +1600,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1682,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1762,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1846,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1932,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2010,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index bee0c9cf8..8e9fe11a9 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -666,6 +666,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: 'example-featureflagservice:50053' - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -690,7 +692,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +792,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +870,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +950,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1050,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1134,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1216,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1299,7 +1301,7 @@ spec: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces + value: http://localhost:8080/otlp-http/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1316,7 +1318,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1400,8 +1402,10 @@ spec: value: "16686" - name: JAEGER_SERVICE_HOST value: 'example-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES @@ -1420,7 +1424,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1510,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1575,15 +1579,15 @@ spec: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: http://example-frontend:8080 + value: http://example-frontendproxy:8080 - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1596,7 +1600,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1682,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1762,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1846,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1932,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2010,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index f36cbc8f8..b1543f9f6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -520,7 +520,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -604,7 +604,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -670,6 +670,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: 'example-featureflagservice:50053' - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -696,7 +698,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -798,7 +800,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -878,7 +880,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -960,7 +962,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1062,7 +1064,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1146,7 +1148,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1230,7 +1232,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1315,7 +1317,7 @@ spec: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces + value: http://localhost:8080/otlp-http/v1/traces - name: TEAM_NAME value: ring - name: OTEL_RESOURCE_ATTRIBUTES @@ -1334,7 +1336,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1418,8 +1420,10 @@ spec: value: "16686" - name: JAEGER_SERVICE_HOST value: 'example-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES @@ -1438,7 +1442,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1524,7 +1528,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1593,15 +1597,15 @@ spec: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: http://example-frontend:8080 + value: http://example-frontendproxy:8080 - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: TEAM_NAME value: ring - name: OTEL_RESOURCE_ATTRIBUTES @@ -1616,7 +1620,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1700,7 +1704,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1782,7 +1786,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1868,7 +1872,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1956,7 +1960,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2034,7 +2038,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 15b691cb0..7f11d7585 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -666,6 +666,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: 'example-featureflagservice:50053' - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -690,7 +692,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +792,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +870,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +950,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1050,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1134,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1216,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1299,7 +1301,7 @@ spec: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:4318/v1/traces + value: http://localhost:8080/otlp-http/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1316,7 +1318,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1400,8 +1402,10 @@ spec: value: "16686" - name: JAEGER_SERVICE_HOST value: 'example-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES @@ -1420,7 +1424,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1510,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1575,15 +1579,15 @@ spec: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: http://example-frontend:8080 + value: http://example-frontendproxy:8080 - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1596,7 +1600,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1682,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1762,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1846,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1932,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2010,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 2611a3fbf..e61ae2c2c 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -518,7 +518,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -600,7 +600,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -666,6 +666,8 @@ spec: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: 'example-featureflagservice:50053' - name: REDIS_ADDR value: 'example-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -690,7 +692,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -790,7 +792,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -868,7 +870,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -948,7 +950,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -1048,7 +1050,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -1132,7 +1134,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1214,7 +1216,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1316,7 +1318,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1400,8 +1402,10 @@ spec: value: "16686" - name: JAEGER_SERVICE_HOST value: 'example-jaeger-query' - - name: OTEL_COLLECTOR_PORT + - name: OTEL_COLLECTOR_PORT_GRPC value: "4317" + - name: OTEL_COLLECTOR_PORT_HTTP + value: "4318" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES @@ -1420,7 +1424,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1506,7 +1510,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1575,15 +1579,15 @@ spec: - name: LOCUST_SPAWN_RATE value: "1" - name: LOCUST_HOST - value: http://example-frontend:8080 + value: http://example-frontendproxy:8080 - name: LOCUST_HEADLESS value: "false" - name: LOCUST_AUTOSTART value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: @@ -1596,7 +1600,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1678,7 +1682,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1758,7 +1762,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1842,7 +1846,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1928,7 +1932,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -2006,7 +2010,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -2086,7 +2090,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index 57a061ba5..8e36111fe 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: - demo-dashboard.json: | + demo-dashboard.json: |- { "annotations": { "list": [ @@ -431,13 +431,13 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -525,8 +525,8 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -537,9 +537,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -550,9 +550,9 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -563,14 +563,14 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -657,17 +657,111 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -683,14 +777,14 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -709,7 +803,7 @@ data: "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" } opentelemetry-collector-data-flow.json: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index 386fdd068..c4a407c01 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.23.0 + helm.sh/chart: opentelemetry-demo-0.24.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json b/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json index 37061e1bd..ace199bc8 100644 --- a/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json +++ b/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json @@ -413,13 +413,13 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])", - "legendFormat": "__auto", + "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Error Rate", + "title": "Error Rate by Service", "type": "timeseries" }, { @@ -507,8 +507,8 @@ }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "__auto", + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -519,9 +519,9 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile95", "range": true, "refId": "B" }, @@ -532,9 +532,9 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile99", "range": true, "refId": "C" }, @@ -545,14 +545,14 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "legendFormat": "__auto", + "legendFormat": "quantile999", "range": true, "refId": "D" } ], - "title": "Service Latency (from SpanMetrics)", + "title": "Service Latency by Service (from SpanMetrics)", "type": "timeseries" }, { @@ -639,17 +639,111 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])", - "legendFormat": "__auto", + "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], "title": "Endpoint Rate by Service", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 25 + }, + "id": 16, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "builder", + "expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}", + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } + ], + "title": "Quote Service batch span processor", + "type": "timeseries" } ], - "schemaVersion": 37, + "refresh": "", + "revision": 1, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -665,14 +759,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "latency_bucket", + "definition": "duration_milliseconds_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "latency_bucket", + "query": "duration_milliseconds_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -691,6 +785,6 @@ "timezone": "", "title": "Demo Dashboard", "uid": "W2gX2zHVk", - "version": 1, + "version": 2, "weekStart": "" -} +} \ No newline at end of file diff --git a/charts/opentelemetry-demo/templates/NOTES.txt b/charts/opentelemetry-demo/templates/NOTES.txt index 085111dbc..8a384c93d 100644 --- a/charts/opentelemetry-demo/templates/NOTES.txt +++ b/charts/opentelemetry-demo/templates/NOTES.txt @@ -19,14 +19,3 @@ Feature Flags UI http://localhost:8080/feature/ Load Generator UI http://localhost:8080/loadgen/ Jaeger UI http://localhost:8080/jaeger/ui/ - -- OpenTelemetry Collector OTLP/HTTP receiver (required for browser spans to be emitted): - by running these commands: - kubectl port-forward svc/{{ include "otel-demo.name" . }}-otelcol 4318:4318 - -{{- if eq (index .Values "opentelemetry-collector" "config" "receivers" "otlp" "protocols" "http" "endpoint") "0.0.0.0:4318" }} - -The OpenTelemetry Collector OTLP/HTTP receiver is bound to 0.0.0.0 in order to allow the "kubectl port-forward" command. -This may be susceptible to denial of service attacks. -See: CWE-1327 https://cwe.mitre.org/data/definitions/1327.html -{{- end }} diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index ef294bac3..639b86475 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -193,6 +193,8 @@ components: value: "8080" - name: ASPNETCORE_URLS value: http://*:$(CART_SERVICE_PORT) + - name: FEATURE_FLAG_GRPC_SERVICE_ADDR + value: '{{ include "otel-demo.name" . }}-featureflagservice:50053' - name: REDIS_ADDR value: '{{ include "otel-demo.name" . }}-redis:6379' - name: OTEL_EXPORTER_OTLP_ENDPOINT @@ -424,8 +426,8 @@ components: value: "true" - name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION value: python - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://$(OTEL_COLLECTOR_NAME):4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(OTEL_COLLECTOR_NAME):4317 resources: limits: memory: 120Mi From 4145b4b4802643930cc89207a6f7b86f6d116bdc Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 15 Sep 2023 10:27:58 -0400 Subject: [PATCH 6/8] demo 1.5 release Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../rendered/component.yaml | 106 ++++++++--------- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 106 ++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/daemonset.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 106 ++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/deployment.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 106 ++++++++--------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/deployment.yaml | 2 +- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 108 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../opentelemetry-collector/deployment.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- charts/opentelemetry-demo/values.yaml | 2 +- 20 files changed, 281 insertions(+), 281 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 724a9ba48..893226dc5 100644 --- a/charts/opentelemetry-demo/Chart.yaml +++ b/charts/opentelemetry-demo/Chart.yaml @@ -11,7 +11,7 @@ maintainers: - name: puckpuck - name: tylerhelmuth icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png -appVersion: "1.4.0" +appVersion: "1.5.0" dependencies: - name: opentelemetry-collector version: 0.65.1 diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml index 9a35ec5b3..1ff9c3429 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -36,7 +36,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -61,7 +61,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -86,7 +86,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -136,7 +136,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -164,7 +164,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -189,7 +189,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -214,7 +214,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -239,7 +239,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -267,7 +267,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -292,7 +292,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -342,7 +342,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -367,7 +367,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -392,7 +392,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -417,7 +417,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -504,7 +504,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -566,7 +566,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -638,7 +638,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -658,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -718,7 +718,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -738,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -776,7 +776,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -796,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -836,7 +836,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -856,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -916,7 +916,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -980,7 +980,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1000,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1042,7 +1042,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1062,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1124,7 +1124,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1144,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1210,7 +1210,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1230,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1276,7 +1276,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1296,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,7 +1346,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1366,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1408,7 +1408,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1428,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1468,7 +1468,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1488,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1532,7 +1532,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1552,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1598,7 +1598,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1656,7 +1656,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1676,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml index c4a407c01..d824f864d 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -10,6 +10,6 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index 008083819..648fd740b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -36,7 +36,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -61,7 +61,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -86,7 +86,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -136,7 +136,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -164,7 +164,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -189,7 +189,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -214,7 +214,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -239,7 +239,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -267,7 +267,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -292,7 +292,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -342,7 +342,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -367,7 +367,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -392,7 +392,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -417,7 +417,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -504,7 +504,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -566,7 +566,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -638,7 +638,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -658,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -718,7 +718,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -738,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -776,7 +776,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -796,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -836,7 +836,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -856,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -916,7 +916,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -980,7 +980,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1000,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1042,7 +1042,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1062,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1124,7 +1124,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1144,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1210,7 +1210,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1230,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1276,7 +1276,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1296,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,7 +1346,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1366,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1408,7 +1408,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1428,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1468,7 +1468,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1488,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1532,7 +1532,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1552,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1598,7 +1598,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1656,7 +1656,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1676,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index 8e36111fe..eff31970e 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -10,7 +10,7 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index 4e350006d..ef180c1de 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -95,7 +95,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 180Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index c4a407c01..d824f864d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -10,6 +10,6 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index 5c4f5adfb..f3cb23632 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -36,7 +36,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -61,7 +61,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -86,7 +86,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -136,7 +136,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -164,7 +164,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -189,7 +189,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -214,7 +214,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -239,7 +239,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -267,7 +267,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -292,7 +292,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -342,7 +342,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -367,7 +367,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -392,7 +392,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -417,7 +417,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -506,7 +506,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +526,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -570,7 +570,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -590,7 +590,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -644,7 +644,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -664,7 +664,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -726,7 +726,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -746,7 +746,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -786,7 +786,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -806,7 +806,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -848,7 +848,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -868,7 +868,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -930,7 +930,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -994,7 +994,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1014,7 +1014,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1058,7 +1058,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1078,7 +1078,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1142,7 +1142,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1162,7 +1162,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1228,7 +1228,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1248,7 +1248,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1294,7 +1294,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1314,7 +1314,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1366,7 +1366,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1386,7 +1386,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1430,7 +1430,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1450,7 +1450,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1492,7 +1492,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1512,7 +1512,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1558,7 +1558,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1578,7 +1578,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1626,7 +1626,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1684,7 +1684,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1704,7 +1704,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index 8e36111fe..eff31970e 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -10,7 +10,7 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index a7c681abc..89ea7e073 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 180Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index c4a407c01..d824f864d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -10,6 +10,6 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 9be55b19c..363d3fbf0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -36,7 +36,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -61,7 +61,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -86,7 +86,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -136,7 +136,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -164,7 +164,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -189,7 +189,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -214,7 +214,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -239,7 +239,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -267,7 +267,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -292,7 +292,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -342,7 +342,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -367,7 +367,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -392,7 +392,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -417,7 +417,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -504,7 +504,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -566,7 +566,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -638,7 +638,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -658,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -718,7 +718,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -738,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -776,7 +776,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -796,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -836,7 +836,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -856,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -916,7 +916,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -980,7 +980,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1000,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1042,7 +1042,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1062,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1124,7 +1124,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1144,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1210,7 +1210,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1230,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1276,7 +1276,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1296,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,7 +1346,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1366,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1408,7 +1408,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1428,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1468,7 +1468,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1488,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1532,7 +1532,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1552,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1598,7 +1598,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1656,7 +1656,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1676,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 8e36111fe..eff31970e 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -10,7 +10,7 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 0e06023e5..6baa1293a 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 180Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index c4a407c01..d824f864d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -10,6 +10,6 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 3f63807f5..71b6687bf 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -36,7 +36,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -61,7 +61,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -86,7 +86,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -111,7 +111,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -136,7 +136,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -164,7 +164,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -189,7 +189,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -214,7 +214,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -239,7 +239,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -267,7 +267,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -292,7 +292,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -342,7 +342,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -367,7 +367,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -392,7 +392,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -417,7 +417,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -462,7 +462,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -504,7 +504,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -524,7 +524,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -566,7 +566,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -586,7 +586,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -638,7 +638,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -658,7 +658,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -718,7 +718,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -738,7 +738,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -776,7 +776,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -796,7 +796,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -836,7 +836,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -856,7 +856,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -916,7 +916,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -980,7 +980,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1000,7 +1000,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1042,7 +1042,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1062,7 +1062,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1124,7 +1124,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1144,7 +1144,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.4.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.5.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1210,7 +1210,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1230,7 +1230,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.4.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.5.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1276,7 +1276,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1296,7 +1296,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.4.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.5.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,7 +1346,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1366,7 +1366,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1408,7 +1408,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1428,7 +1428,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1468,7 +1468,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1488,7 +1488,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1532,7 +1532,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1552,7 +1552,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1598,7 +1598,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1656,7 +1656,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1676,7 +1676,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.4.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.5.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1716,7 +1716,7 @@ metadata: app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index 8e36111fe..eff31970e 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -10,7 +10,7 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 0e06023e5..6baa1293a 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 125Mi + memory: 180Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index c4a407c01..d824f864d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -10,6 +10,6 @@ metadata: opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.4.0" + app.kubernetes.io/version: "1.5.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 37ee65c70..9707ea7cc 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -585,7 +585,7 @@ opentelemetry-collector: enabled: true resources: limits: - memory: 125Mi + memory: 180Mi service: type: ClusterIP ports: From 70583f73a606dcd980c8f06541d9b6d9e00433d1 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 15 Sep 2023 19:33:31 -0400 Subject: [PATCH 7/8] demo 1.5 release Signed-off-by: Pierre Tessier --- charts/opentelemetry-demo/Chart.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/deployment.yaml | 2 +- .../configmap-agent.yaml | 10 +-- .../opentelemetry-collector/daemonset.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 72 +++++++++--------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/deployment.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 10 +-- .../opentelemetry-collector/deployment.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/default/rendered/component.yaml | 72 +++++++++--------- .../default/rendered/grafana-dashboards.yaml | 2 +- .../default/rendered/grafana/deployment.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 10 +-- .../opentelemetry-collector/deployment.yaml | 2 +- .../default/rendered/serviceaccount.yaml | 2 +- .../rendered/component.yaml | 74 +++++++++---------- .../rendered/grafana-dashboards.yaml | 2 +- .../rendered/grafana/deployment.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 10 +-- .../opentelemetry-collector/deployment.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- charts/opentelemetry-demo/values.yaml | 18 ++--- 28 files changed, 215 insertions(+), 241 deletions(-) diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 893226dc5..d8047bb51 100644 --- a/charts/opentelemetry-demo/Chart.yaml +++ b/charts/opentelemetry-demo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: opentelemetry-demo -version: 0.24.0 +version: 0.25.0 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml index 1ff9c3429..4880e78bf 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -498,7 +498,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -560,7 +560,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -632,7 +632,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -712,7 +712,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -770,7 +770,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -830,7 +830,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -910,7 +910,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -974,7 +974,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1036,7 +1036,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1118,7 +1118,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1204,7 +1204,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1270,7 +1270,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1340,7 +1340,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1402,7 +1402,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1462,7 +1462,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1526,7 +1526,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1592,7 +1592,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1650,7 +1650,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml index d824f864d..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index 648fd740b..a647cab06 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -498,7 +498,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -560,7 +560,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -632,7 +632,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -712,7 +712,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -770,7 +770,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -830,7 +830,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -910,7 +910,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -974,7 +974,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1036,7 +1036,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1118,7 +1118,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1204,7 +1204,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1270,7 +1270,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1340,7 +1340,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1402,7 +1402,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1462,7 +1462,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1526,7 +1526,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1592,7 +1592,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1650,7 +1650,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml index eff31970e..d3bffd7d9 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index af93ac078..13041c51d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -31,11 +31,6 @@ data: size_in_percentage: 40 processors: batch: {} - filter/ottl: - error_mode: ignore - metrics: - metric: - - name == "queueSize" k8sattributes: extract: metadata: @@ -74,8 +69,8 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" receivers: jaeger: protocols: @@ -126,7 +121,6 @@ data: processors: - k8sattributes - memory_limiter - - filter/ottl - resource - transform - batch diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index ef180c1de..6ca23d18f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: a716efb929ffbb7d38b2d583356cb2ea14e792f032e01900ab87a97d7f87d62c + checksum/config: b0d2c52070e8cff6b070a8dd217673be88d078bb7d794dae71f928c17c010213 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml index d824f864d..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index f3cb23632..395d2296d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -500,7 +500,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -564,7 +564,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -638,7 +638,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -720,7 +720,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -780,7 +780,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -842,7 +842,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -924,7 +924,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -988,7 +988,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1052,7 +1052,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1136,7 +1136,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1222,7 +1222,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1288,7 +1288,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1360,7 +1360,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1424,7 +1424,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1486,7 +1486,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1552,7 +1552,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1620,7 +1620,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1678,7 +1678,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml index eff31970e..d3bffd7d9 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index 33b315aa0..457796f7c 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -40,11 +40,6 @@ data: services: - frontend-proxy batch: {} - filter/ottl: - error_mode: ignore - metrics: - metric: - - name == "queueSize" k8sattributes: extract: metadata: @@ -81,8 +76,8 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" receivers: jaeger: protocols: @@ -133,7 +128,6 @@ data: processors: - k8sattributes - memory_limiter - - filter/ottl - resource - transform - batch diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index 89ea7e073..2434851f4 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 3c216c417adc791c2672be40eb909b51af9b68fa4bb7ee37252805d6e505fa55 + checksum/config: db0e93d20a0305525f27fef9ca29f3a255c7e5558958aa61e84c34acd9decd06 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml index d824f864d..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 363d3fbf0..e4ad26757 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -498,7 +498,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -560,7 +560,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -632,7 +632,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -712,7 +712,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -770,7 +770,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -830,7 +830,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -910,7 +910,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -974,7 +974,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1036,7 +1036,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1118,7 +1118,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1204,7 +1204,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1270,7 +1270,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1340,7 +1340,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1402,7 +1402,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1462,7 +1462,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1526,7 +1526,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1592,7 +1592,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1650,7 +1650,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index eff31970e..d3bffd7d9 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index d1917aa88..0246a14c4 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -31,11 +31,6 @@ data: size_in_percentage: 40 processors: batch: {} - filter/ottl: - error_mode: ignore - metrics: - metric: - - name == "queueSize" k8sattributes: extract: metadata: @@ -72,8 +67,8 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" receivers: jaeger: protocols: @@ -124,7 +119,6 @@ data: processors: - k8sattributes - memory_limiter - - filter/ottl - resource - transform - batch diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 6baa1293a..72967df6f 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 6e5b460ee9269c91ee62f02efbf165e52ae1a4ef9932acb726dff5fa8fa6c0b5 + checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index d824f864d..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index 71b6687bf..f15a82913 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -30,7 +30,7 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -80,7 +80,7 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -105,7 +105,7 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -130,7 +130,7 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -158,7 +158,7 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -183,7 +183,7 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -208,7 +208,7 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -233,7 +233,7 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -261,7 +261,7 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -286,7 +286,7 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -311,7 +311,7 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -336,7 +336,7 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -361,7 +361,7 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -386,7 +386,7 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -411,7 +411,7 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -436,7 +436,7 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -498,7 +498,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -560,7 +560,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -632,7 +632,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -712,7 +712,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -770,7 +770,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -830,7 +830,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -910,7 +910,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -974,7 +974,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1036,7 +1036,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1118,7 +1118,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1204,7 +1204,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1270,7 +1270,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1340,7 +1340,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1402,7 +1402,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1462,7 +1462,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1526,7 +1526,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1592,7 +1592,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1650,7 +1650,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -1710,7 +1710,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index eff31970e..d3bffd7d9 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index b65d0eb83..471aee640 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -112,7 +112,7 @@ spec: port: 3000 resources: limits: - memory: 100Mi + memory: 150Mi volumes: - name: config configMap: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index d1917aa88..0246a14c4 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -31,11 +31,6 @@ data: size_in_percentage: 40 processors: batch: {} - filter/ottl: - error_mode: ignore - metrics: - metric: - - name == "queueSize" k8sattributes: extract: metadata: @@ -72,8 +67,8 @@ data: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name - == "http.server.duration" + - set(description, "") where name == "queueSize" + - set(description, "") where name == "rpc.server.duration" receivers: jaeger: protocols: @@ -124,7 +119,6 @@ data: processors: - k8sattributes - memory_limiter - - filter/ottl - resource - transform - batch diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 6baa1293a..72967df6f 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 6e5b460ee9269c91ee62f02efbf165e52ae1a4ef9932acb726dff5fa8fa6c0b5 + checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml index d824f864d..b4c0d733b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.24.0 + helm.sh/chart: opentelemetry-demo-0.25.0 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 9707ea7cc..5d17777c6 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -634,18 +634,16 @@ opentelemetry-collector: - key: service.instance.id from_attribute: k8s.pod.uid action: insert - # we can remove when this is fixed: https://github.com/open-telemetry/opentelemetry-demo/issues/737 transform: metric_statements: - context: metric statements: - - set(description, "Measures the duration of inbound HTTP requests") where name == "http.server.duration" - # we can remove when this is fixed: https://github.com/open-telemetry/opentelemetry-demo/issues/826 - filter/ottl: - error_mode: ignore - metrics: - metric: - - 'name == "queueSize"' + # FIXME: remove this when this is issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834 + - set(description, "") where name == "queueSize" + # FIXME: remove this when the following 2 issues are resolved + # Java: https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/9478 + # Go: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4301 + - set(description, "") where name == "rpc.server.duration" connectors: spanmetrics: @@ -657,7 +655,7 @@ opentelemetry-collector: exporters: [otlp, logging, spanmetrics] metrics: receivers: [otlp, spanmetrics] - processors: [memory_limiter, filter/ottl, resource, transform, batch] + processors: [memory_limiter, resource, transform, batch] exporters: [prometheus, logging] jaeger: @@ -785,4 +783,4 @@ grafana: default: '{{ include "otel-demo.name" . }}-grafana-dashboards' resources: limits: - memory: 100Mi + memory: 150Mi From 6b1b635e939d6d8416f6e69f59ca8bfb72c14432 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Tue, 19 Sep 2023 18:08:46 -0400 Subject: [PATCH 8/8] demo 1.5 release Signed-off-by: Pierre Tessier --- .../rendered/jaeger/allinone-deploy.yaml | 2 +- .../configmap-agent.yaml | 13 +++++++--- .../opentelemetry-collector/daemonset.yaml | 4 ++-- .../rendered/jaeger/allinone-deploy.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 13 +++++++--- .../opentelemetry-collector/deployment.yaml | 4 ++-- .../rendered/jaeger/allinone-deploy.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 13 +++++++--- .../opentelemetry-collector/deployment.yaml | 4 ++-- .../rendered/jaeger/allinone-deploy.yaml | 2 +- .../opentelemetry-collector/configmap.yaml | 13 +++++++--- .../opentelemetry-collector/deployment.yaml | 4 ++-- charts/opentelemetry-demo/values.yaml | 24 ++++++++++++------- 13 files changed, 67 insertions(+), 33 deletions(-) diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index 13041c51d..336586f5a 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -31,6 +31,11 @@ data: size_in_percentage: 40 processors: batch: {} + filter/ottl: + error_mode: ignore + metrics: + metric: + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -71,6 +76,7 @@ data: statements: - set(description, "") where name == "queueSize" - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -89,7 +95,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -121,8 +127,9 @@ data: processors: - k8sattributes - memory_limiter - - resource + - filter/ottl - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index 6ca23d18f..0a6d084d7 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: b0d2c52070e8cff6b070a8dd217673be88d078bb7d794dae71f928c17c010213 + checksum/config: 078e8c22fbb93a32d12180256c540e5112524117b2cb0bddfadc9f4741a40b93 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -95,7 +95,7 @@ spec: port: 13133 resources: limits: - memory: 180Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index 457796f7c..770827469 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -40,6 +40,11 @@ data: services: - frontend-proxy batch: {} + filter/ottl: + error_mode: ignore + metrics: + metric: + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -78,6 +83,7 @@ data: statements: - set(description, "") where name == "queueSize" - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -96,7 +102,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -128,8 +134,9 @@ data: processors: - k8sattributes - memory_limiter - - resource + - filter/ottl - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index 2434851f4..df7e90eec 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: db0e93d20a0305525f27fef9ca29f3a255c7e5558958aa61e84c34acd9decd06 + checksum/config: 087d42dff41bace242e1acef4881a69f566f04a40267d5ec1c6e84d53c3e071e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 180Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index 0246a14c4..c89e89560 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -31,6 +31,11 @@ data: size_in_percentage: 40 processors: batch: {} + filter/ottl: + error_mode: ignore + metrics: + metric: + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -69,6 +74,7 @@ data: statements: - set(description, "") where name == "queueSize" - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -87,7 +93,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -119,8 +125,9 @@ data: processors: - k8sattributes - memory_limiter - - resource + - filter/ottl - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 72967df6f..99a53e2a0 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3 + checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 180Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index d492c2124..8ce504387 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -49,7 +49,7 @@ spec: name: jaeger args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index 0246a14c4..c89e89560 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -22,7 +22,7 @@ data: insecure: true prometheus: enable_open_metrics: true - endpoint: 0.0.0.0:9464 + endpoint: ${env.MY_POD_IP}:9464 resource_to_telemetry_conversion: enabled: true extensions: @@ -31,6 +31,11 @@ data: size_in_percentage: 40 processors: batch: {} + filter/ottl: + error_mode: ignore + metrics: + metric: + - name == "rpc.server.duration" k8sattributes: extract: metadata: @@ -69,6 +74,7 @@ data: statements: - set(description, "") where name == "queueSize" - set(description, "") where name == "rpc.server.duration" + - set(description, "") where name == "http.client.duration" receivers: jaeger: protocols: @@ -87,7 +93,7 @@ data: allowed_origins: - http://* - https://* - endpoint: 0.0.0.0:4318 + endpoint: ${env:MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -119,8 +125,9 @@ data: processors: - k8sattributes - memory_limiter - - resource + - filter/ottl - transform + - resource - batch receivers: - otlp diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 72967df6f..99a53e2a0 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 55d3b8b801c52d8ece946630bf88f5056ca47ca17458a76ec968dc15e90b7bb3 + checksum/config: 65697fdda2bc5b2836ec1e38cbdf3148c0d242f8ff77a457a5967dec922788bd opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -87,7 +87,7 @@ spec: port: 13133 resources: limits: - memory: 180Mi + memory: 200Mi volumeMounts: - mountPath: /conf name: opentelemetry-collector-configmap diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 5d17777c6..0aedc878f 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -585,7 +585,7 @@ opentelemetry-collector: enabled: true resources: limits: - memory: 180Mi + memory: 200Mi service: type: ClusterIP ports: @@ -605,9 +605,6 @@ opentelemetry-collector: otlp: protocols: http: - # Bind to 0.0.0.0 to allow for `kubectl port-forward` to work - # This may be susceptible to denial of service attacks - CWE-1327 https://cwe.mitre.org/data/definitions/1327.html - endpoint: 0.0.0.0:4318 # Since this collector needs to receive data from the web, enable cors for all origins # `allowed_origins` can be refined for your deployment domain cors: @@ -623,7 +620,7 @@ opentelemetry-collector: insecure: true # Create an exporter to Prometheus (metrics) prometheus: - endpoint: '0.0.0.0:9464' + endpoint: "${env.MY_POD_IP}:9464" resource_to_telemetry_conversion: enabled: true enable_open_metrics: true @@ -634,16 +631,25 @@ opentelemetry-collector: - key: service.instance.id from_attribute: k8s.pod.uid action: insert + filter/ottl: + error_mode: ignore + metrics: + metric: + # FIXME: remove when a Metrics View is implemented in the checkout and productcatalog components + # or when this issue is resolved: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3071 + - 'name == "rpc.server.duration"' transform: metric_statements: - context: metric statements: - # FIXME: remove this when this is issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834 + # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834 - set(description, "") where name == "queueSize" - # FIXME: remove this when the following 2 issues are resolved + # FIXME: remove when these 2 issues are resolved: # Java: https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/9478 # Go: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4301 - set(description, "") where name == "rpc.server.duration" + # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1958 + - set(description, "") where name == "http.client.duration" connectors: spanmetrics: @@ -655,7 +661,7 @@ opentelemetry-collector: exporters: [otlp, logging, spanmetrics] metrics: receivers: [otlp, spanmetrics] - processors: [memory_limiter, resource, transform, batch] + processors: [memory_limiter, filter/ottl, transform, resource, batch] exporters: [prometheus, logging] jaeger: @@ -666,7 +672,7 @@ jaeger: enabled: true args: - "--memory.max-traces" - - "10000" + - "8000" - "--query.base-path" - "/jaeger/ui" - "--prometheus.server-url"