diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock index 08a550e02..2f3fecf02 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.77.0 + version: 0.78.0 - name: jaeger repository: https://jaegertracing.github.io/helm-charts - version: 0.72.1 + version: 0.73.1 - name: prometheus repository: https://prometheus-community.github.io/helm-charts version: 25.8.2 - name: grafana repository: https://grafana.github.io/helm-charts - version: 7.0.17 -digest: sha256:f250ab055f3220c955bac32729a6aeddf707af805cca528ffb143f91e6ccbbc7 -generated: "2023-12-14T23:19:56.92245-05:00" + version: 7.2.1 +digest: sha256:484dba15dc44971890d1e7c33d8d2893e2f1ecc976478a75c326b5884bcc1dd8 +generated: "2024-01-16T18:53:08.919148-05:00" diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml index 243821d81..c131b2b3c 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.27.0 +version: 0.27.1 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -14,11 +14,11 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png appVersion: "1.7.0" dependencies: - name: opentelemetry-collector - version: 0.77.0 + version: 0.78.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled - name: jaeger - version: 0.72.1 + version: 0.73.1 repository: https://jaegertracing.github.io/helm-charts condition: jaeger.enabled - name: prometheus @@ -26,6 +26,6 @@ dependencies: repository: https://prometheus-community.github.io/helm-charts condition: prometheus.enabled - name: grafana - version: 7.0.17 + version: 7.2.1 repository: https://grafana.github.io/helm-charts condition: grafana.enabled 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 7c8681ed6..031979e78 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -499,7 +499,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -562,7 +562,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -635,7 +635,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -716,7 +716,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -775,7 +775,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -836,7 +836,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -917,7 +917,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -944,7 +944,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -982,7 +982,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1045,7 +1045,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1128,7 +1128,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1215,7 +1215,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1282,7 +1282,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1353,7 +1353,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1416,7 +1416,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1477,7 +1477,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1542,7 +1542,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1609,7 +1609,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1636,7 +1636,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1668,7 +1668,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 f4902715f..1a42200ae 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 9cd2d4ad7..8e33e2f5e 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -499,7 +499,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -562,7 +562,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -635,7 +635,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -716,7 +716,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -775,7 +775,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -836,7 +836,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -917,7 +917,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -944,7 +944,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -982,7 +982,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1045,7 +1045,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1128,7 +1128,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1215,7 +1215,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1282,7 +1282,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1353,7 +1353,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1416,7 +1416,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1477,7 +1477,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1542,7 +1542,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1609,7 +1609,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1636,7 +1636,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1668,7 +1668,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 f19d6fa8a..837741f15 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +63,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +114,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +124,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +144,9 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -156,24 +156,41 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -181,6 +198,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +248,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +258,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +278,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -295,7 +304,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +342,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +353,13 @@ data: "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -363,22 +373,222 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -428,17 +638,18 @@ data: "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -458,14 +669,37 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -473,7 +707,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +757,17 @@ data: } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -554,53 +787,22 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -619,7 +821,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +859,23 @@ data: "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -688,13 +889,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -758,8 +960,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1004,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2857,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -2724,7 +2926,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -2752,7 +2954,7 @@ data: "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2922,7 +3124,6 @@ data: "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" 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 9e1387397..6e5283d7e 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 4cccd42d6..93901129c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 77f84f7d6..300ee9c16 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: 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 4a129cfcb..55fadd627 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.2.2" + image: "docker.io/grafana/grafana:10.2.3" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false 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 961dadf6c..2d233cba3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 fec7de393..47b837640 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90b4aa0ea..8782d5fd3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 0162d8d98..a6dfaba4c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 1d7b4f97e..1365f39d5 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 8290fe35b..110a007ea 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90f8bb7a3..0f7ec69bf 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 50adeb0a2..3f4044188 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success 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 9af4b63af..f170e8d51 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 88ddaa22f..7de7acc02 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 6c5731805..f82f5210d 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,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 8a60b3b82..54276fd3e 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 94e811070..bdb376447 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,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml index 1e8f3cea2..71d03c7a5 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml index 186dca956..a2c85201b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm roleRef: 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 39a71e2d3..bd906adc8 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" 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 6559e72fd..7e9505a29 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: c7fbf05ac1318742da91abac6b2ee05dce1f0185b15edbd994d43afd518f5707 + checksum/config: 305e8f1a044e6411137e3f4bb136f16c29c90d8d5347f6d844835e191d05c09e 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.91.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: 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 91fb58f2b..de389f535 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 @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm 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 9bce3e08c..de0c44cda 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 @@ -21,9 +21,9 @@ data: {} prometheus.yml: | global: - evaluation_interval: 1m - scrape_interval: 1m - scrape_timeout: 10s + evaluation_interval: 30s + scrape_interval: 5s + scrape_timeout: 3s rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml @@ -31,7 +31,7 @@ data: - /etc/config/alerts scrape_configs: - honor_labels: true - job_name: opentelemetry-community-demo + job_name: otel-collector kubernetes_sd_configs: - namespaces: own_namespace: 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 f4902715f..1a42200ae 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 e8a934705..ad92493c7 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -501,7 +501,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -566,7 +566,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -641,7 +641,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -724,7 +724,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -785,7 +785,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -848,7 +848,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -931,7 +931,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -958,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -996,7 +996,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1061,7 +1061,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1146,7 +1146,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1233,7 +1233,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1300,7 +1300,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1373,7 +1373,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1438,7 +1438,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1501,7 +1501,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1568,7 +1568,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1637,7 +1637,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1664,7 +1664,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1696,7 +1696,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 f19d6fa8a..837741f15 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +63,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +114,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +124,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +144,9 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -156,24 +156,41 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -181,6 +198,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +248,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +258,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +278,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -295,7 +304,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +342,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +353,13 @@ data: "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -363,22 +373,222 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -428,17 +638,18 @@ data: "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -458,14 +669,37 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -473,7 +707,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +757,17 @@ data: } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -554,53 +787,22 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -619,7 +821,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +859,23 @@ data: "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -688,13 +889,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -758,8 +960,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1004,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2857,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -2724,7 +2926,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -2752,7 +2954,7 @@ data: "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2922,7 +3124,6 @@ data: "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" 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 9e1387397..6e5283d7e 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 4cccd42d6..93901129c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 77f84f7d6..300ee9c16 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: 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 4a129cfcb..55fadd627 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.2.2" + image: "docker.io/grafana/grafana:10.2.3" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false 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 961dadf6c..2d233cba3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 fec7de393..47b837640 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90b4aa0ea..8782d5fd3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 0162d8d98..a6dfaba4c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 1d7b4f97e..1365f39d5 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 8290fe35b..110a007ea 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90f8bb7a3..0f7ec69bf 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 50adeb0a2..3f4044188 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success 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 9af4b63af..f170e8d51 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 88ddaa22f..7de7acc02 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 6c5731805..f82f5210d 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,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 8a60b3b82..54276fd3e 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 94e811070..bdb376447 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,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml index 1e8f3cea2..71d03c7a5 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml index 186dca956..a2c85201b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm roleRef: 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 d44547097..ea3d30c27 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" 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 3c9b9fb44..a576dee6c 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 3755dcb18cf8a6f91754ebc987e932362aa16c38f32fcd0f3098bd54416eca96 + checksum/config: d3462234cdafb8ff0ad497c0baa0f38fff6dc510169bf167bcdabf5f14705078 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.91.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: 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 67ab0679c..544a0a761 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm component: standalone-collector 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 91fb58f2b..de389f535 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 @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm 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 9bce3e08c..de0c44cda 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 @@ -21,9 +21,9 @@ data: {} prometheus.yml: | global: - evaluation_interval: 1m - scrape_interval: 1m - scrape_timeout: 10s + evaluation_interval: 30s + scrape_interval: 5s + scrape_timeout: 3s rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml @@ -31,7 +31,7 @@ data: - /etc/config/alerts scrape_configs: - honor_labels: true - job_name: opentelemetry-community-demo + job_name: otel-collector kubernetes_sd_configs: - namespaces: own_namespace: 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 f4902715f..1a42200ae 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 1e11e0838..59c20e0ad 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -499,7 +499,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -562,7 +562,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -635,7 +635,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -716,7 +716,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -775,7 +775,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -836,7 +836,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -917,7 +917,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -944,7 +944,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -982,7 +982,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1045,7 +1045,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1128,7 +1128,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1215,7 +1215,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1282,7 +1282,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1353,7 +1353,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1416,7 +1416,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1477,7 +1477,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1542,7 +1542,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1609,7 +1609,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1636,7 +1636,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1668,7 +1668,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 f19d6fa8a..837741f15 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +63,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +114,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +124,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +144,9 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -156,24 +156,41 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -181,6 +198,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +248,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +258,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +278,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -295,7 +304,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +342,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +353,13 @@ data: "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -363,22 +373,222 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -428,17 +638,18 @@ data: "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -458,14 +669,37 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -473,7 +707,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +757,17 @@ data: } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -554,53 +787,22 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -619,7 +821,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +859,23 @@ data: "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -688,13 +889,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -758,8 +960,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1004,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2857,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -2724,7 +2926,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -2752,7 +2954,7 @@ data: "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2922,7 +3124,6 @@ data: "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index 9e1387397..6e5283d7e 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 4cccd42d6..93901129c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 77f84f7d6..300ee9c16 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index 4a129cfcb..55fadd627 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.2.2" + image: "docker.io/grafana/grafana:10.2.3" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml index 961dadf6c..2d233cba3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 fec7de393..47b837640 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90b4aa0ea..8782d5fd3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 0162d8d98..a6dfaba4c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 1d7b4f97e..1365f39d5 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 8290fe35b..110a007ea 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90f8bb7a3..0f7ec69bf 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 50adeb0a2..3f4044188 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success 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 9af4b63af..f170e8d51 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 88ddaa22f..7de7acc02 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 6c5731805..f82f5210d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 8a60b3b82..54276fd3e 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 94e811070..bdb376447 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml index 1e8f3cea2..71d03c7a5 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml index 186dca956..a2c85201b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm roleRef: 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 210030d33..459d42e26 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" 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 2a9609bd1..4edc35dc7 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: a48d9dbdcf313acbe0a16523ec2a973452ed83acc84e5d3115866fabe10588aa + checksum/config: d2d1620fe68690754eb7ce44954d67a60fd4b16edc98b0eeb86902bdabcf9beb opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.91.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: 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 67ab0679c..544a0a761 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm component: standalone-collector 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 91fb58f2b..de389f535 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index 9bce3e08c..de0c44cda 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -21,9 +21,9 @@ data: {} prometheus.yml: | global: - evaluation_interval: 1m - scrape_interval: 1m - scrape_timeout: 10s + evaluation_interval: 30s + scrape_interval: 5s + scrape_timeout: 3s rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml @@ -31,7 +31,7 @@ data: - /etc/config/alerts scrape_configs: - honor_labels: true - job_name: opentelemetry-community-demo + job_name: otel-collector kubernetes_sd_configs: - namespaces: own_namespace: true diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index f4902715f..1a42200ae 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml index 1e11e0838..59c20e0ad 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -499,7 +499,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -562,7 +562,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -635,7 +635,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -716,7 +716,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -775,7 +775,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -836,7 +836,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -917,7 +917,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -944,7 +944,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -982,7 +982,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1045,7 +1045,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1128,7 +1128,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1215,7 +1215,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1282,7 +1282,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1353,7 +1353,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1416,7 +1416,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1477,7 +1477,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1542,7 +1542,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1609,7 +1609,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1636,7 +1636,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1668,7 +1668,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml index f19d6fa8a..837741f15 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana-dashboards.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-grafana-dashboards labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +63,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +114,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +124,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +144,9 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -156,24 +156,41 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -181,6 +198,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +248,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +258,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +278,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -295,7 +304,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +342,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +353,13 @@ data: "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -363,22 +373,222 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -428,17 +638,18 @@ data: "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -458,14 +669,37 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -473,7 +707,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +757,17 @@ data: } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -554,53 +787,22 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -619,7 +821,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +859,23 @@ data: "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -688,13 +889,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -758,8 +960,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1004,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2857,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -2724,7 +2926,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -2752,7 +2954,7 @@ data: "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2922,7 +3124,6 @@ data: "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml index 9e1387397..6e5283d7e 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml index 4cccd42d6..93901129c 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml index 77f84f7d6..300ee9c16 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml index 4a129cfcb..55fadd627 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.2.2" + image: "docker.io/grafana/grafana:10.2.3" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml index 961dadf6c..2d233cba3 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml index fec7de393..47b837640 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml index 90b4aa0ea..8782d5fd3 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml index 0162d8d98..a6dfaba4c 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml index 1d7b4f97e..1365f39d5 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml index 8290fe35b..110a007ea 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml index 90f8bb7a3..0f7ec69bf 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml index 50adeb0a2..3f4044188 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml index 9af4b63af..f170e8d51 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-agent-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml index 88ddaa22f..7de7acc02 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-collector-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml index 6c5731805..f82f5210d 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-deploy.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml index 8a60b3b82..54276fd3e 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-query-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml index 94e811070..bdb376447 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/jaeger/allinone-sa.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml index 082299304..474a23974 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml index 186dca956..a2c85201b 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml index bc490d0bd..59bce54b8 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm data: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml index 613728fe5..cf6e3312f 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 7e1c76b54330538577ef3beccda086bb3b739196dcb26b1152eb2f09fb7d098d + checksum/config: 8165705f27dbfec474b8d087fdbf44f78a1d908f4b83733a5d6160447b904eb9 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +45,7 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 - image: "otel/opentelemetry-collector-contrib:0.91.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml index 91fb58f2b..de389f535 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml index 9bce3e08c..de0c44cda 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/cm.yaml @@ -21,9 +21,9 @@ data: {} prometheus.yml: | global: - evaluation_interval: 1m - scrape_interval: 1m - scrape_timeout: 10s + evaluation_interval: 30s + scrape_interval: 5s + scrape_timeout: 3s rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml @@ -31,7 +31,7 @@ data: - /etc/config/alerts scrape_configs: - honor_labels: true - job_name: opentelemetry-community-demo + job_name: otel-collector kubernetes_sd_configs: - namespaces: own_namespace: true diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml index f4902715f..1a42200ae 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 2f3237a8a..41a800470 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example @@ -499,7 +499,7 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example @@ -562,7 +562,7 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example @@ -635,7 +635,7 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example @@ -716,7 +716,7 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example @@ -775,7 +775,7 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example @@ -836,7 +836,7 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example @@ -917,7 +917,7 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example @@ -944,7 +944,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -982,7 +982,7 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example @@ -1045,7 +1045,7 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example @@ -1128,7 +1128,7 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example @@ -1215,7 +1215,7 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example @@ -1282,7 +1282,7 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example @@ -1353,7 +1353,7 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example @@ -1416,7 +1416,7 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example @@ -1477,7 +1477,7 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example @@ -1542,7 +1542,7 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example @@ -1609,7 +1609,7 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example @@ -1636,7 +1636,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1668,7 +1668,7 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example @@ -1729,7 +1729,7 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 f19d6fa8a..837741f15 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 opentelemetry.io/name: example app.kubernetes.io/instance: example @@ -55,7 +55,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +63,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +114,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +124,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +144,9 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -156,24 +156,41 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -181,6 +198,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +248,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +258,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +278,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -295,7 +304,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +342,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +353,13 @@ data: "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -363,22 +373,222 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -428,17 +638,18 @@ data: "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -458,14 +669,37 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -473,7 +707,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +757,17 @@ data: } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -554,53 +787,22 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -619,7 +821,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +859,23 @@ data: "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -688,13 +889,14 @@ data: "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -758,8 +960,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1004,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2857,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -2724,7 +2926,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -2752,7 +2954,7 @@ data: "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2922,7 +3124,6 @@ data: "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" 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 9e1387397..6e5283d7e 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 4cccd42d6..93901129c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 77f84f7d6..300ee9c16 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: 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 4a129cfcb..55fadd627 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -42,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.2.2" + image: "docker.io/grafana/grafana:10.2.3" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false 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 961dadf6c..2d233cba3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 fec7de393..47b837640 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90b4aa0ea..8782d5fd3 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 0162d8d98..a6dfaba4c 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 1d7b4f97e..1365f39d5 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 8290fe35b..110a007ea 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 90f8bb7a3..0f7ec69bf 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.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 50adeb0a2..3f4044188 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-7.0.17 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.2.2" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success 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 9af4b63af..f170e8d51 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 88ddaa22f..7de7acc02 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 6c5731805..f82f5210d 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,7 +5,7 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 8a60b3b82..54276fd3e 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,7 +5,7 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" 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 94e811070..bdb376447 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,7 +5,7 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.72.1 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml index 1e8f3cea2..71d03c7a5 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml index 186dca956..a2c85201b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm roleRef: 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 210030d33..459d42e26 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" 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 2a9609bd1..4edc35dc7 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: a48d9dbdcf313acbe0a16523ec2a973452ed83acc84e5d3115866fabe10588aa + checksum/config: d2d1620fe68690754eb7ce44954d67a60fd4b16edc98b0eeb86902bdabcf9beb opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -46,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.91.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: 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 91eabaf83..9b428e759 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm component: standalone-collector 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 67ab0679c..544a0a761 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 @@ -6,10 +6,10 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm component: standalone-collector 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 91fb58f2b..de389f535 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 @@ -6,8 +6,8 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.77.0 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.91.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm 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 9bce3e08c..de0c44cda 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 @@ -21,9 +21,9 @@ data: {} prometheus.yml: | global: - evaluation_interval: 1m - scrape_interval: 1m - scrape_timeout: 10s + evaluation_interval: 30s + scrape_interval: 5s + scrape_timeout: 3s rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml @@ -31,7 +31,7 @@ data: - /etc/config/alerts scrape_configs: - honor_labels: true - job_name: opentelemetry-community-demo + job_name: otel-collector kubernetes_sd_configs: - namespaces: own_namespace: 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 f4902715f..1a42200ae 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.27.0 + helm.sh/chart: opentelemetry-demo-0.27.1 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 18c919bbc..2315dea41 100644 --- a/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json +++ b/charts/opentelemetry-demo/grafana-dashboards/demo-dashboard.json @@ -37,7 +37,7 @@ }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -45,6 +45,7 @@ "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -95,7 +96,7 @@ } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -105,7 +106,7 @@ "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -125,10 +126,9 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", - "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "exemplar": true, + "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "legendFormat": "quantile50", "range": true, "refId": "A" }, @@ -138,24 +138,41 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "exemplar": false, + "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, - "interval": "2m", - "legendFormat": "{{job}} ({{type}})", + "legendFormat": "quantile95", "range": true, "refId": "B" - } - ], - "title": "Python services (CPU%)", - "transformations": [ + }, { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile99", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "exemplar": false, + "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "hide": false, + "legendFormat": "quantile999", + "range": true, + "refId": "D" } ], + "title": "Latency for ${service}", "type": "timeseries" }, { @@ -163,6 +180,7 @@ "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -212,8 +230,7 @@ "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -223,7 +240,7 @@ "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -243,22 +260,14 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", - "legendFormat": "{{job}}", + "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "interval": "", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Python services (Memory)", - "transformations": [ - { - "id": "renameByRegex", - "options": { - "regex": "opentelemetry-demo/(.*)", - "renamePattern": "$1" - } - } - ], + "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -277,7 +286,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -315,7 +324,8 @@ "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -325,13 +335,13 @@ "x": 0, "y": 9 }, - "id": 4, + "id": 12, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": false + "showLegend": true }, "tooltip": { "mode": "single", @@ -345,22 +355,222 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", - "interval": "2m", - "legendFormat": "recommendations", + "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "legendFormat": "{{ span_name }}", "range": true, "refId": "A" } ], - "title": "Recommendations Rate", + "title": "Requests Rate for ${service} by span name", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 19, + "panels": [], + "title": "Application Logs", + "type": "row" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 4, + "x": 0, + "y": 18 + }, + "id": 20, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "table", + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"\n| stats count() by severityText", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Log entries by Severity", + "type": "table" + }, + { + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 18 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.1.2", + "targets": [ + { + "alias": "", + "bucketAggs": [ + { + "field": "time", + "id": "2", + "settings": { + "interval": "auto" + }, + "type": "date_histogram" + } + ], + "datasource": { + "type": "grafana-opensearch-datasource", + "uid": "P9744FCCEAAFBD98F" + }, + "format": "logs", + "hide": false, + "metrics": [ + { + "id": "1", + "type": "count" + } + ], + "query": "search source=otel\n| where serviceName=\"${service}\"", + "queryType": "PPL", + "refId": "A", + "timeField": "time" + } + ], + "title": "${service} Logs", + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 18, + "panels": [], + "title": "Application Metrics", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -410,17 +620,18 @@ "value": 80 } ] - } + }, + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 9 + "x": 0, + "y": 27 }, - "id": 10, + "id": 6, "options": { "legend": { "calcs": [], @@ -440,14 +651,37 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", - "interval": "", - "legendFormat": "{{ span_name }}", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "webstore-metrics" + }, + "editorMode": "code", + "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "hide": false, + "interval": "2m", + "legendFormat": "{{job}} ({{type}})", + "range": true, + "refId": "B" + } + ], + "title": "Python services (CPU%)", + "transformations": [ + { + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Error Rate for ${service} by span name", "type": "timeseries" }, { @@ -455,7 +689,6 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -506,17 +739,17 @@ } ] }, - "unit": "dtdurationms" + "unit": "bytes" }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 27 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [], @@ -536,53 +769,22 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "legendFormat": "quantile50", + "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "legendFormat": "{{job}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile95", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile99", - "range": true, - "refId": "C" - }, + } + ], + "title": "Python services (Memory)", + "transformations": [ { - "datasource": { - "type": "prometheus", - "uid": "webstore-metrics" - }, - "editorMode": "code", - "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", - "hide": false, - "legendFormat": "quantile999", - "range": true, - "refId": "D" + "id": "renameByRegex", + "options": { + "regex": "opentelemetry-demo/(.*)", + "renamePattern": "$1" + } } ], - "title": "Latency for ${service}", "type": "timeseries" }, { @@ -601,7 +803,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -639,24 +841,23 @@ "value": 80 } ] - }, - "unit": "reqps" + } }, "overrides": [] }, "gridPos": { "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 35 }, - "id": 12, + "id": 4, "options": { "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": false }, "tooltip": { "mode": "single", @@ -670,13 +871,14 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", - "legendFormat": "{{ span_name }}", + "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "interval": "2m", + "legendFormat": "recommendations", "range": true, "refId": "A" } ], - "title": "Requests Rate for ${service} by span name", + "title": "Recommendations Rate", "type": "timeseries" }, { @@ -740,8 +942,8 @@ "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -784,9 +986,9 @@ { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", diff --git a/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector-data-flow.json b/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector-data-flow.json index 9078088e9..3bdf75ae4 100644 --- a/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector-data-flow.json +++ b/charts/opentelemetry-demo/grafana-dashboards/opentelemetry-collector-data-flow.json @@ -1813,7 +1813,7 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "description": "otelcol prometheus exporter 9464 export rate versus prometheus scrape metrics", + "description": "otelcol prometheus exporter 8888 export rate versus prometheus scrape metrics", "fieldConfig": { "defaults": { "color": { @@ -1882,7 +1882,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel\"}[$__range])/(5*30)) ", + "expr": "(sum_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/ count_over_time(scrape_samples_scraped{job=\"otel-collector\"}[$__range])/(5*30)) ", "format": "time_series", "instant": false, "legendFormat": "__auto", @@ -1910,7 +1910,7 @@ "options": { "alias": "percent", "binary": { - "left": "{instance=\"otelcol:9464\", job=\"otel\"}", + "left": "{instance=\"otelcol:9464\", job=\"otel-collector\"}", "operator": "/", "reducer": "sum", "right": "(sum(rate(otelcol_exporter_sent_metric_points{exporter=\"prometheus\"}[1m0s])) )" @@ -2080,7 +2080,6 @@ "mode": "reduceRow", "reduce": { "include": [ - "{instance=\"otelcol:9464\", job=\"otel\"}", "{instance=\"otelcol:8888\", job=\"otel-collector\"}" ], "reducer": "sum" diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 665e9b628..bdefa53f5 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -122,7 +122,7 @@ components: # - demo.example.com # # Command to use in the container spec, in case you don't want to go with the default command from the image. # command: [] - # # Configuration to for this service; will create a ConfigMap, Volume, and Mount it into the container being spun up/. + # # Configuration to for this service; will create a ConfigMap, Volume, and Mount it into the container being created. # configuration: {} # # Kubernetes container health check options # livenessProbe: {} @@ -522,7 +522,7 @@ components: env: true imageOverride: repository: "postgres" - tag: "14" + tag: "16.1" replicas: 1 ports: - name: postgres @@ -573,7 +573,7 @@ components: env: true imageOverride: repository: "redis" - tag: "alpine" + tag: "7.2-alpine" replicas: 1 ports: - name: redis @@ -718,6 +718,10 @@ prometheus: extraFlags: - "enable-feature=exemplar-storage" - "enable-feature=otlp-write-receiver" + global: + scrape_interval: 5s + scrape_timeout: 3s + evaluation_interval: 30s persistentVolume: enabled: false service: @@ -729,7 +733,7 @@ prometheus: serverFiles: prometheus.yml: scrape_configs: - - job_name: 'opentelemetry-community-demo' + - job_name: 'otel-collector' honor_labels: true kubernetes_sd_configs: - role: pod