From 64185fd7ea95d32e4923037e5719280fdb2a3c16 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Fri, 9 Feb 2024 11:35:12 +0200 Subject: [PATCH] chore: rebase upstream (#63) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump collector version to 0.80.0 (#815) * [opentelemetry-collector] recombine cri multi-line logs (#818) * [demo] Bump OTel Collector chart version (#821) See: https://github.com/open-telemetry/opentelemetry-helm-charts/pull/817#discussion_r1242311088 Signed-off-by: Goutham * Feat/extra env from (#820) * feat(collector-chart): add extraEnvFrom support * chore(examples): adding examples * bump operator (#823) * bump collector (#830) * JAC: fix checksum config in statefulset template (#827) * Adds short usage instructions to UPGRADING.md (#826) * Adds short usage instructions to UPGRADING.md * Updated chart version and regenerated examples * Bump operator (#832) * Fix typo in README.md (#831) * Add new helm command to README.md, fix typos (#836) * Add new helm command to README.md, fix typos + Add link to logging exporter * bump operator chart version * Revert "bump operator chart version" This reverts commit 91430ff2a9aa0d6de6a2ec299a563a6b73d86562. * bump operator patch version * Add externalTrafficPolicy value for service type LoadBalancer (#838) Signed-off-by: Alban HURTAUD * [collector] Respect pipeline order when enabling kubernetesAttributes (#844) * fix pipeline order when enabling k8sattributes * bump collector and document breakage * kubernetesAttributes example * regenerate examples * Update charts/opentelemetry-collector/UPGRADING.md Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * [collector] Allow disabling service even for deployment and statefulset (#843) * Allow disabling all ports * temp * generate examples * Bump version * bump collector to 0.82.0 (#847) * charts/opentelemetry-collector: recommended CPU limit pushes just over threshold (#851) * charts/opentelemetry-collector: fix CPU limit While "256m" is a valid setting, the intention was likely to allow 4 pods to be scheduled on a single CPU, which we will currently overshoot by 24/1000, since there are only 1000 units in a CPU fraction. Adjust to "250m", which would allow exactly 4 pods to share a CPU. See e.g. https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Upgrade operator to v0.82.0 (#854) * Upgrade operator to v0.82.0 * ci: fix operator E2E tests * [collector] Allow disabling all ports (#842) * Allow disabling all ports * bump patch version instead * chore(demo): update chart dependencies (#856) * update chart dependencies Signed-off-by: Pierre Tessier * update chart dependencies Signed-off-by: Pierre Tessier * update chart dependencies Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * Bump collector version (#861) * Update clusterrole (#860) * mode: daemonset example indicates hostNetwork: true is required (#849) * add more extraction to preset (#867) * bump operator version to 0.83.0 (#874) * [collector] Update readme (#875) * Update readme with all presets * Add generic list reminder * [collector] Update readme and preset comments (#876) * Update readme and preset comments * Add links to docs from values.yaml * Add missed links * [collector] Make it possible to specify namespace when running Helm template (#871) * bump collector to 0.84.0 (#883) * [collector] limit prometheus rules to opentelemetrycollector application (#885) Signed-off-by: Andre Baptista Aguas * [demo] Use k8sattributesprocessor instead of env vars (#817) * [demo] Use k8sattributesprocessor instead of env vars Signed-off-by: Goutham * Add 0.24 to upgrading.md Signed-off-by: Goutham * Update charts/opentelemetry-demo/UPGRADING.md --------- Signed-off-by: Goutham Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Bump collector to 0.85.0 (#890) * [operator]: Update UPGRADING.md (#886) (#888) * Bump actions/checkout from 3 to 4 (#884) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [demo] - update for 1.5 release (#873) * update chart dependencies Signed-off-by: Pierre Tessier * update chart dependencies Signed-off-by: Pierre Tessier * use frontendProxy for all communication Signed-off-by: Pierre Tessier * update chart dependencies Signed-off-by: Pierre Tessier * demo 1.5 release Signed-off-by: Pierre Tessier * demo 1.5 release Signed-off-by: Pierre Tessier * demo 1.5 release Signed-off-by: Pierre Tessier * demo 1.5 release Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * (demo): update chart dependencies (#893) * update demo chart dependencies Signed-off-by: Pierre Tessier * update demo chart dependencies Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * [operator] bump operator to 0.84.0 (#894) * update environment variable reference (#898) * bump operator to 0.85.0 (#896) * Bump collector to 0.86.0 (#897) * update charts to use debug exporter (#892) * update charts to use debug exporter The logging exporter is being deprecated in favour of the debug exporter. This changes the charts to use that exporter instead. Note: this will remain in draft until v0.86.0 is released which will be the first release to include the debug exporter. Signed-off-by: Alex Boten * make generate-examples CHARTS=opentelemetry-collector Signed-off-by: Alex Boten * update charts Signed-off-by: Alex Boten * revert demo charts Signed-off-by: Alex Boten * bump version for collector/operator charts Signed-off-by: Alex Boten * patch bump Signed-off-by: Alex Boten --------- Signed-off-by: Alex Boten * update prometheus to use otlp write (#901) Signed-off-by: Pierre Tessier * [demo] Bump collector chart dep (#903) * Bump collector chart * bump version * Switch to tail mode for logsCollection preset (#904) * (demo): update grafana dashboards (#902) * update grafana dashboards Signed-off-by: Pierre Tessier * update grafana dashboards Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * [collector] re-add the logging exporter config (#907) * re-add the logging exporter config * Add warning in NOTES.txt * [collector] Remove deprecated fields (#908) * Remove deprecated fields * update resources warning * [collector] Add ability to enable GOMEMLIMIT (#900) * Add ability to enable GOMEMLIMIT * remove trailing spaces * Fix title * Update charts/opentelemetry-collector/UPGRADING.md Co-authored-by: Pablo Baeyens * Update charts/opentelemetry-collector/UPGRADING.md Co-authored-by: Pablo Baeyens * update warning * Cleanup merge * Apply suggestions from code review Co-authored-by: Jina Jain --------- Co-authored-by: Pablo Baeyens Co-authored-by: Jina Jain * fix GOMEMLIMIT wrong unit (#913) * [opentelemetry-operator] Add affinity, tolerations and nodeSelector to tests (#911) * Add affinity, tolerations and nodeSelector to tests * Change version from 0.40.0 to 0.39.2 * Generate release notes (#916) * bump collector version to 0.87.0 (#917) * fix prometheus endpoint (#920) Signed-off-by: Pierre Tessier * [operator] bump to 0.86.0 (#919) * (demo) fix jaeger spm and prometheus config (#922) * fix jaeger spm and prom config Signed-off-by: Pierre Tessier * fix jaeger spm and prom config Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * [otel-demo] Include namespace in NOTES.txt (#925) * Include namespace in NOTES.txt For full copy & paste, the port-forwarding instructions need to include the namespace. * Bump version && regenerate examples * [otel-demo] Fix exporter environment variable (#927) * bump operator version (#926) * Bump collector to 0.88.0 (#935) * [collector] Update prometheus alerts (#933) * upgrade to 0.88 include bridge (#938) * upgrade to 0.88 include bridge * facepalm * Fix testing action * version fix * update schema * add rbac for bridges * Rename * install prom CRDs for operator e2e tests * Fix prometheuscr test * [demo] add replicas support (#934) * add replicas support Signed-off-by: Pierre Tessier * note about replicas setting for postgres, kafka, and redis Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * [demo] update to demo 1.6 (#942) * update to demo 1.6 Signed-off-by: Pierre Tessier * update to demo 1.6 Signed-off-by: Pierre Tessier * update to demo 1.6 Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * Bump helm/chart-releaser-action from 1.5.0 to 1.6.0 (#944) Bumps [helm/chart-releaser-action](https://github.com/helm/chart-releaser-action) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/helm/chart-releaser-action/releases) - [Commits](https://github.com/helm/chart-releaser-action/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: helm/chart-releaser-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update clusterrole.yaml (#947) * Adding namespace scope to webhook config (#940) * add option to reuse previously auto-generated cert (#936) * add option to reuse previously auto-generated cert * bump chart version * autoGenerateCert as object with enabled, ifNotExists properties * value renamed, ca in secret, logic moved to _helper * fix default value * Update upgrade guidelines * update UPGRADING.md doc * remove unused file * Bump collector version to 0.89.0 (#955) * [CHORE] adding eBPF helm chart (#855) * [CHORE] adding eBPF helm chart Signed-off-by: Nicolas Takashi * Update .github/workflows/ebpf-test.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Update charts/opentelemetry-ebpf/Chart.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Update CONTRIBUTING.md Co-authored-by: Jared Tan * Update CONTRIBUTING.md Co-authored-by: Jared Tan * Update CONTRIBUTING.md Co-authored-by: Jared Tan * Update README.md Co-authored-by: Jared Tan * Update README.md Co-authored-by: Jared Tan * Update README.md Co-authored-by: Jared Tan * Update charts/opentelemetry-ebpf/CONTRIBUTING.md * Update charts/opentelemetry-ebpf/values.yaml * Update charts/opentelemetry-ebpf/values.yaml Co-authored-by: Dmitrii Anoshin --------- Signed-off-by: Nicolas Takashi Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Co-authored-by: Jared Tan Co-authored-by: Dmitrii Anoshin * [BUMP] Operator v0.89.0/kube-rbac-proxy v0.15.0 (#963) * [BUMP] Operator v0.89.0/kube-rbac-proxy v0.15.0 * fix * Add JaredTan95 to approvers list (#965) * [collector] fix clusterrolebinding binding wrong namespace (#960) * fix clusterrolebinding binding wrong namespace * remove examples --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * [collector] support add additionalLabels for otel col resources (#968) * support add additionalLabels for all resources * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Jina Jain * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Jina Jain Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Bump collector to 0.90.0 (#972) * Add k8s infra monitorig demo example (#967) * Add k8s infra monitorig demo example Signed-off-by: ChrsMark * Upgrade chart version Signed-off-by: ChrsMark * Bump patch version instead of minor Signed-off-by: ChrsMark --------- Signed-off-by: ChrsMark Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * Bump collector to 0.90.1 (#975) * Make the service port for the webhook configurable (#976) * make the service port for the webhook configurable * service port * version bump * version bump the examples * enable useGOMEMLIMIT by default (#977) * Bump operator to 0.90.0 (#979) * Bump operator to 0.90.0 * Fix E2E test runner in CI * Bump actions/stale from 8 to 9 (#978) Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [opentelemetry-collector] update collector to v0.91.0 (#981) * Set Port for the webhook (#982) * Set webhook port correctly * whoops * [opentelemetry-operator] remove default limits for cpu and memory (#970) * [opentelemetry-operator] remove default limits for cpu and memory * adjusted schema and ran make commands * Updated documentation Signed-off-by: Pieter van der Giessen --------- Signed-off-by: Pieter van der Giessen * [demo] update to demo release 1.7 (#983) * update to demo 1.7 Signed-off-by: Pierre Tessier * update to demo 1.7 Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier * polish otel operator WebhookCert logical (#986) * [operator] fix readme (#987) * fix readme * bump chart version * bump collector to 0.92.0 (#991) * [operator] Bump operator version to 0.91.0 (#989) * Bump operator version * update crds * bump collector version (#993) * Use appVersion by default (#994) * fix grafana dashboards (#1000) Signed-off-by: Pierre Tessier * [collector] Enable `retry_on_failure` for filelog receiver created by logsCollection preset (#999) * enable filelog with retry_on_failure as default config Signed-off-by: Husni Alhamdani * enable filelog with retry_on_failure as default config Signed-off-by: Husni Alhamdani --------- Signed-off-by: Husni Alhamdani Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> * demo: add missing namespace on grafana dashboard (#1002) * demo: add missing namespace on grafana dashboard fixes: #1001 Signed-off-by: hsinhoyeh * add rendered yamls Signed-off-by: hsinhoyeh --------- Signed-off-by: hsinhoyeh * [operator] Bump operator version to 0.92.1 (#998) * Bump operator version to 0.92.0 * update cluster role * generate examples * Bump to 0.92.1 * Revert "update cluster role" This reverts commit 7f4356954601eeb0ee2a3596e95df4aeab82183e. * regenerate * [collector] Enable HPA when deploy mode is statefulset (#1011) * [collector] Enable HPA when deploy mode is statefulset Signed-off-by: Husni Alhamdani * [collector] Enable HPA when deploy mode is statefulset Signed-off-by: Husni Alhamdani * Add test scenario for HPA of deployment and statefulset Signed-off-by: Husni Alhamdani --------- Signed-off-by: Husni Alhamdani * [demo] add mountedConfigMaps support (#1007) * add mountedConfigMaps support Signed-off-by: Pierre Tessier * add mountedConfigMaps support Signed-off-by: Pierre Tessier * add mountedConfigMaps support Signed-off-by: Pierre Tessier * add mountedConfigMaps support Signed-off-by: Pierre Tessier --------- Signed-off-by: Pierre Tessier Co-authored-by: Jared Tan * explicitly set healthcheck extension endpoint (#1012) * [opentelemetry-collector] Fix calculation for gomemlimit (#1015) * set gomemlimit correctly * minor fixes * update chart version * update var * remove unittest * remove unittest * [collector] bump appVersion to 0.93.0 (#1018) * Allow for secure deployments by default. (#1019) * Allow for secure deployments by default. * Restored data added during testing to original state. * Updated demo chart README.md. * Added additional comments to values.yaml to illustrate how the new feature can be used. * Executed "make generate-examples" and pushing results. * [opentelemetry-collector] fix HPA kind for StatefulSet mode (#1025) * add helper to set kind in HPA * update autoscaling comment in values * bump version * [operator] Bump operator to 0.93.0 (#1027) * bump operator to 0.93.0 * Update collector version --------- Signed-off-by: Goutham Signed-off-by: Alban HURTAUD Signed-off-by: Pierre Tessier Signed-off-by: Andre Baptista Aguas Signed-off-by: dependabot[bot] Signed-off-by: Alex Boten Signed-off-by: Nicolas Takashi Signed-off-by: ChrsMark Signed-off-by: Pieter van der Giessen Signed-off-by: Husni Alhamdani Signed-off-by: hsinhoyeh Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Co-authored-by: Goutham Veeramachaneni Co-authored-by: PaoloGallina Co-authored-by: Jorge Andreu Calatayud <11544239+jorgeancal@users.noreply.github.com> Co-authored-by: Peter Kern Co-authored-by: Jan Katins Co-authored-by: Marcin Ziółkowski <62351083+MA3CIN@users.noreply.github.com> Co-authored-by: Alban Hurtaud Co-authored-by: Jakob Demler Co-authored-by: Kevin Burke Co-authored-by: Mikołaj Świątek Co-authored-by: Pierre Tessier Co-authored-by: Mitch Co-authored-by: Krisztian Fekete <103492698+krisztianfekete@users.noreply.github.com> Co-authored-by: André Águas Co-authored-by: Goutham Veeramachaneni Co-authored-by: galen-reltio <104534108+galen-reltio@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Boten Co-authored-by: Pablo Baeyens Co-authored-by: Jina Jain Co-authored-by: Jared Tan Co-authored-by: Julia Jia Co-authored-by: Marco Aurelio Caldas Miranda <17923899+macmiranda@users.noreply.github.com> Co-authored-by: Cedric Ziel Co-authored-by: Alex Co-authored-by: Jacob Aronoff Co-authored-by: Abhishek Co-authored-by: Grétar Hauksson <31700328+b3ndill@users.noreply.github.com> Co-authored-by: Tomasz Prus Co-authored-by: Nicolas Takashi Co-authored-by: Dmitrii Anoshin Co-authored-by: Chris Mark Co-authored-by: Pieter <110168856+Pionerd@users.noreply.github.com> Co-authored-by: Husni Alhamdani Co-authored-by: hsinhoyeh Co-authored-by: Louis Parkin <11991882+LouisParkin@users.noreply.github.com> Co-authored-by: Alexander Lindeskär --- .github/workflows/release.yaml | 1 + charts/opentelemetry-collector/.helmignore | 4 + charts/opentelemetry-collector/CHANGELOG.md | 6 + charts/opentelemetry-collector/Chart.yaml | 4 +- .../ci/hpa-deployment-values.yaml | 9 + .../ci/hpa-statefulset-values.yaml | 9 + .../rendered/clusterrole.yaml | 4 +- .../rendered/clusterrolebinding.yaml | 4 +- .../rendered/configmap-agent.yaml | 7 +- .../rendered/configmap.yaml | 7 +- .../rendered/daemonset.yaml | 10 +- .../rendered/deployment.yaml | 10 +- .../rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/configmap-agent.yaml | 7 +- .../rendered/daemonset.yaml | 8 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/configmap-agent.yaml | 7 +- .../rendered/daemonset.yaml | 8 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/configmap-agent.yaml | 7 +- .../daemonset-only/rendered/daemonset.yaml | 8 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/clusterrole.yaml | 4 +- .../rendered/clusterrolebinding.yaml | 4 +- .../rendered/configmap-agent.yaml | 9 +- .../daemonset-presets/rendered/daemonset.yaml | 8 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/clusterrole-targetallocator.yaml | 4 +- .../clusterrolebinding-targetallocator.yaml | 4 +- .../rendered/configmap-agent.yaml | 7 +- .../rendered/configmap-targetallocator.yaml | 4 +- .../rendered/daemonset.yaml | 8 +- .../rendered/deployment-targetallocator.yaml | 6 +- .../rendered/service-targetallocator.yaml | 4 +- .../serviceaccount-targetallocator.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/configmap-agent.yaml | 9 +- .../daemonset-windows/rendered/daemonset.yaml | 8 +- .../rendered/serviceaccount.yaml | 4 +- .../deployment-only/rendered/configmap.yaml | 7 +- .../deployment-only/rendered/deployment.yaml | 10 +- .../deployment-only/rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/configmap.yaml | 7 +- .../rendered/deployment.yaml | 8 +- .../rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/deployment.yaml | 8 +- .../rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../gke-autopilot/rendered/clusterrole.yaml | 4 +- .../rendered/clusterrolebinding.yaml | 4 +- .../rendered/configmap-agent.yaml | 9 +- .../gke-autopilot/rendered/daemonset.yaml | 10 +- .../gke-autopilot/rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/clusterrole.yaml | 4 +- .../rendered/clusterrolebinding.yaml | 4 +- .../rendered/configmap.yaml | 7 +- .../rendered/deployment.yaml | 8 +- .../rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../loadbalancing/rendered/configmap.yaml | 7 +- .../loadbalancing/rendered/deployment.yaml | 8 +- .../loadbalancing/rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../examples/metadata/rendered/configmap.yaml | 7 +- .../metadata/rendered/deployment.yaml | 8 +- .../examples/metadata/rendered/service.yaml | 4 +- .../metadata/rendered/serviceaccount.yaml | 4 +- .../rendered/clusterrole-targetallocator.yaml | 4 +- .../rendered/clusterrole.yaml | 4 +- .../clusterrolebinding-targetallocator.yaml | 4 +- .../rendered/clusterrolebinding.yaml | 4 +- .../mysql/opentelemetrycollector-sidecar.yaml | 2 +- .../rendered/opentelemetrycollector.yaml | 11 +- .../serviceaccount-targetallocator.yaml | 4 +- .../rendered/configmap-statefulset.yaml | 7 +- .../statefulset-only/rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/statefulset.yaml | 10 +- .../using-GOMEMLIMIT/rendered/configmap.yaml | 7 +- .../using-GOMEMLIMIT/rendered/deployment.yaml | 10 +- .../using-GOMEMLIMIT/rendered/service.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../templates/_config.tpl | 2 + .../templates/_helpers.tpl | 78 +- .../templates/_pod.tpl | 2 +- .../templates/hpa.yaml | 4 +- .../values.schema.json | 18 +- charts/opentelemetry-collector/values.yaml | 5 +- charts/opentelemetry-demo/Chart.lock | 12 +- charts/opentelemetry-demo/Chart.yaml | 12 +- charts/opentelemetry-demo/README.md | 81 ++- charts/opentelemetry-demo/UPGRADING.md | 27 +- .../rendered/component.yaml | 220 +++--- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 220 +++--- .../rendered/grafana-dashboards.yaml | 440 ++++++++--- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 5 +- .../rendered/grafana/deployment.yaml | 13 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 5 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 4 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 4 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../opentelemetry-collector/clusterrole.yaml | 5 +- .../clusterrolebinding.yaml | 5 +- .../configmap-agent.yaml | 8 +- .../opentelemetry-collector/daemonset.yaml | 11 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 23 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 220 +++--- .../rendered/grafana-dashboards.yaml | 440 ++++++++--- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 5 +- .../rendered/grafana/deployment.yaml | 13 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 5 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 4 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 4 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../opentelemetry-collector/clusterrole.yaml | 5 +- .../clusterrolebinding.yaml | 5 +- .../opentelemetry-collector/configmap.yaml | 8 +- .../opentelemetry-collector/deployment.yaml | 11 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 23 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../examples/default/rendered/component.yaml | 220 +++--- .../default/rendered/grafana-dashboards.yaml | 440 ++++++++--- .../default/rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../default/rendered/grafana/configmap.yaml | 5 +- .../default/rendered/grafana/deployment.yaml | 13 +- .../default/rendered/grafana/role.yaml | 4 +- .../default/rendered/grafana/rolebinding.yaml | 4 +- .../default/rendered/grafana/secret.yaml | 5 +- .../default/rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../default/rendered/grafana/tests/test.yaml | 4 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 4 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../default/rendered/jaeger/allinone-sa.yaml | 2 +- .../opentelemetry-collector/clusterrole.yaml | 5 +- .../clusterrolebinding.yaml | 5 +- .../opentelemetry-collector/configmap.yaml | 8 +- .../opentelemetry-collector/deployment.yaml | 11 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../default/rendered/prometheus/cm.yaml | 23 +- .../default/rendered/prometheus/deploy.yaml | 10 +- .../default/rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../default/rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 220 +++--- .../rendered/grafana-dashboards.yaml | 440 ++++++++--- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 5 +- .../rendered/grafana/deployment.yaml | 13 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 5 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 4 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 4 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../opentelemetry-collector/clusterrole.yaml | 5 +- .../clusterrolebinding.yaml | 5 +- .../configmap-agent.yaml | 8 +- .../opentelemetry-collector/daemonset.yaml | 11 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 23 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../rendered/component.yaml | 224 +++--- .../rendered/grafana-dashboards.yaml | 440 ++++++++--- .../rendered/grafana/clusterrole.yaml | 4 +- .../rendered/grafana/clusterrolebinding.yaml | 4 +- .../rendered/grafana/configmap.yaml | 5 +- .../rendered/grafana/deployment.yaml | 13 +- .../rendered/grafana/role.yaml | 4 +- .../rendered/grafana/rolebinding.yaml | 4 +- .../rendered/grafana/secret.yaml | 5 +- .../rendered/grafana/service.yaml | 4 +- .../rendered/grafana/serviceaccount.yaml | 4 +- .../grafana/tests/test-configmap.yaml | 4 +- .../grafana/tests/test-serviceaccount.yaml | 4 +- .../rendered/grafana/tests/test.yaml | 4 +- .../rendered/jaeger/allinone-agent-svc.yaml | 2 +- .../jaeger/allinone-collector-svc.yaml | 2 +- .../rendered/jaeger/allinone-deploy.yaml | 4 +- .../rendered/jaeger/allinone-query-svc.yaml | 2 +- .../rendered/jaeger/allinone-sa.yaml | 2 +- .../opentelemetry-collector/clusterrole.yaml | 5 +- .../clusterrolebinding.yaml | 5 +- .../opentelemetry-collector/configmap.yaml | 8 +- .../opentelemetry-collector/deployment.yaml | 11 +- .../opentelemetry-collector/ingress.yaml | 5 +- .../opentelemetry-collector/service.yaml | 5 +- .../serviceaccount.yaml | 4 +- .../rendered/prometheus/clusterrole.yaml | 4 +- .../prometheus/clusterrolebinding.yaml | 4 +- .../rendered/prometheus/cm.yaml | 23 +- .../rendered/prometheus/deploy.yaml | 10 +- .../rendered/prometheus/service.yaml | 4 +- .../rendered/prometheus/serviceaccount.yaml | 4 +- .../rendered/serviceaccount.yaml | 4 +- .../grafana-dashboards/demo-dashboard.json | 428 ++++++++--- .../opentelemetry-collector-data-flow.json | 7 +- .../opentelemetry-demo/templates/_objects.tpl | 39 +- .../templates/grafana-dashboards.yaml | 1 + charts/opentelemetry-demo/values.schema.json | 48 +- charts/opentelemetry-demo/values.yaml | 46 +- charts/opentelemetry-operator/Chart.yaml | 4 +- charts/opentelemetry-operator/README.md | 6 +- .../crd-opentelemetry.io_opampbridges.yaml | 175 ++++- .../crds/crd-opentelemetrycollector.yaml | 682 +++++++++++++++--- .../operator-webhook-with-cert-manager.yaml | 15 +- .../default/rendered/certmanager.yaml | 8 +- .../default/rendered/clusterrole.yaml | 12 +- .../default/rendered/clusterrolebinding.yaml | 8 +- .../examples/default/rendered/deployment.yaml | 8 +- .../examples/default/rendered/role.yaml | 4 +- .../default/rendered/rolebinding.yaml | 4 +- .../examples/default/rendered/service.yaml | 8 +- .../default/rendered/serviceaccount.yaml | 4 +- .../tests/test-certmanager-connection.yaml | 4 +- .../tests/test-service-connection.yaml | 8 +- .../templates/_helpers.tpl | 2 + .../operator-webhook-with-cert-manager.yaml | 7 + .../admission-webhooks/operator-webhook.yaml | 7 + .../templates/deployment.yaml | 2 +- .../opentelemetry-operator/values.schema.json | 26 +- charts/opentelemetry-operator/values.yaml | 4 +- 284 files changed, 4474 insertions(+), 2161 deletions(-) create mode 100644 charts/opentelemetry-collector/ci/hpa-deployment-values.yaml create mode 100644 charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 222157f04..870357eb0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,3 +33,4 @@ jobs: run: | cd charts/opentelemetry-collector jfrog rt upload --access-token ${{ secrets.ARTIFACTORY_NONUSER_ACCESS_TOKEN }} "${{ env.CHART_NAME }}-*.tgz" coralogix-charts --url ${{ env.ARTIFACTORY_URL }} + diff --git a/charts/opentelemetry-collector/.helmignore b/charts/opentelemetry-collector/.helmignore index 0e8a0eb36..7e03f4bc5 100644 --- a/charts/opentelemetry-collector/.helmignore +++ b/charts/opentelemetry-collector/.helmignore @@ -21,3 +21,7 @@ .idea/ *.tmproj .vscode/ + +# Ignore unittest +tests/ +*/__snapshot__/* diff --git a/charts/opentelemetry-collector/CHANGELOG.md b/charts/opentelemetry-collector/CHANGELOG.md index 1b7272167..8a9d6b547 100644 --- a/charts/opentelemetry-collector/CHANGELOG.md +++ b/charts/opentelemetry-collector/CHANGELOG.md @@ -2,6 +2,12 @@ ## OpenTelemetry Collector +### v0.80.0 / 2024-02-09 +- [CHORE] Pull upstream changes +- [CHORE] Bump Collector to 0.93.0 +- [Fix] Go memory limit +- [Feat] Log Collector retry on failure enabled. + ### v0.79.3 / 2024-02-05 - [FIX] Fix Target Allocator endpointslices issue diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 9c5607960..b1dddd193 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.79.4 +version: 0.80.0 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ @@ -13,4 +13,4 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png maintainers: - name: povilasv - name: matej-g -appVersion: 0.92.0 +appVersion: 0.93.0 diff --git a/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml new file mode 100644 index 000000000..a53a0f560 --- /dev/null +++ b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml @@ -0,0 +1,9 @@ +mode: deployment + +autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + behavior: {} + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 diff --git a/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml new file mode 100644 index 000000000..fa1244569 --- /dev/null +++ b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml @@ -0,0 +1,9 @@ +mode: statefulset + +autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + behavior: {} + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrole.yaml index 558f1035a..eb7712670 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrolebinding.yaml index 6d35e2b3f..3bc0521b5 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml index a9f84193f..885fce287 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -22,7 +22,8 @@ data: tls: insecure: true extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml index 9077e9332..c822b1312 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 k8s_observer: auth_type: serviceAccount observe_pods: true diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml index d35e53197..374530789 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: f12182ebbd36987032adcd72742d11d7b8c854c787c1630543c47febb23315ac + checksum/config: 8c154b28d236ff770885f610b4f54aa2f61d566fe06ed37acaac094ea69f96c7 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -82,7 +82,7 @@ spec: apiVersion: v1 fieldPath: status.hostIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml index f067609c0..9e7f89adf 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: eb5dc08c9d23a9400daa08e674e1a6479ffcb2a10d8b23800a12522b0de84382 + checksum/config: 9943f41243e67925857f94cdffabed51a1881f88dd40c904e341ceba28353a16 labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -73,7 +73,7 @@ spec: apiVersion: v1 fieldPath: status.podIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml index 831d1fa55..f16e23db7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index d2363c54e..0c715d6ce 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 79281680d02aef44b275bfb5efcdb75f4a75d0c744bcf5f3559eb835726d1411 + checksum/config: a692d5940e882f8d8efab130e54fbd831c6a83b1ffb04e2edac59ecc668e9201 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml index 17864cc6b..1834deca0 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml index f649c46db..ca37bc460 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 2ab23f97fe7b5941c36772ce9725ed51c0fdb1ad6b7e3c85a17d4cd38cd7f832 + checksum/config: 9e2c733798733e804f0f3840abda595a272a852f3ed54c14212a18bbcbe14d10 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml index 17864cc6b..1834deca0 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index e6d5ec4b9..984e90fb7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 2ab23f97fe7b5941c36772ce9725ed51c0fdb1ad6b7e3c85a17d4cd38cd7f832 + checksum/config: 9e2c733798733e804f0f3840abda595a272a852f3ed54c14212a18bbcbe14d10 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrole.yaml index 13fe03fd1..99b1e6ee0 100644 --- a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrolebinding.yaml index 6d35e2b3f..3bc0521b5 100644 --- a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/configmap-agent.yaml index 974c7f45f..686f79155 100644 --- a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -27,7 +27,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 k8s_observer: auth_type: serviceAccount node: ${env:K8S_NODE_NAME} @@ -133,6 +134,8 @@ data: [0-9]{2}:[0-9]{2}:[0-9]{2})" source_identifier: attributes["log.file.path"] type: recombine + retry_on_failure: + enabled: true start_at: beginning jaeger: protocols: diff --git a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/daemonset.yaml index 8ddcb7116..d7638fadc 100644 --- a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: ca7d27fc62a6bca23bea3dd857cbc08f03c4712f0aded20dfa872d83a583b7b7 + checksum/config: e54940bee20c2454486f379c3e75313767a7bb39201af8cddaf5a5ef18a0b335 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-presets/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-presets/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrole-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrole-targetallocator.yaml index f7905e003..535f6ffe1 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrole-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrole-targetallocator.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrolebinding-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrolebinding-targetallocator.yaml index a8b75f52e..2ec47619d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrolebinding-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/clusterrolebinding-targetallocator.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-agent.yaml index c866ad042..045a18c45 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml index c2acf5b89..442e97cc5 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-targetallocator namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector-target-allocator app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: targetallocator.yaml: | diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/daemonset.yaml index f00d0ce64..1d1dbdc83 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 2a5c586fbec3798d5519b1b11ff2ed4c07af18fabc8dd4fee7e22a8937628c1e + checksum/config: f109da63548089cd4cdbc8675b85a8d41adccb8b31d9033ce790a47cc8c82507 labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml index acdefe68a..7cca5c210 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-targetallocator namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: adf75f3e8866554327b08dad54334069e3918d6025ed4cd3125f28061cd6787b + checksum/config: 332ec33c23cd2219a6fbcb268b4cca783a4638709bb9df6a254383ed28632de4 labels: app.kubernetes.io/name: opentelemetry-collector-target-allocator diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/service-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/service-targetallocator.yaml index aada7e65f..339b57cb2 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/service-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/service-targetallocator.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-targetallocator namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector-target-allocator app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: target-allocator spec: diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount-targetallocator.yaml index b4871882a..d91498532 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount-targetallocator.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector-target-allocator app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/configmap-agent.yaml index 9a54b7db0..dcf0da21b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -20,7 +20,8 @@ data: extensions: file_storage: directory: /var/lib/otelcol - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: @@ -112,6 +113,8 @@ data: - from: attributes.log to: body type: move + retry_on_failure: + enabled: true start_at: beginning storage: file_storage hostmetrics: diff --git a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/daemonset.yaml index 2a13713ae..bcf317ede 100644 --- a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: f1f34ee8ea5188e0105201e4cc60a6a6b0380b1e9f2e11e693126ad88c7763eb + checksum/config: f24aeb5827142948ee74268fd89fcd9e1e5e964d3ce3ed9069bd4e66dcdfb3be labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=C:\\conf\relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/daemonset-windows/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-windows/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index f75d9e944..0be9ca455 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index d52d6e4cd..0a8f8664f 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: e4cff928f9bfdb6516d2a7827e5e4df3222ceb014787be630dbc2acde9f78a84 + checksum/config: 5ff5fec2861c43567b36e19c81457c202245b56c82e7fcd442e76e5e2a06c1dc labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -73,7 +73,7 @@ spec: apiVersion: v1 fieldPath: status.podIP - name: GOMEMLIMIT - value: 3276MiB + value: "3276MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml index d5c3d0af8..98c4d5a0a 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml index 16560823d..f3e668ffe 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 80d6f0012d4dfc1238311a5999a0fe1736e0a926b21eb877bbdbc09c3d169e22 + checksum/config: 53da0e3c13d88832e551b80c5e4058ab64e37b0b6a27d08a06a3f09c105a9f15 labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml index 50b4d35b9..3b3186641 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml index d3bb8d62f..a23e11093 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -44,7 +44,7 @@ spec: - --config=/conf/config.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -73,7 +73,7 @@ spec: apiVersion: v1 fieldPath: status.podIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrole.yaml index 558f1035a..eb7712670 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrolebinding.yaml index 6d35e2b3f..3bc0521b5 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/configmap-agent.yaml index e7f55ebbc..aaff963f9 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/configmap-agent.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -22,7 +22,8 @@ data: tls: insecure: true extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: @@ -114,6 +115,8 @@ data: - from: attributes.log to: body type: move + retry_on_failure: + enabled: true start_at: beginning jaeger: protocols: diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/daemonset.yaml index 1e859aa41..038d6e7d8 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/daemonset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: b05dbe95fc7b5e82189faae71ac4ac048980557b31a5c18b21974298135e34d1 + checksum/config: ae3864b3c199f8b255298650d57914a7ed88eb990f0e3f79c52100664473a66c labels: app.kubernetes.io/name: opentelemetry-collector @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -76,7 +76,7 @@ spec: apiVersion: v1 fieldPath: status.hostIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/service.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/service.yaml index e0f953556..a085864a7 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: agent-collector diff --git a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/gke-autopilot/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/gke-autopilot/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 13fe03fd1..99b1e6ee0 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 6d35e2b3f..3bc0521b5 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index b49e59715..4714a203f 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} k8sattributes: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index 87c0560a2..abf279152 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 41afb6e4aed3359b3236bd1340cf01cc88d4eab48a35511129627ba4393c9cfe + checksum/config: aa9022fb42afdf7c7f80e3cc673957c36da72fb691a91aff81eb0b50bb7c7ae6 labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/loadbalancing/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/loadbalancing/rendered/configmap.yaml index 27ce1d72e..a7ffc6f2f 100644 --- a/charts/opentelemetry-collector/examples/loadbalancing/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/loadbalancing/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -27,7 +27,8 @@ data: routing_key: traceID logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/loadbalancing/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/loadbalancing/rendered/deployment.yaml index 659b9737d..b2d50b966 100644 --- a/charts/opentelemetry-collector/examples/loadbalancing/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/loadbalancing/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: c763b2262da4a0668e2d380a7abd61f3bebff893f3e6bc2b8f8980d3b42ccf05 + checksum/config: facaed3515b7edfe6920e9f89f7edafecb1837d5eb88a855551c08869c615465 labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/loadbalancing/rendered/service.yaml b/charts/opentelemetry-collector/examples/loadbalancing/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/loadbalancing/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/loadbalancing/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/loadbalancing/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/loadbalancing/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/loadbalancing/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/loadbalancing/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/metadata/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/metadata/rendered/configmap.yaml index fadb0226a..762bf4f42 100644 --- a/charts/opentelemetry-collector/examples/metadata/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/metadata/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/metadata/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/metadata/rendered/deployment.yaml index 7ba30e3df..0d75fa174 100644 --- a/charts/opentelemetry-collector/examples/metadata/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/metadata/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: db668f25bea8520cf730e67c1289f5ac428c9be5f62da4fbb5cf1e570bdfa23f + checksum/config: 691edffb762af68312bfcec3f7e65d8e9e35b15826c865bfe6fd476c9f006fb6 labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/metadata/rendered/service.yaml b/charts/opentelemetry-collector/examples/metadata/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/metadata/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/metadata/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/metadata/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/metadata/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/metadata/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/metadata/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole-targetallocator.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole-targetallocator.yaml index f7905e003..535f6ffe1 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole-targetallocator.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole.yaml index 13fe03fd1..99b1e6ee0 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrole.yaml @@ -5,10 +5,10 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm rules: diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding-targetallocator.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding-targetallocator.yaml index 736da5a2a..edce939d9 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding-targetallocator.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding.yaml index e8e2b8931..d0ab8d0b5 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/clusterrolebinding.yaml @@ -5,10 +5,10 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm roleRef: diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/integrations/mysql/opentelemetrycollector-sidecar.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/integrations/mysql/opentelemetrycollector-sidecar.yaml index 50b8e0852..71acaf8b4 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/integrations/mysql/opentelemetrycollector-sidecar.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/integrations/mysql/opentelemetrycollector-sidecar.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-mysql-logs-sidecar spec: mode: sidecar - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" volumeMounts: - mountPath: /var/lib/mysql name: data diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/opentelemetrycollector.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/opentelemetrycollector.yaml index 0fb32154d..89c291331 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/opentelemetrycollector.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/opentelemetrycollector.yaml @@ -5,10 +5,10 @@ kind: OpenTelemetryCollector metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -23,7 +23,7 @@ spec: podSecurityContext: runAsUser: 0 runAsGroup: 0 - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact @@ -92,7 +92,8 @@ spec: extensions: file_storage: directory: /var/lib/otelcol - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 k8s_observer: auth_type: serviceAccount node: ${env:K8S_NODE_NAME} @@ -187,6 +188,8 @@ spec: - from: attributes.log to: body type: move + retry_on_failure: + enabled: true start_at: beginning storage: file_storage hostmetrics: diff --git a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/serviceaccount-targetallocator.yaml b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/serviceaccount-targetallocator.yaml index 8fda4212a..2927d17c3 100644 --- a/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/serviceaccount-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/opentelemetrycollector-crd/rendered/serviceaccount-targetallocator.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: default-targetallocator labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector-target-allocator app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml index 8a9b8d4b4..4f9b41522 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index a35bfef11..cdcd45dde 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: statefulset-collector diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 8dfdf0527..a4b3adbf3 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: 6d7b9c09af9c6f730e3e757fbc0146c12cb94436ac995aba63368e0a7c9f63f0 + checksum/config: f7452a46ea674cd6334bff71bc8de1d10116837d343c848c5a0cd7200580b987 labels: app.kubernetes.io/name: opentelemetry-collector @@ -45,7 +45,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -74,7 +74,7 @@ spec: apiVersion: v1 fieldPath: status.podIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml index f75d9e944..0be9ca455 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm data: @@ -18,7 +18,8 @@ data: debug: {} logging: {} extensions: - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 processors: batch: {} memory_limiter: diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index 0db762ac4..d355c7ae8 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm spec: @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: e4cff928f9bfdb6516d2a7827e5e4df3222ceb014787be630dbc2acde9f78a84 + checksum/config: 5ff5fec2861c43567b36e19c81457c202245b56c82e7fcd442e76e5e2a06c1dc labels: app.kubernetes.io/name: opentelemetry-collector @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.92.0" + image: "otel/opentelemetry-collector-contrib:0.93.0" imagePullPolicy: IfNotPresent ports: @@ -73,7 +73,7 @@ spec: apiVersion: v1 fieldPath: status.podIP - name: GOMEMLIMIT - value: 156MiB + value: "152MiB" livenessProbe: httpGet: path: / diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml index 56055cc94..be911d1f0 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm component: standalone-collector diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index a23cdcad5..6f3488a70 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.79.4 + helm.sh/chart: opentelemetry-collector-0.80.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.92.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl index 1a7d3be09..2c484727e 100644 --- a/charts/opentelemetry-collector/templates/_config.tpl +++ b/charts/opentelemetry-collector/templates/_config.tpl @@ -283,6 +283,8 @@ receivers: {{- end }} {{- end }} start_at: beginning + retry_on_failure: + enabled: true {{- if .Values.presets.logsCollection.storeCheckpoints}} storage: file_storage {{- end }} diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl index 0e8ccb3e6..4a94a91ce 100644 --- a/charts/opentelemetry-collector/templates/_helpers.tpl +++ b/charts/opentelemetry-collector/templates/_helpers.tpl @@ -203,35 +203,53 @@ Allow the release namespace to be overridden {{- end -}} {{/* -Convert memory value to numeric value in MiB to be used by otel memory_limiter processor. -*/}} -{{- define "opentelemetry-collector.convertMemToMib" -}} -{{- $mem := lower . -}} -{{- if hasSuffix "e" $mem -}} -{{- trimSuffix "e" $mem | atoi | mul 1000 | mul 1000 | mul 1000 | mul 1000 -}} -{{- else if hasSuffix "ei" $mem -}} -{{- trimSuffix "ei" $mem | atoi | mul 1024 | mul 1024 | mul 1024 | mul 1024 -}} -{{- else if hasSuffix "p" $mem -}} -{{- trimSuffix "p" $mem | atoi | mul 1000 | mul 1000 | mul 1000 -}} -{{- else if hasSuffix "pi" $mem -}} -{{- trimSuffix "pi" $mem | atoi | mul 1024 | mul 1024 | mul 1024 -}} -{{- else if hasSuffix "t" $mem -}} -{{- trimSuffix "t" $mem | atoi | mul 1000 | mul 1000 -}} -{{- else if hasSuffix "ti" $mem -}} -{{- trimSuffix "ti" $mem | atoi | mul 1024 | mul 1024 -}} -{{- else if hasSuffix "g" $mem -}} -{{- trimSuffix "g" $mem | atoi | mul 1000 -}} -{{- else if hasSuffix "gi" $mem -}} -{{- trimSuffix "gi" $mem | atoi | mul 1024 -}} -{{- else if hasSuffix "m" $mem -}} -{{- div (trimSuffix "m" $mem | atoi | mul 1000) 1024 -}} -{{- else if hasSuffix "mi" $mem -}} -{{- trimSuffix "mi" $mem | atoi -}} -{{- else if hasSuffix "k" $mem -}} -{{- div (trimSuffix "k" $mem | atoi) 1000 -}} -{{- else if hasSuffix "ki" $mem -}} -{{- div (trimSuffix "ki" $mem | atoi) 1024 -}} -{{- else -}} -{{- div (div ($mem | atoi) 1024) 1024 -}} + This helper converts the input value of memory to Bytes. + Input needs to be a valid value as supported by k8s memory resource field. + */}} +{{- define "opentelemetry-collector.convertMemToBytes" }} + {{- $mem := lower . -}} + {{- if hasSuffix "e" $mem -}} + {{- $mem = mulf (trimSuffix "e" $mem | float64) 1e18 -}} + {{- else if hasSuffix "ei" $mem -}} + {{- $mem = mulf (trimSuffix "e" $mem | float64) 0x1p60 -}} + {{- else if hasSuffix "p" $mem -}} + {{- $mem = mulf (trimSuffix "p" $mem | float64) 1e15 -}} + {{- else if hasSuffix "pi" $mem -}} + {{- $mem = mulf (trimSuffix "pi" $mem | float64) 0x1p50 -}} + {{- else if hasSuffix "t" $mem -}} + {{- $mem = mulf (trimSuffix "t" $mem | float64) 1e12 -}} + {{- else if hasSuffix "ti" $mem -}} + {{- $mem = mulf (trimSuffix "ti" $mem | float64) 0x1p40 -}} + {{- else if hasSuffix "g" $mem -}} + {{- $mem = mulf (trimSuffix "g" $mem | float64) 1e9 -}} + {{- else if hasSuffix "gi" $mem -}} + {{- $mem = mulf (trimSuffix "gi" $mem | float64) 0x1p30 -}} + {{- else if hasSuffix "m" $mem -}} + {{- $mem = mulf (trimSuffix "m" $mem | float64) 1e6 -}} + {{- else if hasSuffix "mi" $mem -}} + {{- $mem = mulf (trimSuffix "mi" $mem | float64) 0x1p20 -}} + {{- else if hasSuffix "k" $mem -}} + {{- $mem = mulf (trimSuffix "k" $mem | float64) 1e3 -}} + {{- else if hasSuffix "ki" $mem -}} + {{- $mem = mulf (trimSuffix "ki" $mem | float64) 0x1p10 -}} + {{- end }} +{{- $mem }} +{{- end }} + +{{- define "opentelemetry-collector.gomemlimit" }} +{{- $memlimitBytes := include "opentelemetry-collector.convertMemToBytes" . | mulf 0.8 -}} +{{- printf "%dMiB" (divf $memlimitBytes 0x1p20 | floor | int64) -}} +{{- end }} + +{{/* +Get HPA kind from mode. +The capitalization is important for StatefulSet. +*/}} +{{- define "opentelemetry-collector.hpaKind" -}} +{{- if eq .Values.mode "deployment" -}} +{{- print "Deployment" -}} {{- end -}} +{{- if eq .Values.mode "statefulset" -}} +{{- print "StatefulSet" -}} {{- end -}} +{{- end }} diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl index 8aca5f69a..b64334df1 100644 --- a/charts/opentelemetry-collector/templates/_pod.tpl +++ b/charts/opentelemetry-collector/templates/_pod.tpl @@ -68,7 +68,7 @@ containers: {{- end }} {{- if and (.Values.useGOMEMLIMIT) ((((.Values.resources).limits).memory)) }} - name: GOMEMLIMIT - value: {{ div (mul (include "opentelemetry-collector.convertMemToMib" .Values.resources.limits.memory) 80) 100 }}MiB + value: {{ include "opentelemetry-collector.gomemlimit" .Values.resources.limits.memory | quote }} {{- end }} {{- with .Values.extraEnvs }} {{- . | toYaml | nindent 6 }} diff --git a/charts/opentelemetry-collector/templates/hpa.yaml b/charts/opentelemetry-collector/templates/hpa.yaml index 4b644595d..c5d063337 100644 --- a/charts/opentelemetry-collector/templates/hpa.yaml +++ b/charts/opentelemetry-collector/templates/hpa.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.autoscaling.enabled (eq .Values.mode "deployment") }} +{{- if and .Values.autoscaling.enabled (or (eq .Values.mode "deployment") (eq .Values.mode "statefulset")) }} apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: @@ -9,7 +9,7 @@ metadata: spec: scaleTargetRef: apiVersion: apps/v1 - kind: Deployment + kind: {{ include "opentelemetry-collector.hpaKind" . }} name: {{ include "opentelemetry-collector.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index 5e4725143..f9da426db 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -199,6 +199,10 @@ } } }, + "namespaceOverride": { + "type": "string", + "description": "Name of the namespace to deploy the resources into." + }, "presets": { "type": "object", "additionalProperties": false, @@ -989,19 +993,11 @@ }, "internalTrafficPolicy": { "type": "string", - "enum": [ - "Cluster", - "Local", - "" - ] + "enum": ["Cluster", "Local", ""] }, "externalTrafficPolicy": { "type": "string", - "enum": [ - "Cluster", - "Local", - "" - ] + "enum": ["Cluster", "Local", ""] } } }, @@ -1353,4 +1349,4 @@ "required": [ "mode" ] -} \ No newline at end of file +} diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index b1aa299b1..754977405 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -216,7 +216,8 @@ config: # The health_check extension is mandatory for this chart. # Without the health_check extension the collector will fail the readiness and liveliness probes. # The health_check extension can be modified, but should never be removed. - health_check: {} + health_check: + endpoint: ${env:MY_POD_IP}:13133 memory_ballast: {} processors: batch: {} @@ -619,7 +620,7 @@ podDisruptionBudget: # minAvailable: 2 # maxUnavailable: 1 -# autoscaling is used only if deployment enabled +# autoscaling is used only if mode is "deployment" or "statefulset" autoscaling: enabled: false minReplicas: 1 diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock index ff005f1ec..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.73.1 + version: 0.78.0 - name: jaeger repository: https://jaegertracing.github.io/helm-charts - version: 0.72.0 + version: 0.73.1 - name: prometheus repository: https://prometheus-community.github.io/helm-charts - version: 25.4.0 + version: 25.8.2 - name: grafana repository: https://grafana.github.io/helm-charts - version: 7.0.2 -digest: sha256:ab2ac03e11a942d4a0db3534823d773de5830947d9142bc482e0113db8974749 -generated: "2023-11-03T08:39:24.04441-04: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 064f74dac..e4d07e34b 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.26.1 +version: 0.28.1 description: opentelemetry demo helm chart home: https://opentelemetry.io/ sources: @@ -11,21 +11,21 @@ maintainers: - name: puckpuck - name: tylerhelmuth icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png -appVersion: "1.6.0" +appVersion: "1.7.0" dependencies: - name: opentelemetry-collector - version: 0.73.1 + version: 0.78.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled - name: jaeger - version: 0.72.0 + version: 0.73.1 repository: https://jaegertracing.github.io/helm-charts condition: jaeger.enabled - name: prometheus - version: 25.4.0 + version: 25.8.2 repository: https://prometheus-community.github.io/helm-charts condition: prometheus.enabled - name: grafana - version: 7.0.2 + version: 7.2.1 repository: https://grafana.github.io/helm-charts condition: grafana.enabled diff --git a/charts/opentelemetry-demo/README.md b/charts/opentelemetry-demo/README.md index b8ebf8745..38e0087d2 100644 --- a/charts/opentelemetry-demo/README.md +++ b/charts/opentelemetry-demo/README.md @@ -103,44 +103,49 @@ component. > is the name of the demo component -| Parameter | Description | Default | -|--------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| -| `enabled` | Is this component enabled | `true` | -| `useDefault.env` | Use the default environment variables in this component | `true` | -| `imageOverride.repository` | Name of image for this component | Defaults to the overall default image repository | -| `imageOverride.tag` | Tag of the image for this component | Defaults to the overall default image tag | -| `imageOverride.pullPolicy` | Image pull policy for this component | `IfNotPresent` | -| `imageOverride.pullSecrets` | Image pull secrets for this component | `[]` | -| `service.type` | Service type used for this component | `ClusterIP` | -| `service.port` | Service port used for this component | `nil` | -| `service.nodePort` | Service node port used for this component | `nil` | -| `service.annotations` | Annotations to add to the component's service | `{}` | -| `ports` | Array of ports to open for deployment and service of this component | `[]` | -| `env` | Array of environment variables added to this component | Each component will have its own set of environment variables | -| `envOverrides` | Used to override individual environment variables without re-specifying the entire array | `[]` | -| `replicas` | Number of replicas for this component | `1` for ffsPostgres, kafka, and redis ; `nil` otherwise | -| `resources` | CPU/Memory resource requests/limits | Each component will have a default memory limit set | -| `schedulingRules.nodeSelector` | Node labels for pod assignment | `{}` | -| `schedulingRules.affinity` | Man of node/pod affinities | `{}` | -| `schedulingRules.tolerations` | Tolerations for pod assignment | `[]` | -| `securityContext` | Container security context to define user ID (UID), group ID (GID) and other security policies | `{}` | -| `podAnnotations` | Pod annotations for this component | `{}` | -| `ingress.enabled` | Enable the creation of Ingress rules | `false` | -| `ingress.annotations` | Annotations to add to the ingress rule | `{}` | -| `ingress.ingressClassName` | Ingress class to use. If not specified default Ingress class will be used. | `nil` | -| `ingress.hosts` | Array of Hosts to use for the ingress rule. | `[]` | -| `ingress.hosts[].paths` | Array of paths / routes to use for the ingress rule host. | `[]` | -| `ingress.hosts[].paths[].path` | Actual path route to use | `nil` | -| `ingress.hosts[].paths[].pathType` | Path type to use for the given path. Typically this is `Prefix`. | `nil` | -| `ingress.hosts[].paths[].port` | Port to use for the given path | `nil` | -| `ingress.additionalIngresses` | Array of additional ingress rules to add. This is handy if you need to differently annotated ingress rules | `[]` | -| `ingress.additionalIngresses[].name` | Each additional ingress rule needs to have a unique name | `nil` | -| `command` | Command & arguments to pass to the container being spun up for this service | `[]` | -| `configuration` | Configuration for the container being spun up; will create a ConfigMap, Volume and VolumeMount | `{}` | -| `initContainers` | Array of init containers to add to the pod | `[]` | -| `initContainers[].name` | Name of the init container | `nil` | -| `initContainers[].image` | Image to use for the init container | `nil` | -| `initContainers[].command` | Command to run for the init container | `nil` | +| Parameter | Description | Default | +|-----------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| +| `enabled` | Is this component enabled | `true` | +| `useDefault.env` | Use the default environment variables in this component | `true` | +| `imageOverride.repository` | Name of image for this component | Defaults to the overall default image repository | +| `imageOverride.tag` | Tag of the image for this component | Defaults to the overall default image tag | +| `imageOverride.pullPolicy` | Image pull policy for this component | `IfNotPresent` | +| `imageOverride.pullSecrets` | Image pull secrets for this component | `[]` | +| `service.type` | Service type used for this component | `ClusterIP` | +| `service.port` | Service port used for this component | `nil` | +| `service.nodePort` | Service node port used for this component | `nil` | +| `service.annotations` | Annotations to add to the component's service | `{}` | +| `ports` | Array of ports to open for deployment and service of this component | `[]` | +| `env` | Array of environment variables added to this component | Each component will have its own set of environment variables | +| `envOverrides` | Used to override individual environment variables without re-specifying the entire array | `[]` | +| `replicas` | Number of replicas for this component | `1` for ffsPostgres, kafka, and redis ; `nil` otherwise | +| `resources` | CPU/Memory resource requests/limits | Each component will have a default memory limit set | +| `schedulingRules.nodeSelector` | Node labels for pod assignment | `{}` | +| `schedulingRules.affinity` | Man of node/pod affinities | `{}` | +| `schedulingRules.tolerations` | Tolerations for pod assignment | `[]` | +| `securityContext` | Container security context to define user ID (UID), group ID (GID) and other security policies | `{}` | +| `podSecurityContext` | Pod security context to define user ID (UID), group ID (GID) and other security policies | `{}` | +| `podAnnotations` | Pod annotations for this component | `{}` | +| `ingress.enabled` | Enable the creation of Ingress rules | `false` | +| `ingress.annotations` | Annotations to add to the ingress rule | `{}` | +| `ingress.ingressClassName` | Ingress class to use. If not specified default Ingress class will be used. | `nil` | +| `ingress.hosts` | Array of Hosts to use for the ingress rule. | `[]` | +| `ingress.hosts[].paths` | Array of paths / routes to use for the ingress rule host. | `[]` | +| `ingress.hosts[].paths[].path` | Actual path route to use | `nil` | +| `ingress.hosts[].paths[].pathType` | Path type to use for the given path. Typically this is `Prefix`. | `nil` | +| `ingress.hosts[].paths[].port` | Port to use for the given path | `nil` | +| `ingress.additionalIngresses` | Array of additional ingress rules to add. This is handy if you need to differently annotated ingress rules | `[]` | +| `ingress.additionalIngresses[].name` | Each additional ingress rule needs to have a unique name | `nil` | +| `command` | Command & arguments to pass to the container being spun up for this service | `[]` | +| `mountedConfigMaps[].name` | Name of the Volume that will be used for the ConfigMap mount | `nil` | +| `mountedConfigMaps[].mountPath` | Path where the ConfigMap data will be mounted | `nil` | +| `mountedConfigMaps[].subPath` | SubPath within the mountPath. Used to mount a single file into the path. | `nil` | +| `mountedConfigMaps[].existingConfigMap` | Name of the existing ConfigMap to mount | `nil` | +| `mountedConfigMaps[].data` | Contents of a ConfigMap. Keys should be the names of the files to be mounted. | `{}` | +| `initContainers` | Array of init containers to add to the pod | `[]` | +| `initContainers[].name` | Name of the init container | `nil` | +| `initContainers[].image` | Image to use for the init container | `nil` | +| `initContainers[].command` | Command to run for the init container | `nil` | ### Sub-charts diff --git a/charts/opentelemetry-demo/UPGRADING.md b/charts/opentelemetry-demo/UPGRADING.md index cfe119e8d..affa68d37 100644 --- a/charts/opentelemetry-demo/UPGRADING.md +++ b/charts/opentelemetry-demo/UPGRADING.md @@ -1,9 +1,32 @@ # Upgrade guidelines +## To 0.28 + +The `configuration` property for components has been removed in favor of the new `mountedConfigMaps` property. +This new property allows you to specify the contents of the configuration using the `data` sub-property. You will also +need to specify the `mountPath` to use, and give the configuration a name. The old `configuration` property used +`/etc/config` and `config` as values for these respectively. The following example shows how to migrate from the old +`configuration` property to the new `mountedConfigMaps` property: + +```yaml +# Old configuration property +configuration: + my-config.yaml: | + # Contents of my-config.yaml + +# New mountedConfigMaps property +mountedConfigMaps: + - name: config + mountPath: /etc/config + data: + my-config.yaml: | + # Contents of my-config.yaml +``` + ## To 0.24 -This release uses the [kubernetes attributes processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor) -to add kubernetes metadata as resource attributes. If you override the processors array in your config, you will +This release uses the [kubernetes attributes processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor) +to add kubernetes metadata as resource attributes. If you override the processors array in your config, you will need to add the k8s attributes processor manually to restore `service.instance.id` resource attribute. 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 58b49d872..86bef1591 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,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -484,6 +484,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -499,13 +501,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +528,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -555,6 +557,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -562,13 +566,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -589,7 +593,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -620,6 +624,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -635,13 +641,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +668,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -701,6 +707,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -716,13 +724,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -743,7 +751,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,6 +776,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -775,13 +785,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -802,7 +812,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -829,6 +839,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -836,13 +848,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -863,7 +875,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -902,6 +914,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -917,13 +931,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -944,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -975,6 +989,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -982,13 +998,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1009,7 +1025,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1030,6 +1046,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1045,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1072,7 +1090,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1121,6 +1139,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1128,13 +1148,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1155,7 +1175,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1208,6 +1228,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1215,13 +1237,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1242,7 +1264,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1275,6 +1297,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1282,13 +1306,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1309,7 +1333,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,6 +1370,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1353,13 +1379,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1380,7 +1406,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1409,6 +1435,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1416,13 +1444,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1443,7 +1471,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1470,6 +1498,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1477,13 +1507,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1504,7 +1534,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1535,6 +1565,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1542,13 +1574,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1569,7 +1601,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1602,6 +1634,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1609,13 +1643,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1636,7 +1670,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1661,6 +1695,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1668,13 +1704,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1695,7 +1731,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1722,3 +1758,5 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: 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 0cb813a7b..8073fce0d 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,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml index 9e6a5604e..38bec4336 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -484,6 +484,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -499,13 +501,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +528,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -555,6 +557,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -562,13 +566,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -589,7 +593,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -620,6 +624,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -635,13 +641,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +668,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -701,6 +707,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -716,13 +724,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -743,7 +751,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,6 +776,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -775,13 +785,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -802,7 +812,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -829,6 +839,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -836,13 +848,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -863,7 +875,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -902,6 +914,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -917,13 +931,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -944,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -975,6 +989,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -982,13 +998,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1009,7 +1025,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1030,6 +1046,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1045,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1072,7 +1090,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1121,6 +1139,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1128,13 +1148,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1155,7 +1175,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1208,6 +1228,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1215,13 +1237,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1242,7 +1264,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1275,6 +1297,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1282,13 +1306,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1309,7 +1333,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,6 +1370,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1353,13 +1379,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1380,7 +1406,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1409,6 +1435,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1416,13 +1444,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1443,7 +1471,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1470,6 +1498,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1477,13 +1507,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1504,7 +1534,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1535,6 +1565,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1542,13 +1574,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1569,7 +1601,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1602,6 +1634,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1609,13 +1643,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1636,7 +1670,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1661,6 +1695,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1668,13 +1704,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1695,7 +1731,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1722,3 +1758,5 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: 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 5305a94e9..fee3662cf 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 @@ -4,13 +4,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: example-grafana-dashboards + namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -55,7 +56,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +64,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +115,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +125,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +145,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 +157,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 +199,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +249,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +259,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +279,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 +305,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +343,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +354,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 +374,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 +639,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 +670,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 +708,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +758,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 +788,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 +822,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +860,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 +890,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 +961,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1005,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2858,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 +2927,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 +2955,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 +3125,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 a72781773..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 a7dff8fac..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 7455d5f0e..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,12 +6,13 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: + grafana.ini: | [analytics] check_for_updates = true 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 01afbeecc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,9 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6 - checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba + checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b + checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: @@ -43,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.1.5" + 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 065ae1510..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 5a27433fa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 83dc481c7..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,13 +6,14 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: + admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" 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 f4eb8b1cc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6d65e527e..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 16b3994b3..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 9b11048cb..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 19e58a3aa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6eb2ebd90..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.0 + 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 d41d9eba7..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.0 + 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 047634dc6..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.0 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.50 + image: jaegertracing/all-in-one:1.51.0 imagePullPolicy: IfNotPresent name: jaeger args: 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 e2da36366..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.0 + 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 679438fc9..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.0 + 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 127d5c3cd..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,11 +5,12 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + rules: - apiGroups: [""] resources: ["pods", "namespaces"] 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 1a510bfdf..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,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole 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 72289440e..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,11 +6,12 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + data: relay: | connectors: @@ -28,8 +29,6 @@ data: insecure: true extensions: health_check: {} - memory_ballast: - size_in_percentage: 40 processors: batch: {} filter/ottl: @@ -110,7 +109,6 @@ data: service: extensions: - health_check - - memory_ballast pipelines: logs: exporters: 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 6985d2838..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,11 +6,12 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + spec: selector: matchLabels: @@ -22,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: ad59475fe580acaaa3e002b7dcca40b1a49c48b276e01c7ae9db1b31cc503987 + checksum/config: 305e8f1a044e6411137e3f4bb136f16c29c90d8d5347f6d844835e191d05c09e opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -43,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.88.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: @@ -87,6 +88,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: GOMEMLIMIT + value: 160MiB livenessProbe: httpGet: path: / 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 95bb4e3a0..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.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.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/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml index 66afd5aa1..ce6293c68 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml index 55859d6a3..d1c2b2552 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 68c4bc780..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 @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -21,15 +21,26 @@ 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 - /etc/config/rules - /etc/config/alerts - scrape_configs: [] + scrape_configs: + - honor_labels: true + job_name: otel-collector + kubernetes_sd_configs: + - namespaces: + own_namespace: true + role: pod + relabel_configs: + - action: keep + regex: true + source_labels: + - __meta_kubernetes_pod_annotation_opentelemetry_community_demo recording_rules.yml: | {} rules: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml index e6589450c..1767bd67e 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.47.2" + image: "quay.io/prometheus/prometheus:v2.48.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml index 8041d8fba..8c039ea65 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml index a92fe0a8f..b3b988357 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 0cb813a7b..8073fce0d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml index fd1724f02..0351a9625 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -486,6 +486,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -501,13 +503,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -528,7 +530,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -559,6 +561,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -566,13 +570,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -593,7 +597,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -626,6 +630,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -641,13 +647,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -668,7 +674,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -709,6 +715,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -724,13 +732,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -751,7 +759,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -778,6 +786,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -785,13 +795,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -812,7 +822,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -841,6 +851,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -848,13 +860,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -875,7 +887,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -916,6 +928,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -931,13 +945,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -958,7 +972,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -989,6 +1003,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -996,13 +1012,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1023,7 +1039,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1046,6 +1062,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1061,13 +1079,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1088,7 +1106,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1139,6 +1157,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1146,13 +1166,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1173,7 +1193,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1226,6 +1246,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1233,13 +1255,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1260,7 +1282,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1293,6 +1315,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1300,13 +1324,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1327,7 +1351,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1366,6 +1390,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1373,13 +1399,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1400,7 +1426,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1431,6 +1457,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1438,13 +1466,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1465,7 +1493,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1494,6 +1522,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1501,13 +1531,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1528,7 +1558,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1561,6 +1591,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1568,13 +1600,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1595,7 +1627,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1630,6 +1662,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1637,13 +1671,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1664,7 +1698,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1689,6 +1723,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1696,13 +1732,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1723,7 +1759,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1752,3 +1788,5 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: 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 5305a94e9..fee3662cf 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 @@ -4,13 +4,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: example-grafana-dashboards + namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -55,7 +56,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +64,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +115,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +125,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +145,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 +157,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 +199,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +249,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +259,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +279,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 +305,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +343,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +354,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 +374,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 +639,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 +670,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 +708,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +758,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 +788,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 +822,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +860,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 +890,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 +961,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1005,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2858,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 +2927,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 +2955,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 +3125,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 a72781773..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 a7dff8fac..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 7455d5f0e..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,12 +6,13 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: + grafana.ini: | [analytics] check_for_updates = true 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 01afbeecc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,9 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6 - checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba + checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b + checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: @@ -43,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.1.5" + 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 065ae1510..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 5a27433fa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 83dc481c7..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,13 +6,14 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: + admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" 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 f4eb8b1cc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6d65e527e..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 16b3994b3..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 9b11048cb..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 19e58a3aa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6eb2ebd90..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.0 + 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 d41d9eba7..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.0 + 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 047634dc6..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.0 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.50 + image: jaegertracing/all-in-one:1.51.0 imagePullPolicy: IfNotPresent name: jaeger args: 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 e2da36366..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.0 + 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 679438fc9..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.0 + 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 127d5c3cd..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,11 +5,12 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + rules: - apiGroups: [""] resources: ["pods", "namespaces"] 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 1a510bfdf..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,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole 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 0ee73a71b..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + data: relay: | connectors: @@ -28,8 +29,6 @@ data: insecure: true extensions: health_check: {} - memory_ballast: - size_in_percentage: 40 processors: attributes: actions: @@ -117,7 +116,6 @@ data: service: extensions: - health_check - - memory_ballast pipelines: logs: exporters: 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 0dcac178d..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + spec: replicas: 1 revisionHistoryLimit: 10 @@ -24,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: d4c84fda488f768523376ba48fd4fff97058a2e39be6f4c4db25701f166209eb + checksum/config: d3462234cdafb8ff0ad497c0baa0f38fff6dc510169bf167bcdabf5f14705078 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.88.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: @@ -79,6 +80,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: status.podIP + - name: GOMEMLIMIT + value: 160MiB livenessProbe: httpGet: path: / 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 6eebbe894..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + component: standalone-collector spec: type: ClusterIP 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 95bb4e3a0..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.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.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/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml index 66afd5aa1..ce6293c68 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml index 55859d6a3..d1c2b2552 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 68c4bc780..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 @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -21,15 +21,26 @@ 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 - /etc/config/rules - /etc/config/alerts - scrape_configs: [] + scrape_configs: + - honor_labels: true + job_name: otel-collector + kubernetes_sd_configs: + - namespaces: + own_namespace: true + role: pod + relabel_configs: + - action: keep + regex: true + source_labels: + - __meta_kubernetes_pod_annotation_opentelemetry_community_demo recording_rules.yml: | {} rules: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml index e6589450c..1767bd67e 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.47.2" + image: "quay.io/prometheus/prometheus:v2.48.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml index 8041d8fba..8c039ea65 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml index a92fe0a8f..b3b988357 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 0cb813a7b..8073fce0d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/component.yaml b/charts/opentelemetry-demo/examples/default/rendered/component.yaml index 42dd7d197..3f3c88f62 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -484,6 +484,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -499,13 +501,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +528,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -555,6 +557,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -562,13 +566,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -589,7 +593,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -620,6 +624,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -635,13 +641,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +668,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -701,6 +707,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -716,13 +724,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -743,7 +751,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,6 +776,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -775,13 +785,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -802,7 +812,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -829,6 +839,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -836,13 +848,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -863,7 +875,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -902,6 +914,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -917,13 +931,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -944,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -975,6 +989,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -982,13 +998,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1009,7 +1025,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1030,6 +1046,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1045,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1072,7 +1090,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1121,6 +1139,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1128,13 +1148,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1155,7 +1175,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1208,6 +1228,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1215,13 +1237,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1242,7 +1264,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1275,6 +1297,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1282,13 +1306,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1309,7 +1333,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,6 +1370,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1353,13 +1379,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1380,7 +1406,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1409,6 +1435,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1416,13 +1444,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1443,7 +1471,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1470,6 +1498,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1477,13 +1507,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1504,7 +1534,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1535,6 +1565,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1542,13 +1574,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1569,7 +1601,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1602,6 +1634,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1609,13 +1643,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1636,7 +1670,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1661,6 +1695,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1668,13 +1704,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1695,7 +1731,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1722,3 +1758,5 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml index 5305a94e9..fee3662cf 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml @@ -4,13 +4,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: example-grafana-dashboards + namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -55,7 +56,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +64,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +115,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +125,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +145,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 +157,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 +199,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +249,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +259,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +279,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 +305,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +343,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +354,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 +374,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 +639,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 +670,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 +708,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +758,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 +788,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 +822,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +860,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 +890,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 +961,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1005,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2858,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 +2927,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 +2955,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 +3125,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 a72781773..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 a7dff8fac..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 7455d5f0e..300ee9c16 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml @@ -6,12 +6,13 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: + grafana.ini: | [analytics] check_for_updates = true diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index 01afbeecc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,9 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6 - checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba + checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b + checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: @@ -43,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.1.5" + 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 065ae1510..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 5a27433fa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 83dc481c7..8782d5fd3 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml @@ -6,13 +6,14 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: + admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml index f4eb8b1cc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6d65e527e..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 16b3994b3..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 9b11048cb..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 19e58a3aa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6eb2ebd90..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.0 + 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 d41d9eba7..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.0 + 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 047634dc6..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.0 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.50 + image: jaegertracing/all-in-one:1.51.0 imagePullPolicy: IfNotPresent name: jaeger args: 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 e2da36366..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.0 + 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 679438fc9..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.0 + 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 127d5c3cd..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,11 +5,12 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + rules: - apiGroups: [""] resources: ["pods", "namespaces"] 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 1a510bfdf..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,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole 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 56227424c..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + data: relay: | connectors: @@ -28,8 +29,6 @@ data: insecure: true extensions: health_check: {} - memory_ballast: - size_in_percentage: 40 processors: batch: {} filter/ottl: @@ -108,7 +107,6 @@ data: service: extensions: - health_check - - memory_ballast pipelines: logs: exporters: 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 848953658..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + spec: replicas: 1 revisionHistoryLimit: 10 @@ -24,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: ac2bfa37326f3675bc963f1b73310a681c36868dcd14ff4be2f1a3e1c7880a9f + checksum/config: d2d1620fe68690754eb7ce44954d67a60fd4b16edc98b0eeb86902bdabcf9beb opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.88.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: @@ -79,6 +80,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: status.podIP + - name: GOMEMLIMIT + value: 160MiB livenessProbe: httpGet: path: / 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 6eebbe894..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + component: standalone-collector spec: type: ClusterIP 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 95bb4e3a0..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.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml index 66afd5aa1..ce6293c68 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml index 55859d6a3..d1c2b2552 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index 68c4bc780..de0c44cda 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -21,15 +21,26 @@ 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 - /etc/config/rules - /etc/config/alerts - scrape_configs: [] + scrape_configs: + - honor_labels: true + job_name: otel-collector + kubernetes_sd_configs: + - namespaces: + own_namespace: true + role: pod + relabel_configs: + - action: keep + regex: true + source_labels: + - __meta_kubernetes_pod_annotation_opentelemetry_community_demo recording_rules.yml: | {} rules: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml index e6589450c..1767bd67e 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.47.2" + image: "quay.io/prometheus/prometheus:v2.48.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml index 8041d8fba..8c039ea65 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml index a92fe0a8f..b3b988357 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml index 0cb813a7b..8073fce0d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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 42dd7d197..3f3c88f62 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -484,6 +484,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -499,13 +501,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +528,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -555,6 +557,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -562,13 +566,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -589,7 +593,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -620,6 +624,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -635,13 +641,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +668,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -701,6 +707,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -716,13 +724,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -743,7 +751,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,6 +776,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -775,13 +785,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -802,7 +812,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -829,6 +839,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -836,13 +848,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -863,7 +875,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -902,6 +914,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -917,13 +931,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -944,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -975,6 +989,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -982,13 +998,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1009,7 +1025,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1030,6 +1046,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1045,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1072,7 +1090,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1121,6 +1139,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1128,13 +1148,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1155,7 +1175,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1208,6 +1228,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1215,13 +1237,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1242,7 +1264,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1275,6 +1297,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1282,13 +1306,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1309,7 +1333,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,6 +1370,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1353,13 +1379,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1380,7 +1406,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1409,6 +1435,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1416,13 +1444,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1443,7 +1471,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1470,6 +1498,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1477,13 +1507,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1504,7 +1534,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1535,6 +1565,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1542,13 +1574,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1569,7 +1601,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1602,6 +1634,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1609,13 +1643,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1636,7 +1670,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1661,6 +1695,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1668,13 +1704,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1695,7 +1731,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1722,3 +1758,5 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: 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 5305a94e9..fee3662cf 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 @@ -4,13 +4,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: example-grafana-dashboards + namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -55,7 +56,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +64,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +115,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +125,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +145,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 +157,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 +199,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +249,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +259,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +279,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 +305,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +343,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +354,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 +374,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 +639,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 +670,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 +708,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +758,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 +788,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 +822,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +860,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 +890,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 +961,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1005,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2858,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 +2927,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 +2955,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 +3125,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 a72781773..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 a7dff8fac..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 7455d5f0e..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,12 +6,13 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: + grafana.ini: | [analytics] check_for_updates = true 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 01afbeecc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,9 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6 - checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba + checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b + checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: @@ -43,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.1.5" + 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 065ae1510..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 5a27433fa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 83dc481c7..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,13 +6,14 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: + admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" 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 f4eb8b1cc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6d65e527e..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 16b3994b3..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 9b11048cb..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 19e58a3aa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6eb2ebd90..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.0 + 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 d41d9eba7..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.0 + 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 047634dc6..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.0 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.50 + image: jaegertracing/all-in-one:1.51.0 imagePullPolicy: IfNotPresent name: jaeger args: 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 e2da36366..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.0 + 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 679438fc9..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.0 + 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 802441d99..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,11 +5,12 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + rules: - apiGroups: [""] resources: ["pods", "namespaces"] 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 1a510bfdf..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,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole 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 d18e5404e..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,11 +6,12 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + data: relay: | connectors: @@ -30,8 +31,6 @@ data: file_storage: directory: /var/lib/otelcol health_check: {} - memory_ballast: - size_in_percentage: 40 processors: batch: {} filter/ottl: @@ -241,7 +240,6 @@ data: service: extensions: - health_check - - memory_ballast - file_storage pipelines: logs: 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 9d40f8669..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,11 +6,12 @@ metadata: name: example-otelcol-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + spec: selector: matchLabels: @@ -22,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: d58650f3b5664bc8a35a5b9cf53addbb5f560030697b8fd0343b8b477c15e573 + checksum/config: 8165705f27dbfec474b8d087fdbf44f78a1d908f4b83733a5d6160447b904eb9 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +45,7 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 - image: "otel/opentelemetry-collector-contrib:0.88.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: @@ -88,6 +89,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: GOMEMLIMIT + value: 160MiB livenessProbe: httpGet: path: / 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 95bb4e3a0..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.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.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/clusterrole.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml index 66afd5aa1..ce6293c68 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrole.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml index 55859d6a3..d1c2b2552 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/clusterrolebinding.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 68c4bc780..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 @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -21,15 +21,26 @@ 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 - /etc/config/rules - /etc/config/alerts - scrape_configs: [] + scrape_configs: + - honor_labels: true + job_name: otel-collector + kubernetes_sd_configs: + - namespaces: + own_namespace: true + role: pod + relabel_configs: + - action: keep + regex: true + source_labels: + - __meta_kubernetes_pod_annotation_opentelemetry_community_demo recording_rules.yml: | {} rules: | diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml index e6589450c..1767bd67e 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/deploy.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.47.2" + image: "quay.io/prometheus/prometheus:v2.48.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml index 8041d8fba..8c039ea65 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/service.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml index a92fe0a8f..b3b988357 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/prometheus/serviceaccount.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 0cb813a7b..8073fce0d 100644 --- a/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/kubernetes-infra-monitoring/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml index ed98e8bb4..1aab66ebe 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml @@ -5,13 +5,13 @@ kind: Service metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -30,13 +30,13 @@ kind: Service metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -55,13 +55,13 @@ kind: Service metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -80,13 +80,13 @@ kind: Service metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -105,13 +105,13 @@ kind: Service metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -130,13 +130,13 @@ kind: Service metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -158,13 +158,13 @@ kind: Service metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -183,13 +183,13 @@ kind: Service metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -208,13 +208,13 @@ kind: Service metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -233,13 +233,13 @@ kind: Service metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -261,13 +261,13 @@ kind: Service metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -286,13 +286,13 @@ kind: Service metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -311,13 +311,13 @@ kind: Service metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -336,13 +336,13 @@ kind: Service metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -361,13 +361,13 @@ kind: Service metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -386,13 +386,13 @@ kind: Service metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -411,13 +411,13 @@ kind: Service metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -436,13 +436,13 @@ kind: Deployment metadata: name: example-accountingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-accountingservice app.kubernetes.io/instance: example app.kubernetes.io/component: accountingservice app.kubernetes.io/name: example-accountingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -463,7 +463,7 @@ spec: serviceAccountName: example containers: - name: accountingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-accountingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-accountingservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -484,6 +484,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -499,13 +501,13 @@ kind: Deployment metadata: name: example-adservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-adservice app.kubernetes.io/instance: example app.kubernetes.io/component: adservice app.kubernetes.io/name: example-adservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -526,7 +528,7 @@ spec: serviceAccountName: example containers: - name: adservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-adservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-adservice' imagePullPolicy: IfNotPresent ports: @@ -555,6 +557,8 @@ spec: resources: limits: memory: 300Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -562,13 +566,13 @@ kind: Deployment metadata: name: example-cartservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-cartservice app.kubernetes.io/instance: example app.kubernetes.io/component: cartservice app.kubernetes.io/name: example-cartservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -589,7 +593,7 @@ spec: serviceAccountName: example containers: - name: cartservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-cartservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-cartservice' imagePullPolicy: IfNotPresent ports: @@ -620,6 +624,8 @@ spec: resources: limits: memory: 160Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -635,13 +641,13 @@ kind: Deployment metadata: name: example-checkoutservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-checkoutservice app.kubernetes.io/instance: example app.kubernetes.io/component: checkoutservice app.kubernetes.io/name: example-checkoutservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -662,7 +668,7 @@ spec: serviceAccountName: example containers: - name: checkoutservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-checkoutservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-checkoutservice' imagePullPolicy: IfNotPresent ports: @@ -701,6 +707,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -716,13 +724,13 @@ kind: Deployment metadata: name: example-currencyservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-currencyservice app.kubernetes.io/instance: example app.kubernetes.io/component: currencyservice app.kubernetes.io/name: example-currencyservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -743,7 +751,7 @@ spec: serviceAccountName: example containers: - name: currencyservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-currencyservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-currencyservice' imagePullPolicy: IfNotPresent ports: @@ -768,6 +776,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -775,13 +785,13 @@ kind: Deployment metadata: name: example-emailservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-emailservice app.kubernetes.io/instance: example app.kubernetes.io/component: emailservice app.kubernetes.io/name: example-emailservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -802,7 +812,7 @@ spec: serviceAccountName: example containers: - name: emailservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-emailservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-emailservice' imagePullPolicy: IfNotPresent ports: @@ -829,6 +839,8 @@ spec: resources: limits: memory: 100Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -836,13 +848,13 @@ kind: Deployment metadata: name: example-featureflagservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-featureflagservice app.kubernetes.io/instance: example app.kubernetes.io/component: featureflagservice app.kubernetes.io/name: example-featureflagservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -863,7 +875,7 @@ spec: serviceAccountName: example containers: - name: featureflagservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-featureflagservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-featureflagservice' imagePullPolicy: IfNotPresent ports: @@ -902,6 +914,8 @@ spec: port: 8081 initialDelaySeconds: 30 periodSeconds: 10 + volumeMounts: + volumes: initContainers: - command: - sh @@ -917,13 +931,13 @@ kind: Deployment metadata: name: example-ffspostgres labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-ffspostgres app.kubernetes.io/instance: example app.kubernetes.io/component: ffspostgres app.kubernetes.io/name: example-ffspostgres - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -944,7 +958,7 @@ spec: serviceAccountName: example containers: - name: ffspostgres - image: 'postgres:14' + image: 'postgres:16.1' imagePullPolicy: IfNotPresent ports: @@ -975,6 +989,8 @@ spec: runAsGroup: 999 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -982,13 +998,13 @@ kind: Deployment metadata: name: example-frauddetectionservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frauddetectionservice app.kubernetes.io/instance: example app.kubernetes.io/component: frauddetectionservice app.kubernetes.io/name: example-frauddetectionservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1009,7 +1025,7 @@ spec: serviceAccountName: example containers: - name: frauddetectionservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-frauddetectionservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frauddetectionservice' imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -1030,6 +1046,8 @@ spec: resources: limits: memory: 200Mi + volumeMounts: + volumes: initContainers: - command: - sh @@ -1045,13 +1063,13 @@ kind: Deployment metadata: name: example-frontend labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontend app.kubernetes.io/instance: example app.kubernetes.io/component: frontend app.kubernetes.io/name: example-frontend - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1072,7 +1090,7 @@ spec: serviceAccountName: example containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontend' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontend' imagePullPolicy: IfNotPresent ports: @@ -1121,6 +1139,8 @@ spec: runAsGroup: 1001 runAsNonRoot: true runAsUser: 1001 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1128,13 +1148,13 @@ kind: Deployment metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1155,7 +1175,7 @@ spec: serviceAccountName: example containers: - name: frontendproxy - image: 'ghcr.io/open-telemetry/demo:1.6.0-frontendproxy' + image: 'ghcr.io/open-telemetry/demo:1.7.0-frontendproxy' imagePullPolicy: IfNotPresent ports: @@ -1208,6 +1228,8 @@ spec: runAsGroup: 101 runAsNonRoot: true runAsUser: 101 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1215,13 +1237,13 @@ kind: Deployment metadata: name: example-kafka labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-kafka app.kubernetes.io/instance: example app.kubernetes.io/component: kafka app.kubernetes.io/name: example-kafka - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1242,7 +1264,7 @@ spec: serviceAccountName: example containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:1.6.0-kafka' + image: 'ghcr.io/open-telemetry/demo:1.7.0-kafka' imagePullPolicy: IfNotPresent ports: @@ -1275,6 +1297,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1282,13 +1306,13 @@ kind: Deployment metadata: name: example-loadgenerator labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-loadgenerator app.kubernetes.io/instance: example app.kubernetes.io/component: loadgenerator app.kubernetes.io/name: example-loadgenerator - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1309,7 +1333,7 @@ spec: serviceAccountName: example containers: - name: loadgenerator - image: 'ghcr.io/open-telemetry/demo:1.6.0-loadgenerator' + image: 'ghcr.io/open-telemetry/demo:1.7.0-loadgenerator' imagePullPolicy: IfNotPresent ports: @@ -1346,6 +1370,8 @@ spec: resources: limits: memory: 120Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1353,13 +1379,13 @@ kind: Deployment metadata: name: example-paymentservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-paymentservice app.kubernetes.io/instance: example app.kubernetes.io/component: paymentservice app.kubernetes.io/name: example-paymentservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1380,7 +1406,7 @@ spec: serviceAccountName: example containers: - name: paymentservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-paymentservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-paymentservice' imagePullPolicy: IfNotPresent ports: @@ -1409,6 +1435,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 1000 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1416,13 +1444,13 @@ kind: Deployment metadata: name: example-productcatalogservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-productcatalogservice app.kubernetes.io/instance: example app.kubernetes.io/component: productcatalogservice app.kubernetes.io/name: example-productcatalogservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1443,7 +1471,7 @@ spec: serviceAccountName: example containers: - name: productcatalogservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-productcatalogservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-productcatalogservice' imagePullPolicy: IfNotPresent ports: @@ -1470,6 +1498,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1477,13 +1507,13 @@ kind: Deployment metadata: name: example-quoteservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-quoteservice app.kubernetes.io/instance: example app.kubernetes.io/component: quoteservice app.kubernetes.io/name: example-quoteservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1504,7 +1534,7 @@ spec: serviceAccountName: example containers: - name: quoteservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-quoteservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-quoteservice' imagePullPolicy: IfNotPresent ports: @@ -1535,6 +1565,8 @@ spec: runAsGroup: 33 runAsNonRoot: true runAsUser: 33 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1542,13 +1574,13 @@ kind: Deployment metadata: name: example-recommendationservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-recommendationservice app.kubernetes.io/instance: example app.kubernetes.io/component: recommendationservice app.kubernetes.io/name: example-recommendationservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1569,7 +1601,7 @@ spec: serviceAccountName: example containers: - name: recommendationservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-recommendationservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-recommendationservice' imagePullPolicy: IfNotPresent ports: @@ -1602,6 +1634,8 @@ spec: resources: limits: memory: 500Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1609,13 +1643,13 @@ kind: Deployment metadata: name: example-redis labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-redis app.kubernetes.io/instance: example app.kubernetes.io/component: redis app.kubernetes.io/name: example-redis - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1636,7 +1670,7 @@ spec: serviceAccountName: example containers: - name: redis - image: 'redis:alpine' + image: 'redis:7.2-alpine' imagePullPolicy: IfNotPresent ports: @@ -1661,6 +1695,8 @@ spec: runAsGroup: 1000 runAsNonRoot: true runAsUser: 999 + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -1668,13 +1704,13 @@ kind: Deployment metadata: name: example-shippingservice labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-shippingservice app.kubernetes.io/instance: example app.kubernetes.io/component: shippingservice app.kubernetes.io/name: example-shippingservice - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: @@ -1695,7 +1731,7 @@ spec: serviceAccountName: example containers: - name: shippingservice - image: 'ghcr.io/open-telemetry/demo:1.6.0-shippingservice' + image: 'ghcr.io/open-telemetry/demo:1.7.0-shippingservice' imagePullPolicy: IfNotPresent ports: @@ -1722,6 +1758,8 @@ spec: resources: limits: memory: 20Mi + volumeMounts: + volumes: --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: "networking.k8s.io/v1" @@ -1729,13 +1767,13 @@ kind: Ingress metadata: name: example-frontendproxy labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example-frontendproxy app.kubernetes.io/instance: example app.kubernetes.io/component: frontendproxy app.kubernetes.io/name: example-frontendproxy - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml index 5305a94e9..fee3662cf 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 @@ -4,13 +4,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: example-grafana-dashboards + namespace: default labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm data: @@ -55,7 +56,7 @@ data: }, "id": 14, "panels": [], - "title": "Metrics", + "title": "Spanmetrics", "type": "row" }, { @@ -63,6 +64,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -113,7 +115,7 @@ data: } ] }, - "unit": "percent" + "unit": "dtdurationms" }, "overrides": [] }, @@ -123,7 +125,7 @@ data: "x": 0, "y": 1 }, - "id": 6, + "id": 2, "options": { "legend": { "calcs": [], @@ -143,10 +145,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 +157,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 +199,7 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -230,8 +249,7 @@ data: "value": 80 } ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -241,7 +259,7 @@ data: "x": 12, "y": 1 }, - "id": 8, + "id": 10, "options": { "legend": { "calcs": [], @@ -261,22 +279,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 +305,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "bars", + "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -333,7 +343,8 @@ data: "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [] }, @@ -343,13 +354,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 +374,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 +639,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 +670,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 +708,6 @@ data: "type": "prometheus", "uid": "webstore-metrics" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -524,17 +758,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 +788,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 +822,7 @@ data: "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 0, "gradientMode": "none", "hideFrom": { @@ -657,24 +860,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 +890,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 +961,8 @@ data: "gridPos": { "h": 8, "w": 12, - "x": 0, - "y": 25 + "x": 12, + "y": 35 }, "id": 16, "options": { @@ -802,9 +1005,9 @@ data: { "allValue": "", "current": { - "selected": false, - "text": "frontend", - "value": "frontend" + "selected": true, + "text": "adservice", + "value": "adservice" }, "datasource": { "type": "prometheus", @@ -2655,7 +2858,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 +2927,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 +2955,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 +3125,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 a72781773..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 a7dff8fac..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 7455d5f0e..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,12 +6,13 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm data: + grafana.ini: | [analytics] check_for_updates = true 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 01afbeecc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,10 +26,9 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: bf85ecabfb7f23796f805365fa03d7682cf248f835fed87e5fc1396f54aaa7f6 - checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: 89476c1fedba0c6f5dea8300e74e37195d0c5e333c83c13bf656db57d5dcb2ba + checksum/config: 6ed234d37b51db8079340220e18b2d85ed4af929793369ba445677a901992c5b + checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: @@ -43,7 +42,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.1.5" + 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 065ae1510..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 5a27433fa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 83dc481c7..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,13 +6,14 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-7.0.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm type: Opaque data: + admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" 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 f4eb8b1cc..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6d65e527e..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 16b3994b3..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 9b11048cb..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 19e58a3aa..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.2 + helm.sh/chart: grafana-7.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.1.5" + 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 6eb2ebd90..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.0 + 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 d41d9eba7..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.0 + 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 047634dc6..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.0 + helm.sh/chart: jaeger-0.73.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example app.kubernetes.io/version: "1.51.0" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.50 + image: jaegertracing/all-in-one:1.51.0 imagePullPolicy: IfNotPresent name: jaeger args: 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 e2da36366..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.0 + 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 679438fc9..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.0 + 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 127d5c3cd..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,11 +5,12 @@ kind: ClusterRole metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + rules: - apiGroups: [""] resources: ["pods", "namespaces"] 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 1a510bfdf..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,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole 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 56227424c..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + data: relay: | connectors: @@ -28,8 +29,6 @@ data: insecure: true extensions: health_check: {} - memory_ballast: - size_in_percentage: 40 processors: batch: {} filter/ottl: @@ -108,7 +107,6 @@ data: service: extensions: - health_check - - memory_ballast pipelines: logs: exporters: 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 848953658..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + spec: replicas: 1 revisionHistoryLimit: 10 @@ -24,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: ac2bfa37326f3675bc963f1b73310a681c36868dcd14ff4be2f1a3e1c7880a9f + checksum/config: d2d1620fe68690754eb7ce44954d67a60fd4b16edc98b0eeb86902bdabcf9beb opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -45,7 +46,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.88.0" + image: "otel/opentelemetry-collector-contrib:0.92.0" imagePullPolicy: IfNotPresent ports: @@ -79,6 +80,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: status.podIP + - name: GOMEMLIMIT + value: 160MiB livenessProbe: httpGet: path: / 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 a2662d9c7..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + component: standalone-collector spec: rules: 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 6eebbe894..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,11 +6,12 @@ metadata: name: example-otelcol namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.0" + app.kubernetes.io/version: "0.92.0" app.kubernetes.io/managed-by: Helm + component: standalone-collector spec: type: ClusterIP 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 95bb4e3a0..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.73.1 + helm.sh/chart: opentelemetry-collector-0.78.0 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.88.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/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml index 66afd5aa1..ce6293c68 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml index 55859d6a3..d1c2b2552 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 68c4bc780..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 @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -21,15 +21,26 @@ 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 - /etc/config/rules - /etc/config/alerts - scrape_configs: [] + scrape_configs: + - honor_labels: true + job_name: otel-collector + kubernetes_sd_configs: + - namespaces: + own_namespace: true + role: pod + relabel_configs: + - action: keep + regex: true + source_labels: + - __meta_kubernetes_pod_annotation_opentelemetry_community_demo recording_rules.yml: | {} rules: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml index e6589450c..1767bd67e 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server @@ -30,8 +30,8 @@ spec: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus spec: @@ -40,7 +40,7 @@ spec: containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.47.2" + image: "quay.io/prometheus/prometheus:v2.48.1" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml index 8041d8fba..8c039ea65 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml index a92fe0a8f..b3b988357 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml @@ -7,8 +7,8 @@ metadata: app.kubernetes.io/component: server app.kubernetes.io/name: prometheus app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.47.2 - helm.sh/chart: prometheus-25.4.0 + app.kubernetes.io/version: v2.48.1 + helm.sh/chart: prometheus-25.8.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: prometheus name: example-prometheus-server 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 0cb813a7b..8073fce0d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml @@ -5,11 +5,11 @@ kind: ServiceAccount metadata: name: example labels: - helm.sh/chart: opentelemetry-demo-0.26.1 + helm.sh/chart: opentelemetry-demo-0.28.1 opentelemetry.io/name: example app.kubernetes.io/instance: example app.kubernetes.io/name: example - app.kubernetes.io/version: "1.6.0" + app.kubernetes.io/version: "1.7.0" app.kubernetes.io/part-of: opentelemetry-demo app.kubernetes.io/managed-by: Helm 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/templates/_objects.tpl b/charts/opentelemetry-demo/templates/_objects.tpl index 4605e1d7a..73848dd28 100644 --- a/charts/opentelemetry-demo/templates/_objects.tpl +++ b/charts/opentelemetry-demo/templates/_objects.tpl @@ -42,6 +42,10 @@ spec: tolerations: {{- $schedulingRules.tolerations | default .defaultValues.schedulingRules.tolerations | toYaml | nindent 8 }} {{- end }} + {{- if or .defaultValues.podSecurityContext .podSecurityContext }} + securityContext: + {{- .podSecurityContext | default .defaultValues.podSecurityContext | toYaml | nindent 8 }} + {{- end}} containers: - name: {{ .name }} image: '{{ ((.imageOverride).repository) | default .defaultValues.image.repository }}:{{ ((.imageOverride).tag) | default (printf "%s-%s" (default .Chart.AppVersion .defaultValues.image.tag) (replace "-" "" .name)) }}' @@ -66,15 +70,24 @@ spec: livenessProbe: {{- .livenessProbe | toYaml | nindent 12 }} {{- end }} - {{- if .configuration }} volumeMounts: - - name: config - mountPath: /etc/config + {{- range .mountedConfigMaps }} + - name: {{ .name | lower }} + mountPath: {{ .mountPath }} + {{- if .subPath }} + subPath: {{ .subPath }} + {{- end }} + {{- end }} volumes: - - name: config + {{- range .mountedConfigMaps }} + - name: {{ .name | lower}} configMap: - name: {{ include "otel-demo.name" . }}-{{ .name }}-config - {{- end }} + {{- if .existingConfigMap }} + name: {{ .existingConfigMap }} + {{- else }} + name: {{ include "otel-demo.name" $ }}-{{ $.name }}-{{ .name | lower }} + {{- end }} + {{- end }} {{- if .initContainers }} initContainers: {{- tpl (toYaml .initContainers) . | nindent 8 }} @@ -126,18 +139,18 @@ spec: Demo component ConfigMap template */}} {{- define "otel-demo.configmap" }} -{{- if .configuration}} +{{- range .mountedConfigMaps }} +{{- if .data }} --- apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "otel-demo.name" . }}-{{ .name }}-config + name: {{ include "otel-demo.name" $ }}-{{ $.name }}-{{ .name | lower }} labels: - service: {{ include "otel-demo.name" . }}-{{ .name }} - app: {{ include "otel-demo.name" . }}-{{ .name }} - component: {{ include "otel-demo.name" . }}-{{ .name }}-config + {{- include "otel-demo.labels" $ | nindent 4 }} data: - {{- .configuration | toYaml | nindent 2}} + {{- .data | toYaml | nindent 2}} +{{- end}} {{- end}} {{- end}} @@ -168,7 +181,7 @@ apiVersion: "networking.k8s.io/v1" kind: Ingress metadata: {{- if .name }} - name: {{include "otel-demo.name" $ }}-{{ $.name }}-{{ .name }} + name: {{include "otel-demo.name" $ }}-{{ $.name }}-{{ .name | lower }} {{- else }} name: {{include "otel-demo.name" $ }}-{{ $.name }} {{- end }} diff --git a/charts/opentelemetry-demo/templates/grafana-dashboards.yaml b/charts/opentelemetry-demo/templates/grafana-dashboards.yaml index 43ed96693..6796f200f 100644 --- a/charts/opentelemetry-demo/templates/grafana-dashboards.yaml +++ b/charts/opentelemetry-demo/templates/grafana-dashboards.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "otel-demo.name" . }}-grafana-dashboards + namespace: {{ .Release.Namespace }} labels: {{- include "otel-demo.labels" . | nindent 4 }} data: diff --git a/charts/opentelemetry-demo/values.schema.json b/charts/opentelemetry-demo/values.schema.json index 088dc97c4..401043800 100644 --- a/charts/opentelemetry-demo/values.schema.json +++ b/charts/opentelemetry-demo/values.schema.json @@ -166,8 +166,11 @@ "type": "array", "items": {} }, - "configuration": { - "type": "object" + "mountedConfigMaps": { + "type": "array", + "items": { + "$ref": "#/definitions/MountedConfigMap" + } }, "livenessProbe": { "$ref": "#/definitions/LivenessProbe" @@ -184,6 +187,9 @@ "securityContext": { "$ref": "#/definitions/SecurityContext" }, + "podSecurityContext": { + "$ref": "#/definitions/SecurityContext" + }, "ingress": { "$ref": "#/definitions/Ingress" }, @@ -271,7 +277,10 @@ "$ref": "#/definitions/SchedulingRules" }, "securityContext": { - "type": "object" + "$ref": "#/definitions/SecurityContext" + }, + "podSecurityContext": { + "$ref": "#/definitions/SecurityContext" } }, "required": [ @@ -737,6 +746,39 @@ "type": "integer" } } + }, + "MountedConfigMap": { + "type": "object", + "additionalProperties": false, + "properties": { + "name": { + "type": "string" + }, + "mountPath": { + "type": "string" + }, + "subPath": { + "type": "string" + }, + "existingConfigMap": { + "type": "string" + }, + "data": { + "type": "object" + } + }, + "required": [ + "name", + "mountPath" + ], + "oneOf": [ + { + "required": ["configMap"] + }, + { + "required": ["data"] + } + ] } } } diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml index 664742fe0..99fbe8aec 100644 --- a/charts/opentelemetry-demo/values.yaml +++ b/charts/opentelemetry-demo/values.yaml @@ -120,10 +120,19 @@ components: # - secretName: demo-tls # hosts: # - 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 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: {} + ## Configuration to for this component; will create a Volume, and Mount backed by an optionally created ConfigMap. + ## The name, mountPath are required, and one of existingConfigMap or data is required. + ## If an existing ConfigMap is not provided, the contents under data will be used for the created ConfigMap. + # mountedConfigMaps: [] + # - name: my-config + # mountPath: /etc/config + # subPath: + # exsitingConfigMap: my-configmap + # data: + # my-config.yaml: | + # key: value # # Kubernetes container health check options # livenessProbe: {} # # Optional init container to run before the pod starts. @@ -133,6 +142,15 @@ components: # command: [list of commands for the init container to run] # # Replicas for the component # replicas: 1 + # # Optional pod security context for setting user ID (UID), group ID (GID) and other security policies + # # This will be applied at pod level, can be applied globally for all pods: .Values.default.podSecurityContext + # # Or it can be applied to a specific component: .Values.components..podSecurityContext + # podSecurityContext: + # runAsGroup: 65534 + # runAsNonRoot: true + # runAsUser: 65534 + + accountingService: enabled: true useDefault: @@ -522,7 +540,7 @@ components: env: true imageOverride: repository: "postgres" - tag: "14" + tag: "16.1" replicas: 1 ports: - name: postgres @@ -573,7 +591,7 @@ components: env: true imageOverride: repository: "redis" - tag: "alpine" + tag: "7.2-alpine" replicas: 1 ports: - name: redis @@ -679,8 +697,6 @@ jaeger: cassandra: false allInOne: enabled: true - # FIXME: Remove this tag after the Jaeger Helm chart supports appVersion >= "1.50" - tag: "1.50" args: - "--memory.max-traces=8000" - "--query.base-path=/jaeger/ui" @@ -720,6 +736,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: @@ -730,7 +750,17 @@ prometheus: serverFiles: prometheus.yml: - scrape_configs: [] + scrape_configs: + - job_name: 'otel-collector' + honor_labels: true + kubernetes_sd_configs: + - role: pod + namespaces: + own_namespace: true + relabel_configs: + - source_labels: [__meta_kubernetes_pod_annotation_opentelemetry_community_demo] + action: keep + regex: true grafana: enabled: true diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index f6b4970ab..4870c455a 100644 --- a/charts/opentelemetry-operator/Chart.yaml +++ b/charts/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-operator -version: 0.44.0 +version: 0.47.0 description: OpenTelemetry Operator Helm chart for Kubernetes type: application home: https://opentelemetry.io/ @@ -11,4 +11,4 @@ maintainers: - name: dmitryax - name: TylerHelmuth icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png -appVersion: 0.90.0 +appVersion: 0.93.0 diff --git a/charts/opentelemetry-operator/README.md b/charts/opentelemetry-operator/README.md index f08c839c0..2e0bba5c7 100644 --- a/charts/opentelemetry-operator/README.md +++ b/charts/opentelemetry-operator/README.md @@ -18,8 +18,8 @@ certificate that the API server is configured to trust. There are a few differen In this way, cert-manager will generate a self-signed certificate. _See [cert-manager installation](https://cert-manager.io/docs/installation/kubernetes/) for more details._ - You can provide your own Issuer by configuring the `admissionWebhooks.certManager.issuerRef` value. You will need to specify the `kind` (Issuer or ClusterIssuer) and the `name`. Note that this method also requires the installation of cert-manager. - - You can use an automatically generated self-signed certificate by setting `admissionWebhooks.certManager.enabled` to `false` and `admissionWebhooks.autoGenerateCert` to `true`. Helm will create a self-signed cert and a secret for you. - - You can use your own generated self-signed certificate by setting both `admissionWebhooks.certManager.enabled` and `admissionWebhooks.autoGenerateCert` to `false`. You should provide the necessary values to `admissionWebhooks.cert_file`, `admissionWebhooks.key_file`, and `admissionWebhooks.ca_file`. + - You can use an automatically generated self-signed certificate by setting `admissionWebhooks.certManager.enabled` to `false` and `admissionWebhooks.autoGenerateCert.enabled` to `true`. Helm will create a self-signed cert and a secret for you. + - You can use your own generated self-signed certificate by setting both `admissionWebhooks.certManager.enabled` and `admissionWebhooks.autoGenerateCert.enabled` to `false`. You should provide the necessary values to `admissionWebhooks.cert_file`, `admissionWebhooks.key_file`, and `admissionWebhooks.ca_file`. - You can sideload custom webhooks and certificate by disabling `.Values.admissionWebhooks.create` and `admissionWebhooks.certManager.enabled` while setting your custom cert secret name in `admissionWebhooks.secretName` - You can disable webhooks altogether by disabling `.Values.admissionWebhooks.create` and setting env var to `ENABLE_WEBHOOKS: "false"` @@ -95,6 +95,8 @@ The following command will show all the configurable options with detailed comme $ helm show values open-telemetry/opentelemetry-operator ``` +When using this chart as a subchart, you may want to unset certain default values. Since Helm v3.13 values handling is improved and null can now consistently be used to remove values (e.g. to remove the default CPU limits). + ## Install OpenTelemetry Collector _See [OpenTelemetry website](https://opentelemetry.io/docs/collector/) for more details about the Collector_ diff --git a/charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml b/charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml index 439d923de..cc5c8f9e8 100644 --- a/charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml +++ b/charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml @@ -248,7 +248,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -292,6 +293,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -381,7 +396,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -422,6 +438,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys + to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the @@ -506,7 +536,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -550,6 +581,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -639,7 +684,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -680,6 +726,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys + to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the @@ -1906,30 +1966,6 @@ spec: description: resources represents the minimum resources the volume should have. properties: - claims: - description: "Claims lists the names of resources, - defined in spec.resourceClaims, that are used - by this container. \n This is an alpha field - and requires enabling the DynamicResourceAllocation - feature gate." - items: - description: ResourceClaim references one - entry in PodSpec.ResourceClaims. - properties: - name: - description: Name must match the name - of one entry in pod.spec.resourceClaims - of the Pod where this field is used. - It makes that resource available inside - a container. - type: string - required: - - name - type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2002,6 +2038,11 @@ spec: StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string + volumeAttributesClassName: + description: volumeAttributesClassName may be used + to set the VolumeAttributesClass used by this + claim. + type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem @@ -2348,6 +2389,84 @@ spec: description: Projection that may be projected along with other supported volume types properties: + clusterTrustBundle: + description: "ClusterTrustBundle allows a pod to access + the `.spec.trustBundle` field of ClusterTrustBundle + objects in an auto-updating file. \n Alpha, gated + by the ClusterTrustBundleProjection feature gate." + properties: + labelSelector: + description: Select all ClusterTrustBundles that + match this label selector. Only has effect + if signerName is set. Mutually-exclusive with + name. If unset, interpreted as "match nothing". + properties: + matchExpressions: + description: matchExpressions is a list of + label selector requirements. The requirements + are ANDed. + items: + description: A label selector requirement + is a selector that contains values, a + key, and an operator that relates the + key and values. + properties: + key: + description: key is the label key that + the selector applies to. + type: string + operator: + description: operator represents a key's + relationship to a set of values. Valid + operators are In, NotIn, Exists and + DoesNotExist. + type: string + values: + description: values is an array of string + values. If the operator is In or NotIn, + the values array must be non-empty. + If the operator is Exists or DoesNotExist, + the values array must be empty. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} + pairs. + type: object + type: object + x-kubernetes-map-type: atomic + name: + description: Select a single ClusterTrustBundle + by object name. Mutually-exclusive with signerName + and labelSelector. + type: string + optional: + description: If true, don't block pod startup + if the referenced ClusterTrustBundle(s) aren't + available. If using name, then the named ClusterTrustBundle + is allowed not to exist. + type: boolean + path: + description: Relative path from the volume root + to write the bundle. + type: string + signerName: + description: Select all ClusterTrustBundles that + match this signer name. Mutually-exclusive with + name. The contents of all selected ClusterTrustBundles + will be unified and deduplicated. + type: string + required: + - path + type: object configMap: description: configMap information about the configMap data to project diff --git a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml index 6bc2e810e..40cc76ab3 100644 --- a/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml +++ b/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml @@ -308,6 +308,18 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the + container should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to + sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -392,6 +404,18 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the + container should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to + sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -1357,7 +1381,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -1401,6 +1426,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -1490,7 +1529,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -1531,6 +1571,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys + to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the @@ -1615,7 +1669,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -1659,6 +1714,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -1748,7 +1817,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -1789,6 +1859,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label keys + to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied to the @@ -2134,6 +2218,37 @@ spec: - name type: object type: array + deploymentUpdateStrategy: + description: UpdateStrategy represents the strategy the operator will + take replacing existing Deployment pods with new pods https://kubernetes. + properties: + rollingUpdate: + description: 'Rolling update config params. Present only if DeploymentStrategyType + = RollingUpdate. --- TODO: Update this to follow our convention + for oneOf, whatever we decide it to be.' + properties: + maxSurge: + anyOf: + - type: integer + - type: string + description: 'The maximum number of pods that can be scheduled + above the desired number of pods. Value can be an absolute + number (ex: 5) or a percentage of desired pods (ex: 10%).' + x-kubernetes-int-or-string: true + maxUnavailable: + anyOf: + - type: integer + - type: string + description: 'The maximum number of pods that can be unavailable + during the update. Value can be an absolute number (ex: + 5) or a percentage of desired pods (ex: 10%).' + x-kubernetes-int-or-string: true + type: object + type: + description: Type of deployment. Can be "Recreate" or "RollingUpdate". + Default is RollingUpdate. + type: string + type: object env: description: ENV vars to set on the OpenTelemetry Collector's Pods. These can then in certain cases be consumed in the config file for @@ -2606,6 +2721,18 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the + container should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to + sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -2690,6 +2817,18 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the + container should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to + sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -3518,6 +3657,17 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the container + should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -3601,6 +3751,17 @@ spec: required: - port type: object + sleep: + description: Sleep represents the duration that the container + should sleep before being terminated. + properties: + seconds: + description: Seconds is the number of seconds to sleep. + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. @@ -3703,10 +3864,15 @@ spec: metrics: description: Metrics defines the metrics configuration for operands. properties: + DisablePrometheusAnnotations: + description: DisablePrometheusAnnotations controls the automatic + addition of default Prometheus annotations ('prometheus.io/scrape', + 'prometheus.io/port', and 'prometheus.io/path') + type: boolean enableMetrics: description: EnableMetrics specifies if ServiceMonitor or - PodMonitor(for sidecar mode) should be created for the OpenTelemetry - Collector and Prometheus Exporters. The operator.observability. + PodMonitor(for sidecar mode) should be created for the service + managed by the OpenTelemetry Operator. The operator.observability. type: boolean type: object type: object @@ -4093,6 +4259,10 @@ spec: account to use with this instance. When set, the operator will not automatically create a ServiceAccount for the collector. type: string + shareProcessNamespace: + description: ShareProcessNamespace indicates if the pod's containers + should share process namespace. + type: boolean targetAllocator: description: TargetAllocator indicates a value which determines whether to spawn a target allocation resource or not. @@ -4306,7 +4476,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list @@ -4351,6 +4522,22 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod + label keys to select which pods will be taken + into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod + label keys to select which pods will be taken + into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -4442,7 +4629,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -4486,6 +4674,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -4576,7 +4778,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list @@ -4621,6 +4824,22 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod + label keys to select which pods will be taken + into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod + label keys to select which pods will be taken + into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -4712,7 +4931,8 @@ spec: properties: labelSelector: description: A label query over a set of resources, - in this case pods. + in this case pods. If it's null, this PodAffinityTerm + matches with no Pods. properties: matchExpressions: description: matchExpressions is a list of label @@ -4756,6 +4976,20 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + description: MatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + description: MismatchLabelKeys is a set of pod label + keys to select which pods will be taken into consideration. + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. The term is applied @@ -4827,10 +5061,11 @@ spec: type: object type: object allocationStrategy: + default: consistent-hashing description: AllocationStrategy determines which strategy the target allocator should use for allocation. The current options are least-weighted and consistent-hashing. The default option - is least-weighted + is consistent-hashing enum: - least-weighted - consistent-hashing @@ -4949,6 +5184,7 @@ spec: type: object type: array filterStrategy: + default: relabel-config description: FilterStrategy determines how to filter targets before allocating them among the collectors. The only current option is relabel-config (drops targets based on prom relabel_config). @@ -4963,6 +5199,176 @@ spec: description: NodeSelector to schedule OpenTelemetry TargetAllocator pods. type: object + observability: + description: ObservabilitySpec defines how telemetry data gets + handled. + properties: + metrics: + description: Metrics defines the metrics configuration for + operands. + properties: + DisablePrometheusAnnotations: + description: DisablePrometheusAnnotations controls the + automatic addition of default Prometheus annotations + ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') + type: boolean + enableMetrics: + description: EnableMetrics specifies if ServiceMonitor + or PodMonitor(for sidecar mode) should be created for + the service managed by the OpenTelemetry Operator. The + operator.observability. + type: boolean + type: object + type: object + podDisruptionBudget: + description: PodDisruptionBudget specifies the pod disruption + budget configuration to use for the target allocator workload. + properties: + maxUnavailable: + anyOf: + - type: integer + - type: string + description: An eviction is allowed if at most "maxUnavailable" + pods selected by "selector" are unavailable after the eviction, + i.e. even in absence of the evicted pod. + x-kubernetes-int-or-string: true + minAvailable: + anyOf: + - type: integer + - type: string + description: An eviction is allowed if at least "minAvailable" + pods selected by "selector" will still be available after + the eviction, i.e. even in the absence of the evicted pod. + x-kubernetes-int-or-string: true + type: object + podSecurityContext: + description: PodSecurityContext configures the pod security context + for the targetallocator. + properties: + fsGroup: + description: "A special supplemental group that applies to + all containers in a pod. Some volume types allow the Kubelet + to change the ownership of that volume to be owned by the + pod: \n 1." + format: int64 + type: integer + fsGroupChangePolicy: + description: fsGroupChangePolicy defines behavior of changing + ownership and permission of the volume before being exposed + inside Pod. + type: string + runAsGroup: + description: The GID to run the entrypoint of the container + process. Uses runtime default if unset. May also be set + in SecurityContext. + format: int64 + type: integer + runAsNonRoot: + description: Indicates that the container must run as a non-root + user. + type: boolean + runAsUser: + description: The UID to run the entrypoint of the container + process. Defaults to user specified in image metadata if + unspecified. May also be set in SecurityContext. + format: int64 + type: integer + seLinuxOptions: + description: The SELinux context to be applied to all containers. + If unspecified, the container runtime will allocate a random + SELinux context for each container. May also be set in + SecurityContext. + properties: + level: + description: Level is SELinux level label that applies + to the container. + type: string + role: + description: Role is a SELinux role label that applies + to the container. + type: string + type: + description: Type is a SELinux type label that applies + to the container. + type: string + user: + description: User is a SELinux user label that applies + to the container. + type: string + type: object + seccompProfile: + description: The seccomp options to use by the containers + in this pod. Note that this field cannot be set when spec.os.name + is windows. + properties: + localhostProfile: + description: localhostProfile indicates a profile defined + in a file on the node should be used. The profile must + be preconfigured on the node to work. + type: string + type: + description: "type indicates which kind of seccomp profile + will be applied. Valid options are: \n Localhost - a + profile defined in a file on the node should be used." + type: string + required: + - type + type: object + supplementalGroups: + description: A list of groups applied to the first process + run in each container, in addition to the container's primary + GID, the fsGroup (if specified), and group memberships defined + in the container image for th + items: + format: int64 + type: integer + type: array + sysctls: + description: Sysctls hold a list of namespaced sysctls used + for the pod. Pods with unsupported sysctls (by the container + runtime) might fail to launch. Note that this field cannot + be set when spec.os. + items: + description: Sysctl defines a kernel parameter to be set + properties: + name: + description: Name of a property to set + type: string + value: + description: Value of a property to set + type: string + required: + - name + - value + type: object + type: array + windowsOptions: + description: The Windows specific settings applied to all + containers. If unspecified, the options within a container's + SecurityContext will be used. + properties: + gmsaCredentialSpec: + description: GMSACredentialSpec is where the GMSA admission + webhook (https://github.com/kubernetes-sigs/windows-gmsa) + inlines the contents of the GMSA credential spec named + by the GMSACredentialSpecName field. + type: string + gmsaCredentialSpecName: + description: GMSACredentialSpecName is the name of the + GMSA credential spec to use. + type: string + hostProcess: + description: HostProcess determines if a container should + be run as a 'Host Process' container. + type: boolean + runAsUserName: + description: The UserName in Windows to run the entrypoint + of the container process. Defaults to the user specified + in image metadata if unspecified. May also be set in + PodSecurityContext. + type: string + type: object + type: object prometheusCR: description: PrometheusCR defines the configuration for the retrieval of PrometheusOperator CRDs ( servicemonitor.monitoring.coreos.com/v1 @@ -5051,22 +5457,54 @@ spec: description: SecurityContext configures the container security context for the targetallocator. properties: - fsGroup: - description: "A special supplemental group that applies to - all containers in a pod. Some volume types allow the Kubelet - to change the ownership of that volume to be owned by the - pod: \n 1." - format: int64 - type: integer - fsGroupChangePolicy: - description: fsGroupChangePolicy defines behavior of changing - ownership and permission of the volume before being exposed - inside Pod. + allowPrivilegeEscalation: + description: AllowPrivilegeEscalation controls whether a process + can gain more privileges than its parent process. This bool + directly controls if the no_new_privs flag will be set on + the container process. + type: boolean + capabilities: + description: The capabilities to add/drop when running containers. + Defaults to the default set of capabilities granted by the + container runtime. Note that this field cannot be set when + spec.os.name is windows. + properties: + add: + description: Added capabilities + items: + description: Capability represent POSIX capabilities + type + type: string + type: array + drop: + description: Removed capabilities + items: + description: Capability represent POSIX capabilities + type + type: string + type: array + type: object + privileged: + description: Run container in privileged mode. Processes in + privileged containers are essentially equivalent to root + on the host. Defaults to false. Note that this field cannot + be set when spec.os.name is windows. + type: boolean + procMount: + description: procMount denotes the type of proc mount to use + for the containers. The default is DefaultProcMount which + uses the container runtime defaults for readonly paths and + masked paths. type: string + readOnlyRootFilesystem: + description: Whether this container has a read-only root filesystem. + Default is false. Note that this field cannot be set when + spec.os.name is windows. + type: boolean runAsGroup: description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set - in SecurityContext. + in PodSecurityContext. format: int64 type: integer runAsNonRoot: @@ -5076,14 +5514,14 @@ spec: runAsUser: description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if - unspecified. May also be set in SecurityContext. + unspecified. May also be set in PodSecurityContext. format: int64 type: integer seLinuxOptions: - description: The SELinux context to be applied to all containers. + description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container. May also be set in - SecurityContext. + PodSecurityContext. properties: level: description: Level is SELinux level label that applies @@ -5103,9 +5541,9 @@ spec: type: string type: object seccompProfile: - description: The seccomp options to use by the containers - in this pod. Note that this field cannot be set when spec.os.name - is windows. + description: The seccomp options to use by this container. + If seccomp options are provided at both the pod & container + level, the container options override the pod options. properties: localhostProfile: description: localhostProfile indicates a profile defined @@ -5120,38 +5558,10 @@ spec: required: - type type: object - supplementalGroups: - description: A list of groups applied to the first process - run in each container, in addition to the container's primary - GID, the fsGroup (if specified), and group memberships defined - in the container image for th - items: - format: int64 - type: integer - type: array - sysctls: - description: Sysctls hold a list of namespaced sysctls used - for the pod. Pods with unsupported sysctls (by the container - runtime) might fail to launch. Note that this field cannot - be set when spec.os. - items: - description: Sysctl defines a kernel parameter to be set - properties: - name: - description: Name of a property to set - type: string - value: - description: Value of a property to set - type: string - required: - - name - - value - type: object - type: array windowsOptions: description: The Windows specific settings applied to all - containers. If unspecified, the options within a container's - SecurityContext will be used. + containers. If unspecified, the options from the PodSecurityContext + will be used. properties: gmsaCredentialSpec: description: GMSACredentialSpec is where the GMSA admission @@ -5581,28 +5991,6 @@ spec: description: resources represents the minimum resources the volume should have. properties: - claims: - description: "Claims lists the names of resources, defined - in spec.resourceClaims, that are used by this container. - \n This is an alpha field and requires enabling the - DynamicResourceAllocation feature gate." - items: - description: ResourceClaim references one entry in - PodSpec.ResourceClaims. - properties: - name: - description: Name must match the name of one entry - in pod.spec.resourceClaims of the Pod where - this field is used. It makes that resource available - inside a container. - type: string - required: - - name - type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5669,6 +6057,10 @@ spec: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string + volumeAttributesClassName: + description: volumeAttributesClassName may be used to set + the VolumeAttributesClass used by this claim. + type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not @@ -5760,6 +6152,27 @@ spec: - type type: object type: array + currentVolumeAttributesClassName: + description: currentVolumeAttributesClassName is the current + name of the VolumeAttributesClass the PVC is using. + type: string + modifyVolumeStatus: + description: ModifyVolumeStatus represents the status object + of ControllerModifyVolume operation. When this is unset, + there is no ModifyVolume operation being attempted. + properties: + status: + description: status is the status of the ControllerModifyVolume + operation. + type: string + targetVolumeAttributesClassName: + description: targetVolumeAttributesClassName is the + name of the VolumeAttributesClass the PVC currently + being reconciled + type: string + required: + - status + type: object phase: description: phase represents the current phase of PersistentVolumeClaim. type: string @@ -6257,30 +6670,6 @@ spec: description: resources represents the minimum resources the volume should have. properties: - claims: - description: "Claims lists the names of resources, - defined in spec.resourceClaims, that are used - by this container. \n This is an alpha field - and requires enabling the DynamicResourceAllocation - feature gate." - items: - description: ResourceClaim references one - entry in PodSpec.ResourceClaims. - properties: - name: - description: Name must match the name - of one entry in pod.spec.resourceClaims - of the Pod where this field is used. - It makes that resource available inside - a container. - type: string - required: - - name - type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -6353,6 +6742,11 @@ spec: StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string + volumeAttributesClassName: + description: volumeAttributesClassName may be used + to set the VolumeAttributesClass used by this + claim. + type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem @@ -6699,6 +7093,84 @@ spec: description: Projection that may be projected along with other supported volume types properties: + clusterTrustBundle: + description: "ClusterTrustBundle allows a pod to access + the `.spec.trustBundle` field of ClusterTrustBundle + objects in an auto-updating file. \n Alpha, gated + by the ClusterTrustBundleProjection feature gate." + properties: + labelSelector: + description: Select all ClusterTrustBundles that + match this label selector. Only has effect + if signerName is set. Mutually-exclusive with + name. If unset, interpreted as "match nothing". + properties: + matchExpressions: + description: matchExpressions is a list of + label selector requirements. The requirements + are ANDed. + items: + description: A label selector requirement + is a selector that contains values, a + key, and an operator that relates the + key and values. + properties: + key: + description: key is the label key that + the selector applies to. + type: string + operator: + description: operator represents a key's + relationship to a set of values. Valid + operators are In, NotIn, Exists and + DoesNotExist. + type: string + values: + description: values is an array of string + values. If the operator is In or NotIn, + the values array must be non-empty. + If the operator is Exists or DoesNotExist, + the values array must be empty. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} + pairs. + type: object + type: object + x-kubernetes-map-type: atomic + name: + description: Select a single ClusterTrustBundle + by object name. Mutually-exclusive with signerName + and labelSelector. + type: string + optional: + description: If true, don't block pod startup + if the referenced ClusterTrustBundle(s) aren't + available. If using name, then the named ClusterTrustBundle + is allowed not to exist. + type: boolean + path: + description: Relative path from the volume root + to write the bundle. + type: string + signerName: + description: Select all ClusterTrustBundles that + match this signer name. Mutually-exclusive with + name. The contents of all selected ClusterTrustBundles + will be unified and deduplicated. + type: string + required: + - path + type: object configMap: description: configMap information about the configMap data to project diff --git a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml index 53b961608..d7e2d4380 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml @@ -6,9 +6,9 @@ metadata: annotations: cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook @@ -21,6 +21,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /mutate-opentelemetry-io-v1alpha1-instrumentation + port: 443 failurePolicy: Fail name: minstrumentation.kb.io rules: @@ -43,6 +44,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: 443 failurePolicy: Fail name: mopentelemetrycollector.kb.io rules: @@ -65,6 +67,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /mutate-v1-pod + port: 443 failurePolicy: Ignore name: mpod.kb.io rules: @@ -88,9 +91,9 @@ metadata: annotations: cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook @@ -103,6 +106,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: 443 failurePolicy: Fail name: vinstrumentationcreateupdate.kb.io rules: @@ -125,6 +129,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: 443 failurePolicy: Ignore name: vinstrumentationdelete.kb.io rules: @@ -146,6 +151,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: 443 failurePolicy: Fail name: vopentelemetrycollectorcreateupdate.kb.io rules: @@ -168,6 +174,7 @@ webhooks: name: example-opentelemetry-operator-webhook namespace: default path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: 443 failurePolicy: Ignore name: vopentelemetrycollectordelete.kb.io rules: diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml index 5ea54e531..f765856b8 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml @@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook @@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml index 8dac12fec..e496956f6 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -253,9 +253,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -271,9 +271,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml index 8826d20ad..72048f6f6 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml index dcbba4205..f1f4b737c 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml @@ -4,9 +4,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -33,13 +33,13 @@ spec: - --enable-leader-election - --health-probe-addr=:8081 - --webhook-port=9443 - - --collector-image=otel/opentelemetry-collector-contrib:0.90.1 + - --collector-image=otel/opentelemetry-collector-contrib:0.93.0 command: - /manager env: - name: ENABLE_WEBHOOKS value: "true" - image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.90.0" + image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.0" name: manager ports: - containerPort: 8080 diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml index c7db3bd7c..afc2ad608 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/role.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/role.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml index 22c348c85..6add32a8a 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml index 8117f9c5f..88ddb7eb6 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/service.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/service.yaml @@ -4,9 +4,9 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -31,9 +31,9 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml index 927d3f2a6..e15a258ec 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml @@ -6,9 +6,9 @@ metadata: name: opentelemetry-operator namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml index 9d434267e..4fa1b0494 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml @@ -6,9 +6,9 @@ metadata: name: "example-opentelemetry-operator-cert-manager" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: webhook diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml index 0ef02fb81..49912f916 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml +++ b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml @@ -6,9 +6,9 @@ metadata: name: "example-opentelemetry-operator-metrics" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager @@ -43,9 +43,9 @@ metadata: name: "example-opentelemetry-operator-webhook" namespace: default labels: - helm.sh/chart: opentelemetry-operator-0.44.0 + helm.sh/chart: opentelemetry-operator-0.47.0 app.kubernetes.io/name: opentelemetry-operator - app.kubernetes.io/version: "0.90.0" + app.kubernetes.io/version: "0.93.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: example app.kubernetes.io/component: controller-manager diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl index 4812314db..8e84476cf 100644 --- a/charts/opentelemetry-operator/templates/_helpers.tpl +++ b/charts/opentelemetry-operator/templates/_helpers.tpl @@ -97,8 +97,10 @@ a cert is loaded from an existing secret or is provided via `.Values` {{- $caCertEnc = index $prevSecret "data" "ca.crt" }} {{- if not $caCertEnc }} {{- $prevHook := (lookup "admissionregistration.k8s.io/v1" "MutatingWebhookConfiguration" .Release.Namespace (print (include "opentelemetry-operator.MutatingWebhookName" . ) "-mutation")) }} +{{- if not (eq (toString $prevHook) "") }} {{- $caCertEnc = (first $prevHook.webhooks).clientConfig.caBundle }} {{- end }} +{{- end }} {{- else }} {{- $altNames := list ( printf "%s-webhook.%s" (include "opentelemetry-operator.fullname" .) .Release.Namespace ) ( printf "%s-webhook.%s.svc" (include "opentelemetry-operator.fullname" .) .Release.Namespace ) -}} {{- $ca := genCA "opentelemetry-operator-operator-ca" 365 }} diff --git a/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml index 11b27ebb2..3bcf1d540 100644 --- a/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml @@ -16,6 +16,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: minstrumentation.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -46,6 +47,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: mopentelemetrycollector.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -76,6 +78,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-v1-pod + port: {{ .Values.admissionWebhooks.servicePort }} {{- if .Values.admissionWebhooks.namespaceSelector }} namespaceSelector: {{- toYaml .Values.admissionWebhooks.namespaceSelector | nindent 6 }} @@ -117,6 +120,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: vinstrumentationcreateupdate.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -147,6 +151,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: Ignore name: vinstrumentationdelete.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -176,6 +181,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: vopentelemetrycollectorcreateupdate.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -206,6 +212,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: Ignore name: vopentelemetrycollectordelete.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} diff --git a/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml b/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml index 520eaa0a8..38cfd08c8 100644 --- a/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml +++ b/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml @@ -42,6 +42,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: minstrumentation.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -73,6 +74,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: mopentelemetrycollector.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -104,6 +106,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /mutate-v1-pod + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.pods.failurePolicy }} name: mpod.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -146,6 +149,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: vinstrumentationcreateupdate.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -177,6 +181,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-instrumentation + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: Ignore name: vinstrumentationdelete.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -207,6 +212,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: {{ .Values.admissionWebhooks.failurePolicy }} name: vopentelemetrycollectorcreateupdate.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} @@ -238,6 +244,7 @@ webhooks: name: {{ template "opentelemetry-operator.fullname" . }}-webhook namespace: {{ .Release.Namespace }} path: /validate-opentelemetry-io-v1alpha1-opentelemetrycollector + port: {{ .Values.admissionWebhooks.servicePort }} failurePolicy: Ignore name: vopentelemetrycollectordelete.kb.io {{- if .Values.admissionWebhooks.namespaceSelector }} diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml index fad51a35f..59810330d 100644 --- a/charts/opentelemetry-operator/templates/deployment.yaml +++ b/charts/opentelemetry-operator/templates/deployment.yaml @@ -82,7 +82,7 @@ spec: value: {{ $value | quote -}} {{- end }} {{- end }} - image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}" + image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag | default .Chart.AppVersion }}" name: manager ports: - containerPort: {{ .Values.manager.ports.metricsPort }} diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json index 69992cb1c..4473ad6ac 100644 --- a/charts/opentelemetry-operator/values.schema.json +++ b/charts/opentelemetry-operator/values.schema.json @@ -142,13 +142,13 @@ "default": "", "title": "The tag Schema", "examples": [ - "v0.89.0" + "v0.93.0" ] } }, "examples": [{ "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator", - "tag": "v0.89.0" + "tag": "v0.93.0" }] }, "collectorImage": { @@ -173,13 +173,13 @@ "default": "", "title": "The tag Schema", "examples": [ - "0.89.0" + "0.93.0" ] } }, "examples": [{ "repository": "otel/opentelemetry-collector-contrib", - "tag": "0.89.0" + "tag": "0.93.0" }] }, "opampBridgeImage": { @@ -497,10 +497,7 @@ "type": "object", "default": {}, "title": "The limits Schema", - "required": [ - "cpu", - "memory" - ], + "required": [], "properties": { "cpu": { "type": "string", @@ -926,11 +923,11 @@ "examples": [{ "image": { "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator", - "tag": "v0.89.0" + "tag": "v0.93.0" }, "collectorImage": { "repository": "otel/opentelemetry-collector-contrib", - "tag": "0.89.0" + "tag": "0.93.0" }, "opampBridgeImage": { "repository": "", @@ -1108,10 +1105,7 @@ "type": "object", "default": {}, "title": "The limits Schema", - "required": [ - "cpu", - "memory" - ], + "required": [], "properties": { "cpu": { "type": "string", @@ -1680,11 +1674,11 @@ "manager": { "image": { "repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator", - "tag": "v0.89.0" + "tag": "v0.93.0" }, "collectorImage": { "repository": "otel/opentelemetry-collector-contrib", - "tag": "0.89.0" + "tag": "0.93.0" }, "opampBridgeImage": { "repository": "", diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml index eb279c307..27971d29b 100644 --- a/charts/opentelemetry-operator/values.yaml +++ b/charts/opentelemetry-operator/values.yaml @@ -29,10 +29,10 @@ pdb: manager: image: repository: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - tag: v0.90.0 + tag: "" collectorImage: repository: otel/opentelemetry-collector-contrib - tag: 0.90.1 + tag: 0.93.0 opampBridgeImage: repository: "" tag: ""