From b8f199109500f282b1a2ca7c7cc383177f0efc09 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 28 Oct 2024 14:15:54 +0000
Subject: [PATCH] feat: latest telemetry updates, logging version bump

---
 .../51-aws-iam-authenticator-deployment.yaml  |    2 +-
 charts/kubezero-logging/README.md             |    4 +-
 .../charts/fluent-bit/Chart.yaml              |    6 +-
 .../charts/fluent-bit/ci/ci-values.yaml       |    1 +
 .../fluent-bit/dashboards/fluent-bit.json     |    4 +-
 .../charts/fluent-bit/templates/_pod.tpl      |    6 +-
 .../fluent-bit/templates/clusterrole.yaml     |    1 +
 .../charts/fluent-bit/templates/service.yaml  |    3 +
 .../charts/fluent-bit/values.yaml             |   15 +
 charts/kubezero-logging/update.sh             |    2 +-
 charts/kubezero-telemetry/README.md           |   15 +-
 .../charts/fluent-bit/Chart.yaml              |   27 -
 .../charts/fluent-bit/README.md               |   57 -
 .../charts/fluent-bit/ci/ci-values.yaml       |    7 -
 .../fluent-bit/dashboards/fluent-bit.json     | 1565 -----------------
 .../charts/fluent-bit/templates/NOTES.txt     |    6 -
 .../charts/fluent-bit/templates/_helpers.tpl  |  138 --
 .../charts/fluent-bit/templates/_pod.tpl      |  155 --
 .../fluent-bit/templates/clusterrole.yaml     |   45 -
 .../templates/clusterrolebinding.yaml         |   16 -
 .../templates/configmap-dashboards.yaml       |   21 -
 .../templates/configmap-luascripts.yaml       |   13 -
 .../fluent-bit/templates/configmap.yaml       |   25 -
 .../fluent-bit/templates/daemonset.yaml       |   48 -
 .../fluent-bit/templates/deployment.yaml      |   51 -
 .../charts/fluent-bit/templates/ingress.yaml  |   65 -
 .../fluent-bit/templates/networkpolicy.yaml   |   23 -
 .../charts/fluent-bit/templates/pdb.yaml      |   21 -
 .../fluent-bit/templates/prometheusrule.yaml  |   18 -
 .../charts/fluent-bit/templates/psp.yaml      |   42 -
 .../charts/fluent-bit/templates/scc.yaml      |   41 -
 .../charts/fluent-bit/templates/service.yaml  |   57 -
 .../fluent-bit/templates/serviceaccount.yaml  |   13 -
 .../fluent-bit/templates/servicemonitor.yaml  |   51 -
 .../templates/tests/test-connection.yaml      |   26 -
 .../charts/fluent-bit/templates/vpa.yaml      |   39 -
 .../charts/fluent-bit/values.yaml             |  511 ------
 .../.helmignore                               |    4 +
 .../opentelemetry-collector/CONTRIBUTING.md   |   12 +
 .../charts/opentelemetry-collector/Chart.yaml |   15 +
 .../charts/opentelemetry-collector/README.md  |  251 +++
 .../opentelemetry-collector/UPGRADING.md      |  419 +++++
 .../ci/GOMEMLIMIT-values.yaml                 |    9 +
 .../ci/clusterrole-values.yaml                |   27 +
 .../ci/config-override-values.yaml            |   26 +
 .../ci/daemonset-values.yaml                  |   12 +
 .../ci/deployment-values.yaml                 |   29 +
 .../ci/disabling-protocols-values.yaml        |   21 +
 .../ci/hpa-deployment-values.yaml             |   15 +
 .../ci/hpa-statefulset-values.yaml            |   15 +
 .../ci/multiple-ingress-values.yaml           |   49 +
 .../ci/networkpolicy-override-values.yaml     |   37 +
 .../ci/networkpolicy-values.yaml              |   15 +
 .../ci/preset-clustermetrics-values.yaml      |   16 +
 .../ci/preset-hostmetrics-values.yaml         |   16 +
 .../ci/preset-k8sevents-values.yaml           |   16 +
 .../ci/preset-kubeletmetrics-values.yaml      |   16 +
 .../preset-kubernetesattributes-values.yaml   |   16 +
 .../ci/preset-logscollection-values.yaml      |   17 +
 .../ci/probes-values.yaml                     |   37 +
 .../ci/statefulset-values.yaml                |   13 +
 .../examples/README.md                        |   17 +
 .../rendered/clusterrole.yaml                 |   41 +
 .../rendered/clusterrolebinding.yaml          |   21 +
 .../alternate-config/rendered/configmap.yaml  |   68 +
 .../alternate-config/rendered/deployment.yaml |  100 ++
 .../alternate-config/rendered/service.yaml    |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/alternate-config/values.yaml     |   34 +
 .../daemonset-values.yaml                     |   34 +
 .../deployment-values.yaml                    |   13 +
 .../rendered/configmap-agent.yaml             |   93 +
 .../rendered/configmap.yaml                   |   86 +
 .../rendered/daemonset.yaml                   |  104 ++
 .../rendered/deployment.yaml                  |  100 ++
 .../rendered/service.yaml                     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../rendered/configmap-agent.yaml             |  100 ++
 .../rendered/daemonset.yaml                   |  110 ++
 .../rendered/serviceaccount.yaml              |   13 +
 .../daemonset-collector-logs/values.yaml      |   12 +
 .../rendered/configmap-agent.yaml             |  133 ++
 .../rendered/daemonset.yaml                   |  105 ++
 .../rendered/serviceaccount.yaml              |   13 +
 .../daemonset-hostmetrics/values.yaml         |   12 +
 .../rendered/configmap-agent.yaml             |   86 +
 .../rendered/daemonset.yaml                   |  119 ++
 .../rendered/serviceaccount.yaml              |   13 +
 .../daemonset-lifecycle-hooks/values.yaml     |   37 +
 .../rendered/configmap-agent.yaml             |   86 +
 .../daemonset-only/rendered/daemonset.yaml    |   98 ++
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/daemonset-only/values.yaml       |    7 +
 .../deployment-only/rendered/configmap.yaml   |   86 +
 .../deployment-only/rendered/deployment.yaml  |  100 ++
 .../deployment-only/rendered/service.yaml     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/deployment-only/values.yaml      |   14 +
 .../rendered/configmap.yaml                   |   49 +
 .../rendered/deployment.yaml                  |   82 +
 .../rendered/service.yaml                     |   33 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../deployment-otlp-traces/values.yaml        |   30 +
 .../deployment-values.yaml                    |   28 +
 .../rendered/deployment.yaml                  |  101 ++
 .../rendered/service.yaml                     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../rendered/clusterrole.yaml                 |   23 +
 .../rendered/clusterrolebinding.yaml          |   21 +
 .../rendered/configmap.yaml                   |  112 ++
 .../rendered/deployment.yaml                  |   94 +
 .../rendered/service.yaml                     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/kubernetesAttributes/values.yaml |   21 +
 .../rendered/configmap-statefulset.yaml       |   86 +
 .../statefulset-only/rendered/service.yaml    |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../rendered/statefulset.yaml                 |  101 ++
 .../examples/statefulset-only/values.yaml     |   14 +
 .../rendered/configmap-statefulset.yaml       |   86 +
 .../rendered/service.yaml                     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../rendered/statefulset.yaml                 |  126 ++
 .../examples/statefulset-with-pvc/values.yaml |   46 +
 .../using-GOMEMLIMIT/rendered/configmap.yaml  |   86 +
 .../using-GOMEMLIMIT/rendered/deployment.yaml |  100 ++
 .../using-GOMEMLIMIT/rendered/service.yaml    |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/using-GOMEMLIMIT/values.yaml     |   13 +
 .../rendered/deployment.yaml                  |   92 +
 .../using-custom-config/rendered/service.yaml |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../examples/using-custom-config/values.yaml  |    8 +
 .../rendered/configmap.yaml                   |   86 +
 .../rendered/deployment.yaml                  |   93 +
 .../rendered/service.yaml                     |   49 +
 .../rendered/serviceaccount.yaml              |   13 +
 .../using-shared-processes/values.yaml        |    6 +
 .../templates/NOTES.txt                       |   49 +
 .../templates/_config.tpl                     |  299 ++++
 .../templates/_helpers.tpl                    |  244 +++
 .../templates/_pod.tpl                        |  221 +++
 .../templates/clusterrole.yaml                |   56 +
 .../templates/clusterrolebinding.yaml         |   22 +
 .../templates/configmap-agent.yaml            |   12 +
 .../templates/configmap-statefulset.yaml      |   12 +
 .../templates/configmap.yaml                  |   12 +
 .../templates/daemonset.yaml                  |   49 +
 .../templates/deployment.yaml                 |   53 +
 .../templates/hpa.yaml                        |   43 +-
 .../templates/ingress.yaml                    |   55 +
 .../templates/networkpolicy.yaml              |   39 +
 .../templates/pdb.yaml                        |   19 +
 .../templates/podmonitor.yaml                 |   19 +
 .../templates/prometheusrule.yaml             |  112 ++
 .../templates/service.yaml                    |   42 +
 .../templates/serviceaccount.yaml             |   15 +
 .../templates/servicemonitor.yaml             |   27 +
 .../templates/statefulset.yaml                |   57 +
 .../values.schema.json                        |  989 +++++++++++
 .../opentelemetry-collector/values.yaml       |  569 ++++++
 charts/kubezero-telemetry/update.sh           |    6 +-
 charts/kubezero-telemetry/values.yaml         |   20 +-
 charts/kubezero/values.yaml                   |    2 +-
 164 files changed, 8184 insertions(+), 3140 deletions(-)
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/README.md
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/ci/ci-values.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/dashboards/fluent-bit.json
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/NOTES.txt
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/_helpers.tpl
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/_pod.tpl
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrole.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrolebinding.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-dashboards.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-luascripts.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/configmap.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/daemonset.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/deployment.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/ingress.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/networkpolicy.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/pdb.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/prometheusrule.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/psp.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/scc.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/service.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/serviceaccount.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/servicemonitor.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/tests/test-connection.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/templates/vpa.yaml
 delete mode 100644 charts/kubezero-telemetry/charts/fluent-bit/values.yaml
 rename charts/kubezero-telemetry/charts/{fluent-bit => opentelemetry-collector}/.helmignore (89%)
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/CONTRIBUTING.md
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/README.md
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/values.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrole.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrolebinding.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-agent.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/daemonset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml
 rename charts/kubezero-telemetry/charts/{fluent-bit => opentelemetry-collector}/templates/hpa.yaml (65%)
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/ingress.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/networkpolicy.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/pdb.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/serviceaccount.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/servicemonitor.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/templates/statefulset.yaml
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json
 create mode 100644 charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml

diff --git a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml b/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml
index f6cdc5c9..a8f3c0c2 100644
--- a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml
+++ b/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml
@@ -117,7 +117,7 @@ spec:
 
       containers:
       - name: aws-iam-authenticator
-        image: public.ecr.aws/zero-downtime/aws-iam-authenticator:v0.6.22
+        image: public.ecr.aws/zero-downtime/aws-iam-authenticator:v0.6.27
         args:
         - server
         - --backend-mode=CRD,MountedFile
diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md
index b75bfe0e..d4154685 100644
--- a/charts/kubezero-logging/README.md
+++ b/charts/kubezero-logging/README.md
@@ -1,6 +1,6 @@
 # kubezero-logging
 
-![Version: 0.8.12](https://img.shields.io/badge/Version-0.8.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
+![Version: 0.8.13](https://img.shields.io/badge/Version-0.8.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
 
 KubeZero Umbrella Chart for complete EFK stack
 
@@ -19,7 +19,7 @@ Kubernetes: `>= 1.26.0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
-| https://fluent.github.io/helm-charts | fluent-bit | 0.46.2 |
+| https://fluent.github.io/helm-charts | fluent-bit | 0.47.10 |
 | https://fluent.github.io/helm-charts | fluentd | 0.5.2 |
 
 ## Changes from upstream
diff --git a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml
index 1b1c6fe8..09c4cb50 100644
--- a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "Updated _Fluent Bit_ OCI image to [v3.0.2](https://github.com/fluent/fluent-bit/releases/tag/v3.0.2)."
+      description: "Updated Fluent Bit OCI image to v3.1.9"
 apiVersion: v1
-appVersion: 3.0.2
+appVersion: 3.1.9
 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD
   family operating systems.
 home: https://fluentbit.io/
@@ -24,4 +24,4 @@ maintainers:
 name: fluent-bit
 sources:
 - https://github.com/fluent/fluent-bit/
-version: 0.46.2
+version: 0.47.10
diff --git a/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml b/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml
index 9e230d2a..bafd568a 100644
--- a/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml
@@ -5,3 +5,4 @@ logLevel: debug
 
 dashboards:
   enabled: true
+  deterministicUid: true
diff --git a/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json b/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json
index b0024d31..584a8c94 100644
--- a/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json
+++ b/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json
@@ -1559,7 +1559,7 @@
   },
   "timezone": "",
   "title": "{{ include "fluent-bit.fullname" . }}",
-  "uid": "d557c8f6-cac1-445f-8ade-4c351a9076b1",
+  "uid": {{ ternary (printf "\"%s\"" (sha1sum (printf "%s-%s" .Release.Namespace (include "fluent-bit.fullname" .)))) "null" .Values.dashboards.deterministicUid }},
   "version": 7,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
index 7f74f4a5..18258a75 100644
--- a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
+++ b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
@@ -119,7 +119,11 @@ containers:
     {{- end }}
 {{- end }}
 {{- if .Values.extraContainers }}
-  {{- toYaml .Values.extraContainers | nindent 2 }}
+  {{- if kindIs "string" .Values.extraContainers }}
+    {{- tpl .Values.extraContainers $ | nindent 2 }}
+  {{- else }}
+    {{-  toYaml .Values.extraContainers | nindent 2 }}
+  {{- end -}}
 {{- end }}
 volumes:
   - name: config
diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml
index d44db638..550ac8fe 100644
--- a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml
@@ -13,6 +13,7 @@ rules:
       - pods
       {{- if .Values.rbac.nodeAccess }}
       - nodes
+      - nodes/metrics
       - nodes/proxy
       {{- end }}
       {{- if .Values.rbac.eventsAccess }}
diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml b/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml
index 3f9c8f70..2a771e69 100644
--- a/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml
@@ -17,6 +17,9 @@ spec:
   {{- if and (eq .Values.service.type "ClusterIP") (.Values.service.clusterIP) }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
+  {{- if .Values.service.externalIPs }}
+  externalIPs: {{- toYaml .Values.service.externalIPs | nindent 4 }}
+  {{- end }}
   {{- if (eq .Values.kind "DaemonSet") }}
   {{- with .Values.service.internalTrafficPolicy }}
   internalTrafficPolicy: {{ . }}
diff --git a/charts/kubezero-logging/charts/fluent-bit/values.yaml b/charts/kubezero-logging/charts/fluent-bit/values.yaml
index 1a60fe7b..d84ab662 100644
--- a/charts/kubezero-logging/charts/fluent-bit/values.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/values.yaml
@@ -101,6 +101,10 @@ service:
 #   prometheus.io/path: "/api/v1/metrics/prometheus"
 #   prometheus.io/port: "2020"
 #   prometheus.io/scrape: "true"
+  externalIPs: []
+  # externalIPs:
+  #  - 2.2.2.2
+
 
 serviceMonitor:
   enabled: false
@@ -178,6 +182,7 @@ dashboards:
   labelValue: 1
   annotations: {}
   namespace: ""
+  deterministicUid: false
 
 lifecycle: {}
 #   preStop:
@@ -314,11 +319,21 @@ envWithTpl: []
 
 envFrom: []
 
+# This supports either a structured array or a templatable string
 extraContainers: []
+
+# Array mode
+# extraContainers:
 #   - name: do-something
 #     image: busybox
 #     command: ['do', 'something']
 
+# String mode
+# extraContainers: |-
+#   - name: do-something
+#     image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}
+#     command: ['kubectl', 'version']
+
 flush: 1
 
 metricsPort: 2020
diff --git a/charts/kubezero-logging/update.sh b/charts/kubezero-logging/update.sh
index 8633929d..16bd05eb 100755
--- a/charts/kubezero-logging/update.sh
+++ b/charts/kubezero-logging/update.sh
@@ -9,7 +9,7 @@ FLUENT_BIT_VERSION=$(yq eval '.dependencies[] | select(.name=="fluent-bit") | .v
 FLUENTD_VERSION=$(yq eval '.dependencies[] | select(.name=="fluentd") | .version' Chart.yaml)
 
 # fluent-bit
-patch_chart fluent-bit
+# patch_chart fluent-bit
 
 # FluentD
 patch_chart fluentd
diff --git a/charts/kubezero-telemetry/README.md b/charts/kubezero-telemetry/README.md
index e7c8610e..d6e7dd06 100644
--- a/charts/kubezero-telemetry/README.md
+++ b/charts/kubezero-telemetry/README.md
@@ -1,6 +1,6 @@
 # kubezero-telemetry
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero Umbrella Chart for OpenTelemetry, Jaeger etc.
 
@@ -19,10 +19,10 @@ Kubernetes: `>= 1.26.0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
-| https://fluent.github.io/helm-charts | fluent-bit | 0.47.1 |
+| https://fluent.github.io/helm-charts | fluent-bit | 0.47.10 |
 | https://fluent.github.io/helm-charts | fluentd | 0.5.2 |
-| https://jaegertracing.github.io/helm-charts | jaeger | 3.1.1 |
-| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.97.1 |
+| https://jaegertracing.github.io/helm-charts | jaeger | 3.3.1 |
+| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.108.0 |
 | https://opensearch-project.github.io/helm-charts/ | data-prepper | 0.1.0 |
 
 ## Values
@@ -170,19 +170,14 @@ Kubernetes: `>= 1.26.0`
 | opensearch.dashboard.istio.url | string | `"telemetry-dashboard.example.com"` |  |
 | opensearch.nodeSets | list | `[]` |  |
 | opensearch.prometheus | bool | `false` |  |
-| opensearch.version | string | `"2.16.0"` |  |
+| opensearch.version | string | `"2.17.0"` |  |
 | opentelemetry-collector.config.exporters.otlp/data-prepper.endpoint | string | `"telemetry-data-prepper:21890"` |  |
 | opentelemetry-collector.config.exporters.otlp/data-prepper.tls.insecure | bool | `true` |  |
 | opentelemetry-collector.config.exporters.otlp/jaeger.endpoint | string | `"telemetry-jaeger-collector:4317"` |  |
 | opentelemetry-collector.config.exporters.otlp/jaeger.tls.insecure | bool | `true` |  |
 | opentelemetry-collector.config.extensions.health_check.endpoint | string | `"${env:MY_POD_IP}:13133"` |  |
-| opentelemetry-collector.config.extensions.memory_ballast | object | `{}` |  |
-| opentelemetry-collector.config.processors.batch | object | `{}` |  |
-| opentelemetry-collector.config.processors.memory_limiter | string | `nil` |  |
-| opentelemetry-collector.config.receivers.jaeger | string | `nil` |  |
 | opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"${env:MY_POD_IP}:4317"` |  |
 | opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"${env:MY_POD_IP}:4318"` |  |
-| opentelemetry-collector.config.receivers.zipkin | string | `nil` |  |
 | opentelemetry-collector.config.service.extensions[0] | string | `"health_check"` |  |
 | opentelemetry-collector.config.service.extensions[1] | string | `"memory_ballast"` |  |
 | opentelemetry-collector.config.service.pipelines.logs | string | `nil` |  |
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml b/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml
deleted file mode 100644
index 4c989883..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-annotations:
-  artifacthub.io/changes: |
-    - kind: changed
-      description: "Updated Fluent Bit OCI image to v3.1.1."
-apiVersion: v1
-appVersion: 3.1.1
-description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD
-  family operating systems.
-home: https://fluentbit.io/
-icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
-keywords:
-- logging
-- fluent-bit
-- fluentd
-maintainers:
-- email: eduardo@calyptia.com
-  name: edsiper
-- email: naseem@transit.app
-  name: naseemkullah
-- email: towmeykaw@gmail.com
-  name: Towmeykaw
-- email: steve.hipwell@gmail.com
-  name: stevehipwell
-name: fluent-bit
-sources:
-- https://github.com/fluent/fluent-bit/
-version: 0.47.1
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/README.md b/charts/kubezero-telemetry/charts/fluent-bit/README.md
deleted file mode 100644
index 6920d3d7..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Fluent Bit Helm chart
-
-[Fluent Bit](https://fluentbit.io) is a fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems.
-
-## Installation
-
-To add the `fluent` helm repo, run:
-
-```sh
-helm repo add fluent https://fluent.github.io/helm-charts
-```
-
-To install a release named `fluent-bit`, run:
-
-```sh
-helm install fluent-bit fluent/fluent-bit
-```
-
-## Chart values
-
-```sh
-helm show values fluent/fluent-bit
-```
-
-## Using Lua scripts
-Fluent Bit allows us to build filter to modify the incoming records using custom [Lua scripts.](https://docs.fluentbit.io/manual/pipeline/filters/lua)
-
-### How to use Lua scripts with this Chart
-
-First, you should add your Lua scripts to `luaScripts` in values.yaml, for example:
-
-```yaml
-luaScripts:
-  filter_example.lua: |
-    function filter_name(tag, timestamp, record)
-        -- put your lua code here.
-    end
-```
-
-After that, the Lua scripts will be ready to be used as filters. So next step is to add your Fluent bit [filter](https://docs.fluentbit.io/manual/concepts/data-pipeline/filter) to `config.filters` in values.yaml, for example:
-
-```yaml
-config:
-  filters: |
-    [FILTER]
-        Name    lua
-        Match   <your-tag>
-        script  /fluent-bit/scripts/filter_example.lua
-        call    filter_name
-```
-Under the hood, the chart will:
-- Create a configmap using `luaScripts`.
-- Add a volumeMounts for each Lua scripts using the path `/fluent-bit/scripts/<script>`.
-- Add the Lua script's configmap as volume to the pod.
-
-### Note
-Remember to set the `script` attribute in the filter using `/fluent-bit/scripts/`, otherwise the file will not be found by fluent bit.
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/ci/ci-values.yaml b/charts/kubezero-telemetry/charts/fluent-bit/ci/ci-values.yaml
deleted file mode 100644
index 9e230d2a..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/ci/ci-values.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-testFramework:
-  enabled: true
-
-logLevel: debug
-
-dashboards:
-  enabled: true
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/dashboards/fluent-bit.json b/charts/kubezero-telemetry/charts/fluent-bit/dashboards/fluent-bit.json
deleted file mode 100644
index 803014fd..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/dashboards/fluent-bit.json
+++ /dev/null
@@ -1,1565 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "prometheus",
-          "uid": "$DS_PROMETHEUS"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "Fluent Bit dashboard.",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "gnetId": null,
-  "graphTooltip": 1,
-  "id": null,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "collapsed": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 45,
-      "panels": [],
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$DS_PROMETHEUS"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "#d44a3a",
-                "value": null
-              },
-              {
-                "color": "#299c46",
-                "value": 0
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 24,
-        "x": 0,
-        "y": 1
-      },
-      "id": 6,
-      "links": [],
-      "maxDataPoints": 100,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "vertical",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(kube_pod_info{job=\"kube-state-metrics\",namespace=\"$namespace\",created_by_kind=\"DaemonSet\",created_by_name=\"$release\"})",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "Active Pods",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(kube_node_status_condition{job=\"kube-state-metrics\",condition=\"Ready\",status=\"true\"})",
-          "interval": "",
-          "legendFormat": "Ready Nodes",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(kube_node_status_condition{job=\"kube-state-metrics\",condition!=\"Ready\",status=\"true\"})",
-          "interval": "",
-          "legendFormat": "Non-Ready Nodes",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "transparent": true,
-      "type": "stat"
-    },
-    {
-      "collapsed": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 4
-      },
-      "id": 43,
-      "panels": [],
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$DS_PROMETHEUS"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Fluent Bit Metrics",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 50,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 5
-      },
-      "id": 2,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_input_bytes_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Input Bytes Processing Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 50,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 5
-      },
-      "id": 9,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_output_proc_bytes_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Output Bytes Processing Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 50,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "rps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 11
-      },
-      "id": 40,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_input_records_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Input Records Processing Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 50,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "rps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 11
-      },
-      "id": 41,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_output_proc_records_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Output Record Processing Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 17
-      },
-      "id": 11,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "mean",
-            "lastNotNull",
-            "max"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_output_retries_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}} Retries to {{name}}` }}",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_output_retries_failed_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}} Failed Retries to {{ name }}` }}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Output Retry/Failed Rates",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "errors/sec"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 17
-      },
-      "id": 10,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_output_errors_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "format": "time_series",
-          "hide": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Output Error Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 23
-      },
-      "id": 54,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_filter_bytes_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "interval": "",
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Filter Bytes",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "rps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 23
-      },
-      "id": 55,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_filter_records_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "interval": "",
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Filter Records",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 31
-      },
-      "id": 48,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_filter_add_records_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "interval": "",
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Filter Add Records",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 31
-      },
-      "id": 47,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(fluentbit_filter_drop_records_total{job=\"$release\",namespace=\"$namespace\"}[5m])) by (pod, name)",
-          "interval": "",
-          "legendFormat": "{{ `{{pod}}/{{name}}` }}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Filter Drop Records",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 39
-      },
-      "id": 53,
-      "panels": [],
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$DS_PROMETHEUS"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Kubernetes Metrics",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byRegexp",
-              "options": "/.* request/"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "#F2CC0C",
-                  "mode": "fixed"
-                }
-              },
-              {
-                "id": "custom.fillOpacity",
-                "value": 0
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 40
-      },
-      "id": 51,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(container_memory_working_set_bytes{job=\"kubelet\",namespace=\"$namespace\",pod=~\"$pod\",container=\"fluent-bit\"}) by (pod)",
-          "interval": "",
-          "legendFormat": "{{ `{{pod}}` }}",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "avg(kube_pod_container_resource_requests{job=\"kube-state-metrics\",namespace=\"$namespace\",pod=~\"$pod\", container=\"fluent-bit\",resource=\"memory\"})",
-          "interval": "",
-          "legendFormat": "request",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Memory Usage",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$DS_PROMETHEUS"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byRegexp",
-              "options": "/.* request/"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "#F2CC0C",
-                  "mode": "fixed"
-                }
-              },
-              {
-                "id": "custom.fillOpacity",
-                "value": 0
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 40
-      },
-      "id": 50,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace=\"$namespace\",pod=~\"$pod\",container=\"fluent-bit\"}) by (pod)",
-          "interval": "",
-          "legendFormat": "{{ `{{ pod }}` }}",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$DS_PROMETHEUS"
-          },
-          "editorMode": "code",
-          "expr": "avg(kube_pod_container_resource_requests{job=\"kube-state-metrics\",namespace=\"$namespace\",pod=~\"$pod\",container=\"fluent-bit\",resource=\"cpu\"})",
-          "interval": "",
-          "legendFormat": "{{ `{{ pod }} request` }}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "CPU Usage",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 38,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "Prometheus",
-          "value": "Prometheus"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "label": "Datasource",
-        "multi": false,
-        "name": "DS_PROMETHEUS",
-        "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "allValue": "$fullname-.*",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "$DS_PROMETHEUS"
-        },
-        "definition": "label_values(kube_pod_info{job=\"kube-state-metrics\",namespace=\"$namespace\",created_by_kind=\"DaemonSet\",created_by_name=\"$release\"},pod)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "pod",
-        "multi": false,
-        "name": "pod",
-        "options": [],
-        "query": {
-          "query": "label_values(kube_pod_info{job=\"kube-state-metrics\",namespace=\"$namespace\",created_by_kind=\"DaemonSet\",created_by_name=\"$release\"},pod)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "hide": 2,
-        "label": "Namespace",
-        "name": "namespace",
-        "query": "{{ .Release.Namespace }}",
-        "skipUrlSync": false,
-        "type": "constant"
-      },
-      {
-        "hide": 2,
-        "label": "Release",
-        "name": "release",
-        "query": "{{ .Release.Name }}",
-        "skipUrlSync": false,
-        "type": "constant"
-      },
-      {
-        "hide": 2,
-        "label": "Full Name",
-        "name": "fullname",
-        "query": "{{ include "fluent-bit.fullname" . }}",
-        "skipUrlSync": false,
-        "type": "constant"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "{{ include "fluent-bit.fullname" . }}",
-  "uid": null,
-  "version": 7,
-  "weekStart": ""
-}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/NOTES.txt b/charts/kubezero-telemetry/charts/fluent-bit/templates/NOTES.txt
deleted file mode 100644
index 7e09ee62..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/NOTES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Get Fluent Bit build information by running these commands:
-
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "fluent-bit.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 2020:2020
-curl http://127.0.0.1:2020 
-
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/_helpers.tpl b/charts/kubezero-telemetry/charts/fluent-bit/templates/_helpers.tpl
deleted file mode 100644
index 84a30563..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/_helpers.tpl
+++ /dev/null
@@ -1,138 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "fluent-bit.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "fluent-bit.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "fluent-bit.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "fluent-bit.labels" -}}
-helm.sh/chart: {{ include "fluent-bit.chart" . }}
-{{ include "fluent-bit.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "fluent-bit.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "fluent-bit.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "fluent-bit.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "fluent-bit.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Fluent-bit image with tag/digest
-*/}}
-{{- define "fluent-bit.image" -}}
-{{- $tag := ternary "" (printf ":%s" (toString .tag)) (or (empty .tag) (eq "-" (toString .tag))) -}}
-{{- $digest := ternary "" (printf "@%s" .digest) (empty .digest) -}}
-{{- printf "%s%s%s" .repository $tag $digest -}}
-{{- end -}}
-
-{{/*
-Ingress ApiVersion according k8s version
-*/}}
-{{- define "fluent-bit.ingress.apiVersion" -}}
-{{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion) -}}
-networking.k8s.io/v1
-{{- else if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1") (semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion) -}}
-networking.k8s.io/v1beta1
-{{- else -}}
-extensions/v1beta1
-{{- end }}
-{{- end }}
-
-{{/*
-Return if ingress is stable.
-*/}}
-{{- define "fluent-bit.ingress.isStable" -}}
-  {{- eq (include "fluent-bit.ingress.apiVersion" .) "networking.k8s.io/v1" -}}
-{{- end -}}
-{{/*
-Return if ingress supports ingressClassName.
-*/}}
-{{- define "fluent-bit.ingress.supportsIngressClassName" -}}
-  {{- or (eq (include "fluent-bit.ingress.isStable" .) "true") (and (eq (include "fluent-bit.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) -}}
-{{- end -}}
-{{/*
-Return if ingress supports pathType.
-*/}}
-{{- define "fluent-bit.ingress.supportsPathType" -}}
-  {{- or (eq (include "fluent-bit.ingress.isStable" .) "true") (and (eq (include "fluent-bit.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) -}}
-{{- end -}}
-
-{{/*
-Pdb apiVersion according k8s version and capabilities
-*/}}
-{{- define "fluent-bit.pdb.apiVersion" -}}
-{{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion) -}}
-policy/v1
-{{- else -}}
-policy/v1beta1
-{{- end }}
-{{- end -}}
-
-{{/*
-HPA ApiVersion according k8s version
-Check legacy first so helm template / kustomize will default to latest version
-*/}}
-{{- define "fluent-bit.hpa.apiVersion" -}}
-{{- if and (.Capabilities.APIVersions.Has "autoscaling/v2beta2") (semverCompare "<1.23-0" .Capabilities.KubeVersion.GitVersion) -}}
-autoscaling/v2beta2
-{{- else -}}
-autoscaling/v2
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of OpenShift SecurityContextConstraints to use
-*/}}
-{{- define "fluent-bit.openShiftSccName" -}}
-{{- if not .Values.openShift.securityContextConstraints.create -}}
-{{- printf "%s" .Values.openShift.securityContextConstraints.existingName -}}
-{{- else -}}
-{{- printf "%s" (default (include "fluent-bit.fullname" .) .Values.openShift.securityContextConstraints.name) -}}
-{{- end -}}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-telemetry/charts/fluent-bit/templates/_pod.tpl
deleted file mode 100644
index 18258a75..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/_pod.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-{{- define "fluent-bit.pod" -}}
-serviceAccountName: {{ include "fluent-bit.serviceAccountName" . }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- if .Values.priorityClassName }}
-priorityClassName: {{ .Values.priorityClassName }}
-{{- end }}
-{{- with .Values.podSecurityContext }}
-securityContext:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.terminationGracePeriodSeconds }}
-terminationGracePeriodSeconds: {{ . }}
-{{- end }}
-hostNetwork: {{ .Values.hostNetwork }}
-dnsPolicy: {{ .Values.dnsPolicy }}
-{{- with .Values.dnsConfig }}
-dnsConfig:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.hostAliases }}
-hostAliases:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.initContainers }}
-initContainers:
-{{- if kindIs "string" . }}
-  {{- tpl . $ | nindent 2 }}
-{{- else }}
-  {{-  toYaml . | nindent 2 }}
-{{- end -}}
-{{- end }}
-containers:
-  - name: {{ .Chart.Name }}
-  {{- with .Values.securityContext }}
-    securityContext:
-      {{- toYaml . | nindent 6 }}
-  {{- end }}
-    image: {{ include "fluent-bit.image" (merge .Values.image (dict "tag" (default .Chart.AppVersion .Values.image.tag))) | quote }}
-    imagePullPolicy: {{ .Values.image.pullPolicy }}
-  {{- if or .Values.env .Values.envWithTpl }}
-    env:
-    {{- with .Values.env }}
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- range $item := .Values.envWithTpl }}
-      - name: {{ $item.name }}
-        value: {{ tpl $item.value $ | quote }}
-    {{- end }}
-  {{- end }}
-  {{- if .Values.envFrom }}
-    envFrom:
-      {{- toYaml .Values.envFrom | nindent 6 }}
-  {{- end }}
-  {{- with .Values.command }}
-    command:
-      {{- toYaml . | nindent 6 }}
-  {{- end }}
-  {{- if or .Values.args .Values.hotReload.enabled }}
-    args:
-      {{- toYaml .Values.args | nindent 6 }}
-    {{- if .Values.hotReload.enabled }}
-      - --enable-hot-reload
-    {{- end }}
-  {{- end}}
-    ports:
-      - name: http
-        containerPort: {{ .Values.metricsPort }}
-        protocol: TCP
-    {{- if .Values.extraPorts }}
-      {{- range .Values.extraPorts }}
-      - name: {{ .name }}
-        containerPort: {{ .containerPort }}
-        protocol: {{ .protocol }}
-      {{- end }}
-    {{- end }}
-  {{- with .Values.lifecycle }}
-    lifecycle:
-      {{- toYaml . | nindent 6 }}
-  {{- end }}
-    livenessProbe:
-      {{- toYaml .Values.livenessProbe | nindent 6 }}
-    readinessProbe:
-      {{- toYaml .Values.readinessProbe | nindent 6 }}
-  {{- with .Values.resources }}
-    resources:
-      {{- toYaml . | nindent 6 }}
-  {{- end }}
-    volumeMounts:
-      - name: config
-        mountPath: /fluent-bit/etc/conf
-    {{- if or .Values.luaScripts .Values.hotReload.enabled }}
-      - name: luascripts
-        mountPath: /fluent-bit/scripts
-    {{- end }}
-    {{- if eq .Values.kind "DaemonSet" }}
-      {{- toYaml .Values.daemonSetVolumeMounts | nindent 6 }}
-    {{- end }}
-    {{- if .Values.extraVolumeMounts }}
-      {{- toYaml .Values.extraVolumeMounts | nindent 6 }}
-    {{- end }}
-{{- if .Values.hotReload.enabled }}
-  - name: reloader
-    image: {{ include "fluent-bit.image" .Values.hotReload.image }}
-    args:
-      - {{ printf "-webhook-url=http://localhost:%s/api/v2/reload" (toString .Values.metricsPort) }}
-      - -volume-dir=/watch/config
-      - -volume-dir=/watch/scripts
-    volumeMounts:
-      - name: config
-        mountPath: /watch/config
-      - name: luascripts
-        mountPath: /watch/scripts
-    {{- with .Values.hotReload.resources }}
-    resources:
-      {{- toYaml . | nindent 12 }}
-    {{- end }}
-{{- end }}
-{{- if .Values.extraContainers }}
-  {{- if kindIs "string" .Values.extraContainers }}
-    {{- tpl .Values.extraContainers $ | nindent 2 }}
-  {{- else }}
-    {{-  toYaml .Values.extraContainers | nindent 2 }}
-  {{- end -}}
-{{- end }}
-volumes:
-  - name: config
-    configMap:
-      name: {{ default (include "fluent-bit.fullname" .) .Values.existingConfigMap }}
-{{- if or .Values.luaScripts .Values.hotReload.enabled }}
-  - name: luascripts
-    configMap:
-      name: {{ include "fluent-bit.fullname" . }}-luascripts
-{{- end }}
-{{- if eq .Values.kind "DaemonSet" }}
-  {{- toYaml .Values.daemonSetVolumes | nindent 2 }}
-{{- end }}
-{{- if .Values.extraVolumes }}
-  {{- toYaml .Values.extraVolumes | nindent 2 }}
-{{- end }}
-{{- with .Values.nodeSelector }}
-nodeSelector:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.affinity }}
-affinity:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.tolerations }}
-tolerations:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrole.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrole.yaml
deleted file mode 100644
index d44db638..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrole.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-{{- if .Values.rbac.create -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-      - pods
-      {{- if .Values.rbac.nodeAccess }}
-      - nodes
-      - nodes/proxy
-      {{- end }}
-      {{- if .Values.rbac.eventsAccess }}
-      - events
-      {{- end }}
-    verbs:
-      - get
-      - list
-      - watch
-  {{- if and .Values.podSecurityPolicy.create (semverCompare "<=1.25-0" .Capabilities.KubeVersion.GitVersion) }}
-  - apiGroups:
-      - policy
-    resources:
-      - podsecuritypolicies
-    resourceNames:
-      - {{ include "fluent-bit.fullname" . }}
-    verbs:
-      - use
-  {{- end }}
-  {{- if .Values.openShift.enabled }}
-  - apiGroups:
-      - security.openshift.io
-    resources:
-      - securitycontextconstraints
-    resourceNames:
-      - {{ include "fluent-bit.openShiftSccName" . }}
-    verbs:
-      - use
-  {{- end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrolebinding.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrolebinding.yaml
deleted file mode 100644
index e4b55b20..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/clusterrolebinding.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- if .Values.rbac.create -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "fluent-bit.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "fluent-bit.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-dashboards.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-dashboards.yaml
deleted file mode 100644
index 8047d51f..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-dashboards.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-{{- if .Values.dashboards.enabled -}}
-{{- range $path, $_ :=  .Files.Glob "dashboards/*.json" }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "fluent-bit.fullname" $ }}-dashboard-{{ trimSuffix ".json" (base $path) }}
-  namespace: {{ default $.Release.Namespace $.Values.dashboards.namespace }}
-  {{- with $.Values.dashboards.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 -}}
-  {{- end }}
-  labels:
-    {{- include "fluent-bit.labels" $ | nindent 4 }}
-    {{ $.Values.dashboards.labelKey }}: {{ $.Values.dashboards.labelValue | quote }}
-data:
-  {{ include "fluent-bit.fullname" $ }}-{{ base $path }}: |
-    {{- tpl ($.Files.Get $path) $ | nindent 4 }}
----
-{{- end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-luascripts.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-luascripts.yaml
deleted file mode 100644
index c9d152c9..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap-luascripts.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if or .Values.luaScripts .Values.hotReload.enabled -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}-luascripts
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-data:
-  {{ range $key, $value := .Values.luaScripts }}
-  {{ $key }}: {{ $value | quote }}
-  {{ end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap.yaml
deleted file mode 100644
index 37821d3c..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/configmap.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- if not .Values.existingConfigMap -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-data:
-  custom_parsers.conf: |
-    {{- (tpl .Values.config.customParsers $) | nindent 4 }}
-  fluent-bit.conf: |
-    {{- (tpl .Values.config.service $)  | nindent 4 }}
-    {{- (tpl .Values.config.inputs $)  | nindent 4 }}
-    {{- (tpl .Values.config.filters $)  | nindent 4 }}
-    {{- (tpl .Values.config.outputs $)  | nindent 4 }}
-  {{- range $key, $val := .Values.config.upstream }}
-  {{ $key }}: |
-    {{- (tpl $val $) | nindent 4 }}
-  {{- end }}
-  {{- range $key, $val := .Values.config.extraFiles }}
-  {{ $key }}: |
-    {{- (tpl $val $) | nindent 4 }}
-  {{- end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/daemonset.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/daemonset.yaml
deleted file mode 100644
index 12570954..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/daemonset.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-{{- if eq .Values.kind "DaemonSet" }}
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "fluent-bit.selectorLabels" . | nindent 6 }}
-  {{- with .Values.updateStrategy }}
-  updateStrategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.minReadySeconds }}
-  minReadySeconds: {{ . }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    {{- if or (not .Values.hotReload.enabled) .Values.podAnnotations }}
-      annotations:
-      {{- if not .Values.hotReload.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-      {{- if .Values.luaScripts }}
-        checksum/luascripts: {{ include (print $.Template.BasePath "/configmap-luascripts.yaml") . | sha256sum }}
-      {{- end }}
-      {{- end }}
-      {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- end }}
-    spec:
-      {{- include "fluent-bit.pod" . | nindent 6 }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/deployment.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/deployment.yaml
deleted file mode 100644
index 7ba61b5f..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{- if eq .Values.kind "Deployment" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  {{- with .Values.updateStrategy }}
-  strategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "fluent-bit.selectorLabels" . | nindent 6 }}
-  {{- with .Values.minReadySeconds }}
-  minReadySeconds: {{ . }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
-      {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if or (not .Values.hotReload.enabled) .Values.podAnnotations }}
-      annotations:
-      {{- if not .Values.hotReload.enabled }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-      {{- if .Values.luaScripts }}
-        checksum/luascripts: {{ include (print $.Template.BasePath "/configmap-luascripts.yaml") . | sha256sum }}
-      {{- end }}
-      {{- end }}
-      {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-    spec:
-      {{- include "fluent-bit.pod" . | nindent 6 }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/ingress.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/ingress.yaml
deleted file mode 100644
index a6ce859b..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/ingress.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-{{- $ingressApiIsStable := eq (include "fluent-bit.ingress.isStable" .) "true" -}}
-{{- $ingressSupportsIngressClassName := eq (include "fluent-bit.ingress.supportsIngressClassName" .) "true" -}}
-{{- $ingressSupportsPathType := eq (include "fluent-bit.ingress.supportsPathType" .) "true" -}}
-{{- $fullName := include "fluent-bit.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-
-{{- if and ( eq .Values.kind "Deployment" ) .Values.ingress.enabled }}
-apiVersion: {{ include "fluent-bit.ingress.apiVersion" . }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-  {{- range $key, $value := . }}
-    {{ printf "%s: %s" $key ((tpl $value $) | quote) }}
-  {{- end }}
-  {{- end }}
-spec:
-  {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-  {{- end -}}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      {{- with .secretName }}
-      secretName: {{ . }}
-      {{- end }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range concat .Values.ingress.hosts .Values.ingress.extraHosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          - path: /
-            {{- if $ingressSupportsPathType }}
-            pathType: Prefix
-            {{- end }}
-            backend:
-              {{- if $ingressApiIsStable }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  {{- if .port }}
-                  number: {{ .port }}
-                  {{- else }}
-                  number: {{ $svcPort }}
-                  {{- end }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              {{- if .port }}
-              servicePort: {{ .port }}
-              {{- else }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-              {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/networkpolicy.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/networkpolicy.yaml
deleted file mode 100644
index aee927cb..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/networkpolicy.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{{- if .Values.networkPolicy.enabled }}
-apiVersion: "networking.k8s.io/v1"
-kind: "NetworkPolicy"
-metadata:
-  name: {{ include "fluent-bit.fullname" . | quote }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-spec:
-  policyTypes:
-    - "Ingress"
-  podSelector:
-    matchLabels:
-      {{- include "fluent-bit.selectorLabels" . | nindent 6 }}
-  ingress:
-    {{- with .Values.networkPolicy.ingress }}
-    - from:
-        {{- with .from }}{{- . | toYaml | nindent 8 }}{{- else }} []{{- end }}
-      ports:
-        - protocol: "TCP"
-          port: {{ $.Values.service.port }}
-    {{- end }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/pdb.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/pdb.yaml
deleted file mode 100644
index d073f678..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/pdb.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if and  ( eq  .Values.kind "Deployment" )  .Values.podDisruptionBudget.enabled  }}
-apiVersion: {{ include "fluent-bit.pdb.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-{{- with .Values.podDisruptionBudget.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-spec:
-  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
-  selector:
-    matchLabels:
-      {{- include "fluent-bit.selectorLabels" . | nindent 6 }}
-      {{- with .Values.labels }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/prometheusrule.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/prometheusrule.yaml
deleted file mode 100644
index 26e92e56..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/prometheusrule.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.prometheusRule.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: PrometheusRule
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ default $.Release.Namespace .Values.prometheusRule.namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-  {{- if .Values.prometheusRule.additionalLabels }}
-    {{- toYaml .Values.prometheusRule.additionalLabels | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.prometheusRule.rules }}
-  groups:
-  - name: {{ template "fluent-bit.name" . }}
-    rules: {{- toYaml .Values.prometheusRule.rules | nindent 4 }}
-{{- end }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/psp.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/psp.yaml
deleted file mode 100644
index 20b38ec9..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/psp.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{- if and .Values.podSecurityPolicy.create (semverCompare "<=1.25-0" .Capabilities.KubeVersion.GitVersion) -}}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-{{- if .Values.podSecurityPolicy.annotations }}
-  annotations:
-    {{- toYaml .Values.podSecurityPolicy.annotations | nindent 4 }}
-{{- end }}
-spec:
-  privileged: false
-  # Required to prevent escalations to root.
-  allowPrivilegeEscalation: false
-  # This is redundant with non-root + disallow privilege escalation,
-  # but we can provide it for defense in depth.
-  requiredDropCapabilities:
-    - ALL
-  volumes:
-    - '*'
-  hostNetwork: {{ .Values.hostNetwork }}
-  hostIPC: false
-  hostPID: false
-  runAsUser:
-    # TODO: Require the container to run without root privileges.
-    rule: 'RunAsAny'
-  seLinux:
-    # This policy assumes the nodes are using AppArmor rather than SELinux.
-    rule: 'RunAsAny'
-  supplementalGroups:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-  fsGroup:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-  readOnlyRootFilesystem: false
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/scc.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/scc.yaml
deleted file mode 100644
index 5c599106..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/scc.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if and .Values.openShift.enabled .Values.openShift.securityContextConstraints.create }}
-apiVersion: security.openshift.io/v1
-kind: SecurityContextConstraints
-metadata:
-  name: {{ include "fluent-bit.openShiftSccName" . }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-  {{- with .Values.openShift.securityContextConstraints.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-allowPrivilegedContainer: true
-allowPrivilegeEscalation: true
-allowHostDirVolumePlugin: true
-defaultAllowPrivilegeEscalation: false
-# forbid host namespaces
-allowHostNetwork: false
-allowHostIPC: false
-allowHostPorts: false
-allowHostPID: false
-allowedCapabilities: []
-forbiddenSysctls:
-  - "*"
-readOnlyRootFilesystem: false
-requiredDropCapabilities:
-  - MKNOD
-runAsUser:
-  type: RunAsAny
-seLinuxContext:
-  type: MustRunAs
-supplementalGroups:
-  type: RunAsAny
-volumes:
-  - configMap
-  - downwardAPI
-  - emptyDir
-  - hostPath
-  - persistentVolumeClaim
-  - projected
-  - secret
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/service.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/service.yaml
deleted file mode 100644
index 2a771e69..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/service.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-    {{- with .Values.service.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.service.type }}
-  {{- if and (eq .Values.service.type "ClusterIP") (.Values.service.clusterIP) }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{- end }}
-  {{- if .Values.service.externalIPs }}
-  externalIPs: {{- toYaml .Values.service.externalIPs | nindent 4 }}
-  {{- end }}
-  {{- if (eq .Values.kind "DaemonSet") }}
-  {{- with .Values.service.internalTrafficPolicy }}
-  internalTrafficPolicy: {{ . }}
-  {{- end }}
-  {{- end }}
-  {{- if (eq .Values.service.type "LoadBalancer")}}
-  {{- with .Values.service.loadBalancerClass}}
-  loadBalancerClass: {{ . }}
-  {{- end }}
-  {{- with .Values.service.loadBalancerSourceRanges}}
-  loadBalancerSourceRanges:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- end }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-      {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
-      nodePort: {{ .Values.service.nodePort }}
-      {{- end }}
-  {{- if .Values.extraPorts }}
-    {{- range .Values.extraPorts }}
-    - name: {{ .name }}
-      targetPort: {{ .name }}
-      protocol: {{ .protocol }}
-      port: {{ .port }}
-      {{- if and (eq $.Values.service.type "NodePort") (.nodePort) }}
-      nodePort: {{ .nodePort }}
-      {{- end }}
-    {{- end }}
-  {{- end }}
-  selector:
-    {{- include "fluent-bit.selectorLabels" . | nindent 4 }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/serviceaccount.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/serviceaccount.yaml
deleted file mode 100644
index 57c4eb99..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "fluent-bit.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end -}}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/servicemonitor.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/servicemonitor.yaml
deleted file mode 100644
index 75ba026d..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "fluent-bit.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-    {{- with .Values.serviceMonitor.selector }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  jobLabel: app.kubernetes.io/instance
-  endpoints:
-    - port: http
-      path: {{ default "/api/v2/metrics/prometheus" .Values.serviceMonitor.path }}
-      {{- with .Values.serviceMonitor.interval }}
-      interval: {{ . }}
-      {{- end }}
-      {{- with .Values.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ . }}
-      {{- end }}
-      {{- with .Values.serviceMonitor.metricRelabelings }}
-      metricRelabelings:
-      {{- if kindIs "string" . }}
-        {{- tpl . $ | nindent 8 }}
-      {{- else }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      {{- with .Values.serviceMonitor.relabelings }}
-      relabelings:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.serviceMonitor.scheme }}
-      scheme: {{ .Values.serviceMonitor.scheme }}
-      {{- end }}
-      {{- if .Values.serviceMonitor.tlsConfig }}
-      tlsConfig:
-        {{- toYaml .Values.serviceMonitor.tlsConfig | nindent 8 }}
-      {{- end }}
-    {{- with .Values.serviceMonitor.additionalEndpoints }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace }}
-  selector:
-    matchLabels:
-      {{- include "fluent-bit.selectorLabels" . | nindent 6 }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/tests/test-connection.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/tests/test-connection.yaml
deleted file mode 100644
index 3d464fa6..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- if .Values.testFramework.enabled }}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "fluent-bit.fullname" . }}-test-connection"
-  namespace: {{ default .Release.Namespace .Values.testFramework.namespace }}
-  labels:
-    helm.sh/chart: {{ include "fluent-bit.chart" . }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  annotations:
-    helm.sh/hook: test
-    helm.sh/hook-delete-policy: hook-succeeded
-spec:
-  containers:
-    - name: wget
-      image: {{ include "fluent-bit.image" .Values.testFramework.image | quote }}
-      imagePullPolicy: {{ .Values.testFramework.image.pullPolicy }}
-      command: ["sh"]
-      args: ["-c", "wget -O- {{ include "fluent-bit.fullname" . }}:{{ .Values.service.port }}"]
-  {{- with .Values.imagePullSecrets }}
-  imagePullSecrets:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  restartPolicy: Never
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/vpa.yaml b/charts/kubezero-telemetry/charts/fluent-bit/templates/vpa.yaml
deleted file mode 100644
index 58dfaa09..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/vpa.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- if and (.Capabilities.APIVersions.Has "autoscaling.k8s.io/v1/VerticalPodAutoscaler") .Values.autoscaling.vpa.enabled }}
-apiVersion: autoscaling.k8s.io/v1
-kind: VerticalPodAutoscaler
-metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
-  {{- with .Values.autoscaling.vpa.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  resourcePolicy:
-    containerPolicies:
-    - containerName: {{ .Chart.Name }}
-      {{- with .Values.autoscaling.vpa.controlledResources }}
-      controlledResources: 
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.autoscaling.vpa.maxAllowed }}
-      maxAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.autoscaling.vpa.minAllowed }}
-      minAllowed:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-  targetRef:
-    apiVersion: apps/v1
-    kind: {{ .Values.kind }}
-    name: {{ include "fluent-bit.fullname" . }}
-  {{- if .Values.autoscaling.vpa.updatePolicy }}
-  updatePolicy:
-    {{- with .Values.autoscaling.vpa.updatePolicy.updateMode }}
-    updateMode: {{ . }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/values.yaml b/charts/kubezero-telemetry/charts/fluent-bit/values.yaml
deleted file mode 100644
index ae242086..00000000
--- a/charts/kubezero-telemetry/charts/fluent-bit/values.yaml
+++ /dev/null
@@ -1,511 +0,0 @@
-# Default values for fluent-bit.
-
-# kind -- DaemonSet or Deployment
-kind: DaemonSet
-
-# replicaCount -- Only applicable if kind=Deployment
-replicaCount: 1
-
-image:
-  repository: cr.fluentbit.io/fluent/fluent-bit
-  # Overrides the image tag whose default is {{ .Chart.AppVersion }}
-  # Set to "-" to not use the default value
-  tag:
-  digest:
-  pullPolicy: IfNotPresent
-
-testFramework:
-  enabled: true
-  namespace:
-  image:
-    repository: busybox
-    pullPolicy: Always
-    tag: latest
-    digest:
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  create: true
-  annotations: {}
-  name:
-
-rbac:
-  create: true
-  nodeAccess: false
-  eventsAccess: false
-
-# Configure podsecuritypolicy
-# Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
-# from Kubernetes 1.25, PSP is deprecated
-# See: https://kubernetes.io/blog/2022/08/23/kubernetes-v1-25-release/#pod-security-changes
-# We automatically disable PSP if Kubernetes version is 1.25 or higher
-podSecurityPolicy:
-  create: false
-  annotations: {}
-
-# OpenShift-specific configuration
-openShift:
-  enabled: false
-  securityContextConstraints:
-    # Create SCC for Fluent-bit and allow use it
-    create: true
-    name: ""
-    annotations: {}
-    # Use existing SCC in cluster, rather then create new one
-    existingName: ""
-
-podSecurityContext: {}
-#   fsGroup: 2000
-
-hostNetwork: false
-dnsPolicy: ClusterFirst
-
-dnsConfig: {}
-#   nameservers:
-#     - 1.2.3.4
-#   searches:
-#     - ns1.svc.cluster-domain.example
-#     - my.dns.search.suffix
-#   options:
-#     - name: ndots
-#       value: "2"
-#     - name: edns0
-
-hostAliases: []
-#   - ip: "1.2.3.4"
-#     hostnames:
-#     - "foo.local"
-#     - "bar.local"
-
-securityContext: {}
-#   capabilities:
-#     drop:
-#     - ALL
-#   readOnlyRootFilesystem: true
-#   runAsNonRoot: true
-#   runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 2020
-  internalTrafficPolicy:
-  loadBalancerClass:
-  loadBalancerSourceRanges: []
-  labels: {}
-  # nodePort: 30020
-  # clusterIP: 172.16.10.1
-  annotations: {}
-#   prometheus.io/path: "/api/v1/metrics/prometheus"
-#   prometheus.io/port: "2020"
-#   prometheus.io/scrape: "true"
-  externalIPs: []
-  # externalIPs:
-  #  - 2.2.2.2
-
-
-serviceMonitor:
-  enabled: false
-  #   namespace: monitoring
-  #   interval: 10s
-  #   scrapeTimeout: 10s
-  #   selector:
-  #    prometheus: my-prometheus
-  #  ## metric relabel configs to apply to samples before ingestion.
-  #  ##
-  #  metricRelabelings:
-  #    - sourceLabels: [__meta_kubernetes_service_label_cluster]
-  #      targetLabel: cluster
-  #      regex: (.*)
-  #      replacement: ${1}
-  #      action: replace
-  #  ## relabel configs to apply to samples after ingestion.
-  #  ##
-  #  relabelings:
-  #    - sourceLabels: [__meta_kubernetes_pod_node_name]
-  #      separator: ;
-  #      regex: ^(.*)$
-  #      targetLabel: nodename
-  #      replacement: $1
-  #      action: replace
-  #  scheme: ""
-  #  tlsConfig: {}
-
-  ## Bear in mind if you want to collect metrics from a different port
-  ## you will need to configure the new ports on the extraPorts property.
-  additionalEndpoints: []
-  # - port: metrics
-  #   path: /metrics
-  #   interval: 10s
-  #   scrapeTimeout: 10s
-  #   scheme: ""
-  #   tlsConfig: {}
-  #   # metric relabel configs to apply to samples before ingestion.
-  #   #
-  #   metricRelabelings:
-  #     - sourceLabels: [__meta_kubernetes_service_label_cluster]
-  #       targetLabel: cluster
-  #       regex: (.*)
-  #       replacement: ${1}
-  #       action: replace
-  #   # relabel configs to apply to samples after ingestion.
-  #   #
-  #   relabelings:
-  #     - sourceLabels: [__meta_kubernetes_pod_node_name]
-  #       separator: ;
-  #       regex: ^(.*)$
-  #       targetLabel: nodename
-  #       replacement: $1
-  #       action: replace
-
-prometheusRule:
-  enabled: false
-#   namespace: ""
-#   additionalLabels: {}
-#   rules:
-#   - alert: NoOutputBytesProcessed
-#     expr: rate(fluentbit_output_proc_bytes_total[5m]) == 0
-#     annotations:
-#       message: |
-#         Fluent Bit instance {{ $labels.instance }}'s output plugin {{ $labels.name }} has not processed any
-#         bytes for at least 15 minutes.
-#       summary: No Output Bytes Processed
-#     for: 15m
-#     labels:
-#       severity: critical
-
-dashboards:
-  enabled: false
-  labelKey: grafana_dashboard
-  labelValue: 1
-  annotations: {}
-  namespace: ""
-
-lifecycle: {}
-#   preStop:
-#     exec:
-#       command: ["/bin/sh", "-c", "sleep 20"]
-
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
-
-readinessProbe:
-  httpGet:
-    path: /api/v1/health
-    port: http
-
-resources: {}
-#   limits:
-#     cpu: 100m
-#     memory: 128Mi
-#   requests:
-#     cpu: 100m
-#     memory: 128Mi
-
-## only available if kind is Deployment
-ingress:
-  enabled: false
-  ingressClassName: ""
-  annotations: {}
-  #  kubernetes.io/ingress.class: nginx
-  #  kubernetes.io/tls-acme: "true"
-  hosts: []
-  # - host: fluent-bit.example.tld
-  extraHosts: []
-  # - host: fluent-bit-extra.example.tld
-  ## specify extraPort number
-  #   port: 5170
-  tls: []
-  #  - secretName: fluent-bit-example-tld
-  #    hosts:
-  #      - fluent-bit.example.tld
-
-## only available if kind is Deployment
-autoscaling:
-  vpa:
-    enabled: false
-
-    annotations: {}
-
-    # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
-    controlledResources: []
-
-    # Define the max allowed resources for the pod
-    maxAllowed: {}
-    # cpu: 200m
-    # memory: 100Mi
-    # Define the min allowed resources for the pod
-    minAllowed: {}
-    # cpu: 200m
-    # memory: 100Mi
-
-    updatePolicy:
-      # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
-      # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
-      updateMode: Auto
-
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 3
-  targetCPUUtilizationPercentage: 75
-  #  targetMemoryUtilizationPercentage: 75
-  ## see https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-multiple-metrics-and-custom-metrics
-  customRules: []
-  #     - type: Pods
-  #       pods:
-  #         metric:
-  #           name: packets-per-second
-  #         target:
-  #           type: AverageValue
-  #           averageValue: 1k
-  ## see https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-configurable-scaling-behavior
-  behavior: {}
-#      scaleDown:
-#        policies:
-#          - type: Pods
-#            value: 4
-#            periodSeconds: 60
-#          - type: Percent
-#            value: 10
-#            periodSeconds: 60
-
-## only available if kind is Deployment
-podDisruptionBudget:
-  enabled: false
-  annotations: {}
-  maxUnavailable: "30%"
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-labels: {}
-
-annotations: {}
-
-podAnnotations: {}
-
-podLabels: {}
-
-## How long (in seconds) a pods needs to be stable before progressing the deployment
-##
-minReadySeconds:
-
-## How long (in seconds) a pod may take to exit (useful with lifecycle hooks to ensure lb deregistration is done)
-##
-terminationGracePeriodSeconds:
-
-priorityClassName: ""
-
-env: []
-#  - name: FOO
-#    value: "bar"
-
-# The envWithTpl array below has the same usage as "env", but is using the tpl function to support templatable string.
-# This can be useful when you want to pass dynamic values to the Chart using the helm argument "--set <variable>=<value>"
-# https://helm.sh/docs/howto/charts_tips_and_tricks/#using-the-tpl-function
-envWithTpl: []
-#  - name: FOO_2
-#    value: "{{ .Values.foo2 }}"
-#
-# foo2: bar2
-
-envFrom: []
-
-# This supports either a structured array or a templatable string
-extraContainers: []
-
-# Array mode
-# extraContainers:
-#   - name: do-something
-#     image: busybox
-#     command: ['do', 'something']
-
-# String mode
-# extraContainers: |-
-#   - name: do-something
-#     image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}
-#     command: ['kubectl', 'version']
-
-flush: 1
-
-metricsPort: 2020
-
-extraPorts: []
-#   - port: 5170
-#     containerPort: 5170
-#     protocol: TCP
-#     name: tcp
-#     nodePort: 30517
-
-extraVolumes: []
-
-extraVolumeMounts: []
-
-updateStrategy: {}
-#   type: RollingUpdate
-#   rollingUpdate:
-#     maxUnavailable: 1
-
-# Make use of a pre-defined configmap instead of the one templated here
-existingConfigMap: ""
-
-networkPolicy:
-  enabled: false
-#   ingress:
-#     from: []
-
-luaScripts: {}
-
-## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/configuration-file
-config:
-  service: |
-    [SERVICE]
-        Daemon Off
-        Flush {{ .Values.flush }}
-        Log_Level {{ .Values.logLevel }}
-        Parsers_File /fluent-bit/etc/parsers.conf
-        Parsers_File /fluent-bit/etc/conf/custom_parsers.conf
-        HTTP_Server On
-        HTTP_Listen 0.0.0.0
-        HTTP_Port {{ .Values.metricsPort }}
-        Health_Check On
-
-  ## https://docs.fluentbit.io/manual/pipeline/inputs
-  inputs: |
-    [INPUT]
-        Name tail
-        Path /var/log/containers/*.log
-        multiline.parser docker, cri
-        Tag kube.*
-        Mem_Buf_Limit 5MB
-        Skip_Long_Lines On
-
-    [INPUT]
-        Name systemd
-        Tag host.*
-        Systemd_Filter _SYSTEMD_UNIT=kubelet.service
-        Read_From_Tail On
-
-  ## https://docs.fluentbit.io/manual/pipeline/filters
-  filters: |
-    [FILTER]
-        Name kubernetes
-        Match kube.*
-        Merge_Log On
-        Keep_Log Off
-        K8S-Logging.Parser On
-        K8S-Logging.Exclude On
-
-  ## https://docs.fluentbit.io/manual/pipeline/outputs
-  outputs: |
-    [OUTPUT]
-        Name es
-        Match kube.*
-        Host elasticsearch-master
-        Logstash_Format On
-        Retry_Limit False
-
-    [OUTPUT]
-        Name es
-        Match host.*
-        Host elasticsearch-master
-        Logstash_Format On
-        Logstash_Prefix node
-        Retry_Limit False
-
-  ## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/classic-mode/upstream-servers
-  ## This configuration is deprecated, please use `extraFiles` instead.
-  upstream: {}
-
-  ## https://docs.fluentbit.io/manual/pipeline/parsers
-  customParsers: |
-    [PARSER]
-        Name docker_no_time
-        Format json
-        Time_Keep Off
-        Time_Key time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L
-
-  # This allows adding more files with arbitrary filenames to /fluent-bit/etc/conf by providing key/value pairs.
-  # The key becomes the filename, the value becomes the file content.
-  extraFiles: {}
-#     upstream.conf: |
-#       [UPSTREAM]
-#           upstream1
-#
-#       [NODE]
-#           name       node-1
-#           host       127.0.0.1
-#           port       43000
-#     example.conf: |
-#       [OUTPUT]
-#           Name example
-#           Match foo.*
-#           Host bar
-
-# The config volume is mounted by default, either to the existingConfigMap value, or the default of "fluent-bit.fullname"
-volumeMounts:
-  - name: config
-    mountPath: /fluent-bit/etc/conf
-
-daemonSetVolumes:
-  - name: varlog
-    hostPath:
-      path: /var/log
-  - name: varlibdockercontainers
-    hostPath:
-      path: /var/lib/docker/containers
-  - name: etcmachineid
-    hostPath:
-      path: /etc/machine-id
-      type: File
-
-daemonSetVolumeMounts:
-  - name: varlog
-    mountPath: /var/log
-  - name: varlibdockercontainers
-    mountPath: /var/lib/docker/containers
-    readOnly: true
-  - name: etcmachineid
-    mountPath: /etc/machine-id
-    readOnly: true
-
-command:
-  - /fluent-bit/bin/fluent-bit
-
-args:
-  - --workdir=/fluent-bit/etc
-  - --config=/fluent-bit/etc/conf/fluent-bit.conf
-
-# This supports either a structured array or a templatable string
-initContainers: []
-
-# Array mode
-# initContainers:
-#   - name: do-something
-#     image: bitnami/kubectl:1.22
-#     command: ['kubectl', 'version']
-
-# String mode
-# initContainers: |-
-#   - name: do-something
-#     image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}
-#     command: ['kubectl', 'version']
-
-logLevel: info
-
-hotReload:
-  enabled: false
-  image:
-    repository: ghcr.io/jimmidyson/configmap-reload
-    tag: v0.11.1
-    digest:
-    pullPolicy: IfNotPresent
-  resources: {}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/.helmignore b/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore
similarity index 89%
rename from charts/kubezero-telemetry/charts/fluent-bit/.helmignore
rename to charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore
index 0e8a0eb3..7e03f4bc 100644
--- a/charts/kubezero-telemetry/charts/fluent-bit/.helmignore
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore
@@ -21,3 +21,7 @@
 .idea/
 *.tmproj
 .vscode/
+
+# Ignore unittest
+tests/
+*/__snapshot__/*
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/CONTRIBUTING.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/CONTRIBUTING.md
new file mode 100644
index 00000000..aa0bf266
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Collector Chart Contributing Guide
+
+All changes to the chart require a bump to the version in `chart.yaml`. See the [Contributing Guide](https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/CONTRIBUTING.md#versioning) for our versioning requirements.
+
+Once the chart version is bumped, the examples must be regenerated.  You can regenerate examples by running `make generate-examples CHARTS=opentelemetry-collector`.
+
+## Bumping Default Collector Version
+
+1. Increase the minor version of the chart by one and set the patch version to zero.
+2. Update the chart's `appVersion` to match the new collector version.  This version will be used as the image tag by default.
+3. Review the corresponding release notes in [Collector Core](https://github.com/open-telemetry/opentelemetry-collector/releases), [Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases), and [Collector Releases](https://github.com/open-telemetry/opentelemetry-collector-releases/releases).  If any changes affect the helm charts, adjust the helm chart accordingly.
+4. Run `make generate-examples CHARTS=opentelemetry-collector`.
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml
new file mode 100644
index 00000000..e6e44bcd
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml
@@ -0,0 +1,15 @@
+apiVersion: v2
+appVersion: 0.111.0
+description: OpenTelemetry Collector Helm chart for Kubernetes
+home: https://opentelemetry.io/
+icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
+maintainers:
+- name: dmitryax
+- name: jaronoff97
+- name: TylerHelmuth
+name: opentelemetry-collector
+sources:
+- https://github.com/open-telemetry/opentelemetry-collector
+- https://github.com/open-telemetry/opentelemetry-collector-contrib
+type: application
+version: 0.108.0
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md
new file mode 100644
index 00000000..a085a887
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md
@@ -0,0 +1,251 @@
+# OpenTelemetry Collector Helm Chart
+
+The helm chart installs [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector)
+in kubernetes cluster.
+
+## Prerequisites
+
+- Kubernetes 1.24+
+- Helm 3.9+
+
+## Installing the Chart
+
+Add OpenTelemetry Helm repository:
+
+```console
+helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
+```
+
+To install the chart with the release name my-opentelemetry-collector, run the following command:
+
+```console
+helm install my-opentelemetry-collector open-telemetry/opentelemetry-collector --set mode=<value> --set image.repository="otel/opentelemetry-collector-k8s" --set command.name="otelcol-k8s"
+```
+
+Where the `mode` value needs to be set to one of `daemonset`, `deployment` or `statefulset`.
+
+For an in-depth walk through getting started in Kubernetes using this helm chart, see [OpenTelemetry Kubernetes Getting Started](https://opentelemetry.io/docs/kubernetes/getting-started/).
+
+## Upgrading
+
+See [UPGRADING.md](UPGRADING.md).
+
+## Security Considerations
+
+OpenTelemetry Collector recommends to bind receivers' servers to addresses that limit connections to authorized users.
+For this reason, by default the chart binds all the Collector's endpoints to the pod's IP.
+
+More info is available in the [Security Best Practices docummentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks)
+
+Some care must be taken when using `hostNetwork: true`, as then OpenTelemetry Collector will listen on all the addresses in the host network namespace.
+
+## Configuration
+
+### Default configuration
+
+By default this chart will deploy an OpenTelemetry Collector with three pipelines (logs, metrics and traces)
+and debug exporter enabled by default. The collector can be installed either as daemonset (agent), deployment or stateful set.
+
+*Example*: Install collector as a deployment.
+
+```yaml
+mode: deployment
+```
+
+By default collector has the following receivers enabled:
+
+- **metrics**: OTLP and prometheus. Prometheus is configured only for scraping collector's own metrics.
+- **traces**: OTLP, zipkin and jaeger (thrift and grpc).
+- **logs**: OTLP (to enable container logs, see [Configuration for Kubernetes container logs](#configuration-for-kubernetes-container-logs)).
+
+### Basic Top Level Configuration
+
+The Collector's configuration is set via the `config` section. Default components can be removed with `null`. Remember that lists in helm are not merged, so if you want to modify any default list you must specify all items, including any default items you want to keep.
+
+*Example*: Disable metrics and logs pipelines and non-otlp receivers:
+
+```yaml
+config:
+  receivers:
+    jaeger: null
+    prometheus: null
+    zipkin: null
+  service:
+    pipelines:
+      traces:
+        receivers:
+          - otlp
+      metrics: null
+      logs: null
+```
+
+The chart also provides several presets, detailed below, to help configure important Kubernetes components. For more details on each component, see [Kubernetes Collector Components](https://opentelemetry.io/docs/kubernetes/collector/components/).
+
+### Configuration for Kubernetes Container Logs
+
+The collector can be used to collect logs sent to standard output by Kubernetes containers.
+This feature is disabled by default. It has the following requirements:
+
+- It needs agent collector to be deployed.
+- It requires the [Filelog receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#filelog-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+
+To enable this feature, set the  `presets.logsCollection.enabled` property to `true`.
+Here is an example `values.yaml`:
+
+```yaml
+mode: daemonset
+
+presets:
+  logsCollection:
+    enabled: true
+    includeCollectorLogs: true
+```
+
+The way this feature works is it adds a `filelog` receiver on the `logs` pipeline. This receiver is preconfigured
+to read the files where Kubernetes container runtime writes all containers' console output to.
+
+#### :warning: Warning: Risk of looping the exported logs back into the receiver, causing "log explosion"
+
+The container logs pipeline uses the `debug` exporter by default.
+Paired with the default `filelog` receiver that receives all containers' console output,
+it is easy to accidentally feed the exported logs back into the receiver.
+
+Also note that using the `--verbosity=detailed` option for the `debug` exporter causes it to output
+multiple lines per single received log, which when looped, would amplify the logs exponentially.
+
+To prevent the looping, the default configuration of the receiver excludes logs from the collector's containers.
+
+If you want to include the collector's logs, make sure to replace the `debug` exporter
+with an exporter that does not send logs to collector's standard output.
+
+Here's an example `values.yaml` file that replaces the default `debug` exporter on the `logs` pipeline
+with an `otlphttp` exporter that sends the container logs to `https://example.com:55681` endpoint.
+It also clears the `filelog` receiver's `exclude` property, for collector logs to be included in the pipeline.
+
+```yaml
+mode: daemonset
+
+presets:
+  logsCollection:
+    enabled: true
+    includeCollectorLogs: true
+
+config:
+  exporters:
+    otlphttp:
+      endpoint: https://example.com:55681
+  service:
+    pipelines:
+      logs:
+        exporters:
+          - otlphttp
+```
+
+### Configuration for Kubernetes Attributes Processor
+
+The collector can be configured to add Kubernetes metadata, such as pod name and namespace name, as resource attributes to incoming logs, metrics and traces. 
+
+This feature is disabled by default. It has the following requirements:
+
+- It requires the [Kubernetes Attributes processor](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-attributes-processor) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+
+To enable this feature, set the  `presets.kubernetesAttributes.enabled` property to `true`.
+Here is an example `values.yaml`:
+
+```yaml
+mode: daemonset
+presets:
+  kubernetesAttributes:
+    enabled: true
+    # You can also configure the preset to add all of the associated pod's labels and annotations to you telemetry.
+    # The label/annotation name will become the resource attribute's key.
+    extractAllPodLabels: true
+    extractAllPodAnnotations: true
+```
+
+### Configuration for Retrieving Kubelet Metrics
+
+The collector can be configured to collect node, pod, and container metrics from the API server on a kubelet.
+
+This feature is disabled by default. It has the following requirements:
+
+- It requires the [Kubeletstats receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubeletstats-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+
+To enable this feature, set the  `presets.kubeletMetrics.enabled` property to `true`.
+Here is an example `values.yaml`:
+
+```yaml
+mode: daemonset
+presets:
+  kubeletMetrics:
+    enabled: true
+```
+
+### Configuration for Kubernetes Cluster Metrics
+
+The collector can be configured to collects cluster-level metrics from the Kubernetes API server. A single instance of this receiver can be used to monitor a cluster.
+
+This feature is disabled by default. It has the following requirements:
+
+- It requires the [Kubernetes Cluster receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-cluster-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+- It requires statefulset or deployment mode with a single replica.
+
+To enable this feature, set the  `presets.clusterMetrics.enabled` property to `true`.
+
+Here is an example `values.yaml`:
+
+```yaml
+mode: deployment
+replicaCount: 1
+presets:
+  clusterMetrics:
+    enabled: true
+```
+
+### Configuration for Retrieving Kubernetes Events
+
+The collector can be configured to collect Kubernetes events.
+
+This feature is disabled by default. It has the following requirements:
+
+- It requires [Kubernetes Objects receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-objects-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+
+To enable this feature, set the  `presets.kubernetesEvents.enabled` property to `true`.
+Here is an example `values.yaml`:
+
+```yaml
+mode: deployment
+replicaCount: 1
+presets:
+  kubernetesEvents:
+    enabled: true
+```
+
+### Configuration for Host Metrics
+
+The collector can be configured to collect host metrics for Kubernetes nodes.
+
+This feature is disabled by default. It has the following requirements:
+
+- It requires [Host Metrics receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#host-metrics-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image.
+
+To enable this feature, set the  `presets.hostMetrics.enabled` property to `true`.
+Here is an example `values.yaml`:
+
+```yaml
+mode: daemonset
+presets:
+  hostMetrics:
+    enabled: true
+```
+
+## CRDs
+
+At this time, Prometheus CRDs are supported but other CRDs are not.
+
+### Other configuration options
+
+The [values.yaml](./values.yaml) file contains information about all other configuration
+options for this chart.
+
+For more examples see [Examples](examples).
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md
new file mode 100644
index 00000000..83102433
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md
@@ -0,0 +1,419 @@
+# Upgrade guidelines
+
+These upgrade guidelines only contain instructions for version upgrades which require manual modifications on the user's side.
+If the version you want to upgrade to is not listed here, then there is nothing to do for you.
+Just upgrade and enjoy.
+
+## 0.97.2 to 0.98.0
+
+> [!WARNING]
+> Critical content demanding immediate user attention due to potential risks.
+
+The deprecated memory ballast extension has been removed from the default config. If you depend on this component you must manually configure `config.extensions` and `config.service.extensions` to include the memory ballast extension. Setting `useGOMEMLIMIT` to `false` will no longer keep the memory ballast extension in the rendered collector config.
+
+## 0.88.0 to 0.89.0
+
+> [!WARNING]  
+> Critical content demanding immediate user attention due to potential risks.
+
+As part of working towards using the [OpenTelemetry Collector Kubernetes Distro](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) by default, the chart now requires users to explicitly set an image repository. If you are already explicitly setting an image repository this breaking change does not affect you.
+
+If you are using a OpenTelemetry Community distribution of the Collector we recommend you use `otel/opentelemetry-collector-k8s`, but carefully review the [components included in this distribution](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-k8s/manifest.yaml) to make sure it includes all the components you use in your configuration. In the future this distribution will become the default image used for the chart.
+
+You can use the OpenTelemetry Collector Kubernetes Distro by adding these lines to your values.yaml:
+
+```yaml
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+```
+
+If you want to stick with using the Contrib distribution, add these lines to your values.yaml:
+
+```yaml
+image:
+  repository: "otel/opentelemetry-collector-contrib"
+```
+
+For more details see [#1135](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/1135).
+
+## 0.84.0 to 0.85.0
+
+The `loggingexporter` has been removed from the default configuration. Use the `debugexporter` instead.
+
+## 0.78.2 to 0.78.3
+
+[Update Health Check Extension's endpoints to use Pod IP Instead of 0.0.0.0](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1012)
+
+The [Collector's security guidelines were updated](https://github.com/open-telemetry/opentelemetry-collector/pull/6959) to include containerized environments when discussing safeguards against denial of service attacks.
+To be in compliance with the Collector's security best practices the chart has been updated to use the Collector's pod IP in place of `0.0.0.0`.
+
+The chart will continue to allow complete configuration of the Collector via the `config` field in the values.yaml.  If pod IP does not suite your needs you can use `config` to set something different.
+
+See [Security Best Practices docummentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks) for more details.
+
+## 0.75.1 to 0.76.0
+
+Enable the `useGOMEMLIMIT` feature flag by default. This means by default the chart now does not use the Memory Ballast Extension and any custom configuraiton applied to the Memory Ballast Extension is ignored.
+
+**If you're still interested in using the Memory Ballast Extension set this back to false.**
+
+## 0.69.3 to 0.70.0
+
+The following deprecated fields have been removed.  Please use the new values:
+
+- `extraConfigMapMounts` -> `extraVolumes`
+- `extraHostPathMounts` -> `extraVolumes`
+- `secretMounts` -> `extraVolumes`
+- `containerLogs` -> `presets.logsCollection`
+
+## 0.69.0 to 0.69.1 & 0.69.2
+
+The `loggingexporter` was replaced with the `debugexporter`. This ended up being an accidental breaking change for any user that depended on the default logging exporter config when explicitly listing the logging exporter in an exporter list.
+
+When using versions `0.69.1` or `0.69.2` you should explicitly list the debugging exporter instead of the logging exporter. You other option is to skip these version and use `0.69.3` or newer, which includes the logging exporter configuration.
+
+**The logging exporter will be removed in a future version.** We highly recommend switching to the debug exporter.
+
+## 0.67 to 0.68
+
+The `preset.kubernetesEvents` preset now excludes `DELETED` watch types so that an log is not ingested when Kubernetes deletes an event.
+The intention behind this change is to cleanup the data ingested by the preset as the `DELETED` updated for a Kubernetes Events is
+uninteresting. If you want to keep ingesting `DELETED` updates for Kubernetes Events you will need to configure the `k8sobjectsreceiver` manually.
+
+## 0.62 to 0.63
+
+The `kubernetesAttributes` preset now respects order of processors in logs, metrics and traces pipelines.
+This implicitly might break your pipelines if you relied on having the `k8sAttributes` processor rendered as the first processor but also explicitly listed it in the signal's pipeline somewhere else.
+
+## 0.55.2 to 0.56
+
+The `tpl` function has been added to references of pod labels and ingress hosts. This adds the ability to add some reusability in
+charts values through referencing global values. If you are currently using any `{{ }}` syntax in pod labels or ingress hosts it will now be rendered. To escape existing instances of {{ }}, use {{` <original content> `}}.
+
+```yaml
+global:
+  region: us-east-1
+  environment: stage
+
+# Tests `tpl` function reference used in pod labels and
+# ingress.hosts[*]
+podLabels:
+  environment: "{{ .Values.global.environment }}"
+
+ingress:
+  enabled: true
+  hosts:
+    - host: "otlp-collector-{{ .Values.global.region }}-{{ .Values.global.environment }}-example.dev"
+      paths:
+        - path: /
+          pathType: Prefix
+          port: 4318
+```
+
+Note that only global Helm values can be referenced as the Helm Chart schema currently does not allow `additionalValues`.
+
+## 0.55.0 to 0.55.1
+
+As of v0.55.1 Collector chart use `${env:ENV}` style syntax when getting environment variables and that $`{env:ENV}` syntax is not supported before collector 0.71. If you upgrade collector chart to v0.55.1, you need to make sure your collector version is after than 0.71 (default is v0.76.1).
+
+## 0.53.1 to 0.54.0
+
+As of v0.54.0 Collector chart, the default resource limits are removed. If you want to keep old values you can use the following configuration:
+
+```
+resources:
+  limits:
+    # CPU units are in fractions of 1000; memory in powers of 2
+    cpu: 250m
+    memory: 512Mi
+```
+
+See [the 644 issue](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/644) for more information.
+
+## 0.46.0 to 0.47.0
+
+[Update Collector Endpoints to use Pod IP Instead of 0.0.0.0](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/603)
+
+The [Collector's security guidelines were updated](https://github.com/open-telemetry/opentelemetry-collector/pull/6959) to include containerized environments when discussing safeguards against denial of service attacks.
+To be in compliance with the Collector's security best practices the chart has been updated to use the Collector's pod IP in place of `0.0.0.0`.
+
+The chart will continue to allow complete configuration of the Collector via the `config` field in the values.yaml.  If pod IP does not suite your needs you can use `config` to set something different.
+
+See [Security Best Practices docummentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks) for more details.
+
+The new default of binding to the pod IP, rather than `0.0.0.0`, will cause `kubectl port-forward` to fail. If port-forwarding is desired, the following `value.yaml` snippet will allow the Collector bind to `127.0.0.1` inside the pod, in addition to the pod's IP:
+
+```yaml
+config:
+  receivers:
+    jaeger/local:
+      protocols:
+        grpc:
+          endpoint: 127.0.0.1:14250
+        thrift_compact:
+          endpoint: 127.0.0.1:6831
+        thrift_http:
+          endpoint: 127.0.0.1:14268
+    otlp/local:
+      protocols:
+        grpc:
+          endpoint: 127.0.0.1:4317
+        http:
+          endpoint: 127.0.0.1:4318
+    zipkin/local:
+      endpoint: 127.0.0.1:9411
+  service:
+    pipelines:
+      traces:
+        receivers:
+        - otlp
+        - otlp/local
+        - jaeger
+        - jaeger/local
+        - zipkin
+        - zipkin/local
+```
+
+## 0.40.7 to 0.41.0
+
+[Require Kubernetes version 1.23 or later](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/541)
+
+If you enable use of a _HorizontalPodAutoscaler_ for the collector when running in the "deployment" mode by way of `.Values.autoscaling.enabled`, the manifest now uses the "autoscaling/v2" API group version, which [is available only as recently as Kubernetes version 1.23](https://kubernetes.io/blog/2021/12/07/kubernetes-1-23-release-announcement/#horizontalpodautoscaler-v2-graduates-to-ga). As [all previous versions of this API group are deprecated and removed as of Kubernetes version 1.26](https://kubernetes.io/docs/reference/using-api/deprecation-guide/#horizontalpodautoscaler-v126), we don't offer support for Kubernetes versions older than 1.23.
+
+## 0.34.0 to 0.34.0
+
+[config supports templating](TBD)
+
+The chart now supports templating in `.Values.config`.  If you are currently using any `{{ }}` syntax in `.Values.yaml` it will now be rendered.  To escape existing instances of `{{ }}`, use ``` {{` <original content> `}} ```.  For example, `{{ REDACTED_EMAIL }}` becomes ``` {{` {{ REDACTED_EMAIL }} `}} ```.
+
+## 0.28.0 to 0.29.0
+
+[Reduce requested resources](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/273)
+
+Resource `limits` have been reduced. Upgrades/installs of chart 0.29.0 will now use fewer resources. In order to set the resources back to what they were, you will need to override the `resources` section in the `values.yaml`.
+
+*Example*:
+
+```yaml
+resources:
+  limits:
+    cpu: 1
+    memory: 2Gi
+```
+
+## 0.23.1 to 0.24.0
+
+[Remove containerLogs in favor of presets.logsCollection]()
+
+The ability to enable logs collection from the collector has been moved from `containerLogs.enabled` to `presets.logsCollection.enabled`. If you are currently using `containerLogs.enabled`, you should instead use the preset:
+
+```yaml
+presets:
+  logsCollection:
+    enabled: true
+```
+
+If you are using `containerLogs.enabled` and also enabling collection of the collector logs you can use `includeCollectorLogs`
+
+```yaml
+presets:
+  logsCollection:
+    enabled: true
+    includeCollectorLogs: true
+```
+
+You no longer need to update `config.service.pipelines.logs` to include the filelog receiver yourself as the preset will automatically update the logs pipeline to include the filelog receiver.
+
+The filelog's preset configuration can modified by `config.receivers`, but preset configuration cannot be removed.  If you need to remove any filelog receiver configuration generated by the preset you should not use the preset.  Instead, configure the filelog receiver manually in `config.receivers` and set any other necessary fields in the values.yaml to modify k8s as needed.
+
+See the [daemonset-collector-logs example](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-collector/examples/daemonset-collector-logs) to see an example of the preset in action.
+
+## 0.18.0 to 0.19.0
+
+[Remove agentCollector and standaloneCollector settings](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/216)
+
+The `agentCollector` and `standaloneCollector` config sections have been removed.  Upgrades/installs of chart 0.19.0 will fail if `agentCollector` or `standaloneCollector` are in the values.yaml.  See the [Migrate to mode](#migrate-to-mode) steps for instructions on how to replace `agentCollector` and `standaloneCollector` with `mode`.
+
+## 0.13.0 to 0.14.0
+
+[Remove two-deployment mode](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/159)
+
+The ability to install both the agent and standalone collectors simultaneous with the chart has been removed.  Installs/upgrades where both  `.Values.agentCollector.enabled` and `.Values.standloneCollector.enables` are true will fail.  `agentCollector` and `standloneCollector` have also be deprecated, but backward compatibility has been maintained.
+
+### To run both a deployment and daemonset
+
+Install a deployment version of the collector. This is done by setting `.Values.mode` to `deployment`
+
+```yaml
+mode: deployment
+```
+
+Next, install an daemonset version of the collector that is configured to send traffic to the previously installed deployment.  This is done by setting `.Values.mode` to `daemonset` and updating `.Values.config` so that data is exported to the deployment.
+
+```yaml
+mode: daemonset
+
+config:
+  exporters:
+    otlp:
+      endpoint: example-opentelemetry-collector:4317
+      tls:
+        insecure: true
+  service:
+    pipelines:
+      logs:
+        exporters:
+         - otlp
+         - logging
+      metrics:
+        exporters:
+         - otlp
+         - logging
+      traces:
+        exporters:
+         - otlp
+         - logging
+```
+
+See the [daemonset-and-deployment](examples/daemonset-and-deployment) example to see the rendered config.
+
+### Migrate to `mode`:
+
+The `agentCollector` and `standaloneCollector` sections in values.yaml have been deprecated. Instead there is a new field, `mode`, that determines if the collector is being installed as a daemonset or deployment.
+
+```yaml
+# Valid values are "daemonset" and "deployment".
+# If set, agentCollector and standaloneCollector are ignored.
+mode: <daemonset|deployment>
+```
+
+The following fields have also been added to the root-level to replace the depracated `agentCollector` and `standaloneCollector` settings.
+
+```yaml
+containerLogs:
+  enabled: false
+
+resources:
+  limits:
+    cpu: 1
+    memory: 2Gi
+
+podAnnotations: {}
+
+podLabels: {}
+
+# Host networking requested for this pod. Use the host's network namespace.
+hostNetwork: false
+
+# only used with deployment mode
+replicaCount: 1
+
+annotations: {}
+```
+
+When using `mode`, these settings should be used instead of their counterparts in `agentCollector` and `standaloneCollector`.
+
+Set `mode` to `daemonset` if `agentCollector` was being used.  Move all `agentCollector` settings to the corresponding root-level setting.  If `agentCollector.configOverride` was being used, merge the settings with `.Values.config`.
+
+Example agentCollector values.yaml:
+
+```yaml
+agentCollector:
+  resources:
+    limits:
+      cpu: 3
+      memory: 6Gi
+  configOverride:
+    receivers:
+      hostmetrics:
+        scrapers:
+          cpu:
+          disk:
+          filesystem:
+    service:
+      pipelines:
+        metrics:
+          receivers: [otlp, prometheus, hostmetrics]
+```
+
+Example mode values.yaml:
+
+```yaml
+mode: daemonset
+
+resources:
+  limits:
+    cpu: 3
+    memory: 6Gi
+
+config:
+  receivers:
+    hostmetrics:
+      scrapers:
+        cpu:
+        disk:
+        filesystem:
+  service:
+    pipelines:
+      metrics:
+        receivers: [otlp, prometheus, hostmetrics]
+```
+
+Set `mode` to `deployment` if `standaloneCollector` was being used.  Move all `standaloneCollector` settings to the corresponding root-level setting.  If `standaloneCollector.configOverride` was being used, merge the settings with `.Values.config`.
+
+Example standaloneCollector values.yaml:
+
+```yaml
+standaloneCollector:
+  enabled: true
+  replicaCount: 2
+  configOverride:
+    receivers:
+      podman_stats:
+        endpoint: unix://run/podman/podman.sock
+        timeout: 10s
+        collection_interval: 10s
+    service:
+      pipelines:
+        metrics:
+          receivers: [otlp, prometheus, podman_stats]
+```
+
+Example mode values.yaml:
+
+```yaml
+mode: deployment
+
+replicaCount: 2
+
+config:
+  receivers:
+    receivers:
+      podman_stats:
+        endpoint: unix://run/podman/podman.sock
+        timeout: 10s
+        collection_interval: 10s
+  service:
+    pipelines:
+      metrics:
+        receivers: [otlp, prometheus, podman_stats]
+```
+
+Default configuration in `.Values.config` can now be removed with `null`.  When changing a pipeline, you must explicitly list all the components that are in the pipeline, including any default components.
+
+*Example*: Disable metrics and logging pipelines and non-otlp receivers:
+
+```yaml
+config:
+  receivers:
+    jaeger: null
+    prometheus: null
+    zipkin: null
+  service:
+    pipelines:
+      traces:
+        receivers:
+          - otlp
+      metrics: null
+      logs: null
+```
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml
new file mode 100644
index 00000000..cc0570fe
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml
@@ -0,0 +1,9 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+useGOMEMLIMIT: true
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml
new file mode 100644
index 00000000..01acd446
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml
@@ -0,0 +1,27 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+clusterRole:
+  create: true
+  name: "testing-clusterrole"
+  rules:
+    - apiGroups:
+      - ''
+      resources:
+      - 'pods'
+      - 'nodes'
+      verbs:
+      - 'get'
+      - 'list'
+      - 'watch'
+  clusterRoleBinding:
+    name: "testing-clusterrolebinding"
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml
new file mode 100644
index 00000000..577cf4d2
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml
@@ -0,0 +1,26 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+config:
+  receivers:
+    jaeger: null
+    otlp: null
+    zipkin: null
+    hostmetrics:
+      scrapers:
+        cpu:
+        disk:
+        filesystem:
+  service:
+    pipelines:
+      metrics:
+        receivers:
+          - prometheus
+          - hostmetrics
+      traces: null
+      logs: null
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml
new file mode 100644
index 00000000..0f1d6190
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml
@@ -0,0 +1,12 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml
new file mode 100644
index 00000000..447a3f13
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml
@@ -0,0 +1,29 @@
+global:
+  test: templated-value
+
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+# Tests `tpl` function reference used in pod labels and
+# ingress.hosts[*]
+podLabels:
+  testLabel: "{{ .Values.global.test }}"
+
+ingress:
+  enabled: true
+  hosts:
+    - host: "{{ .Values.global.test }}"
+      paths:
+        - path: /
+          pathType: Prefix
+          port: 4318
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml
new file mode 100644
index 00000000..b7a67bdf
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml
@@ -0,0 +1,21 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+ports:
+  jaeger-compact:
+    enabled: false
+  jaeger-thrift:
+    enabled: false
+  jaeger-grpc:
+    enabled: false
+  zipkin:
+    enabled: false
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml
new file mode 100644
index 00000000..3fe38538
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml
@@ -0,0 +1,15 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 10
+  behavior: {}
+  targetCPUUtilizationPercentage: 80
+  targetMemoryUtilizationPercentage: 80
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml
new file mode 100644
index 00000000..cbf3c605
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml
@@ -0,0 +1,15 @@
+mode: statefulset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 10
+  behavior: {}
+  targetCPUUtilizationPercentage: 80
+  targetMemoryUtilizationPercentage: 80
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml
new file mode 100644
index 00000000..4b9df752
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml
@@ -0,0 +1,49 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+ingress:
+  enabled: true
+
+  ingressClassName: nginx
+  annotations:
+    test.io/collector: default
+  hosts:
+    - host: defaultcollector.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+          port: 4318
+
+  additionalIngresses:
+    - name: additional-basic
+      hosts:
+        - host: additional-basic.example.com
+          paths:
+            - path: /
+              pathType: Prefix
+              port: 4318
+
+    - name: additional-advanced
+      ingressClassName: nginx
+      annotations:
+        test.io/ingress: additional-advanced
+      hosts:
+        - host: additional-advanced.example.com
+          paths:
+            - path: /
+              pathType: Exact
+              port: 4318
+      tls:
+        - secretName: somesecret
+          hosts:
+            - additional-advanced.example.com
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml
new file mode 100644
index 00000000..d08d368c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml
@@ -0,0 +1,37 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+networkPolicy:
+  enabled: true
+
+  allowIngressFrom:
+    - namespaceSelector: {}
+    - ipBlock:
+        cidr: 127.0.0.1/32
+
+  extraIngressRules:
+    - ports:
+      - port: metrics
+        protocol: TCP
+      from:
+        - ipBlock:
+            cidr: 127.0.0.1/32
+
+  egressRules:
+    - to:
+        - podSelector:
+            matchLabels:
+              app: jaeger
+      ports:
+        - port: 4317
+          protocol: TCP
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml
new file mode 100644
index 00000000..7e80cb47
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml
@@ -0,0 +1,15 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+networkPolicy:
+  enabled: true
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml
new file mode 100644
index 00000000..8c21aeb3
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml
@@ -0,0 +1,16 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  clusterMetrics:
+    enabled: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml
new file mode 100644
index 00000000..4889c014
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml
@@ -0,0 +1,16 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  hostMetrics:
+    enabled: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml
new file mode 100644
index 00000000..65782919
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml
@@ -0,0 +1,16 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  kubernetesEvents:
+    enabled: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml
new file mode 100644
index 00000000..83dd9cab
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml
@@ -0,0 +1,16 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  kubeletMetrics:
+    enabled: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml
new file mode 100644
index 00000000..ef32ac98
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml
@@ -0,0 +1,16 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  kubernetesAttributes:
+    enabled: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml
new file mode 100644
index 00000000..1dd9a8e5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml
@@ -0,0 +1,17 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  logsCollection:
+    enabled: true
+    includeCollectorLogs: true
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml
new file mode 100644
index 00000000..60600dc1
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml
@@ -0,0 +1,37 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+livenessProbe:
+  initialDelaySeconds: 10
+  periodSeconds: 5
+  timeoutSeconds: 3
+  failureThreshold: 2
+  terminationGracePeriodSeconds: 40
+  httpGet:
+    port: 8989
+    path: /healthz
+
+readinessProbe:
+  initialDelaySeconds: 10
+  periodSeconds: 5
+  timeoutSeconds: 3
+  successThreshold: 2
+  failureThreshold: 2
+  httpGet:
+    port: 8989
+    path: /healthz
+
+startupProbe:
+  initialDelaySeconds: 10
+  periodSeconds: 5
+  timeoutSeconds: 3
+  failureThreshold: 10
+  terminationGracePeriodSeconds: 40
+  httpGet:
+    port: 8989
+    path: /healthz
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml
new file mode 100644
index 00000000..76de30c7
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml
@@ -0,0 +1,13 @@
+mode: statefulset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+replicaCount: 2
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md
new file mode 100644
index 00000000..8f2ac4c2
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md
@@ -0,0 +1,17 @@
+# Examples of chart configuration
+
+Here is a collection of common configurations for the OpenTelemetry collector. Each folder contains an example `values.yaml` and the resulting configurations that are generated by the opentelemetry-collector helm charts.
+
+- [Daemonset only](daemonset-only)
+- [Deployment only](deployment-only)
+- [Daemonset and deployment](daemonset-and-deployment)
+- [Log collection, including collector logs](daemonset-collector-logs)
+- [Add component (hostmetrics)](daemonset-hostmetrics)
+
+The manifests are rendered using the `helm template` command and the specific example folder's values.yaml.
+
+Examples are generated by (from root of the repo):
+
+```sh
+make generate-examples CHARTS=opentelemetry-collector
+```
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml
new file mode 100644
index 00000000..1e78af46
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml
@@ -0,0 +1,41 @@
+---
+# Source: opentelemetry-collector/templates/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: example-opentelemetry-collector
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+rules:
+  - apiGroups: [""]
+    resources: ["pods", "namespaces"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["events", "namespaces", "namespaces/status", "nodes", "nodes/spec", "pods", "pods/status", "replicationcontrollers", "replicationcontrollers/status", "resourcequotas", "services" ]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["apps"]
+    resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["daemonsets", "deployments", "replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["batch"]
+    resources: ["jobs", "cronjobs"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["autoscaling"]
+    resources: ["horizontalpodautoscalers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["events.k8s.io"]
+    resources: ["events"]
+    verbs: ["watch", "list"]
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml
new file mode 100644
index 00000000..3f14fb34
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml
@@ -0,0 +1,21 @@
+---
+# Source: opentelemetry-collector/templates/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: example-opentelemetry-collector
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: example-opentelemetry-collector
+subjects:
+- kind: ServiceAccount
+  name: example-opentelemetry-collector
+  namespace: default
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml
new file mode 100644
index 00000000..41ae5379
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml
@@ -0,0 +1,68 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    processors:
+      k8sattributes:
+        extract:
+          metadata:
+          - k8s.namespace.name
+          - k8s.deployment.name
+          - k8s.statefulset.name
+          - k8s.daemonset.name
+          - k8s.cronjob.name
+          - k8s.job.name
+          - k8s.node.name
+          - k8s.pod.name
+          - k8s.pod.uid
+          - k8s.pod.start_time
+        passthrough: false
+        pod_association:
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: connection
+    receivers:
+      k8s_cluster:
+        collection_interval: 10s
+      k8sobjects:
+        objects:
+        - exclude_watch_type:
+          - DELETED
+          group: events.k8s.io
+          mode: watch
+          name: events
+    service:
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - k8sattributes
+          receivers:
+          - k8sobjects
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - k8sattributes
+          receivers:
+          - k8s_cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml
new file mode 100644
index 00000000..e6a0c233
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml
@@ -0,0 +1,100 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 360fc84164ca26f5a57ecb44cbcec02ca473b09fc86dba876f71c9fa3617f656
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "3276MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 2
+              memory: 4Gi
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/values.yaml
new file mode 100644
index 00000000..e0f6a5fd
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/values.yaml
@@ -0,0 +1,34 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+replicaCount: 1
+
+resources:
+  limits:
+    cpu: 2
+    memory: 4Gi
+
+presets:
+  clusterMetrics:
+    enabled: true
+  kubernetesAttributes:
+    enabled: true
+  kubernetesEvents:
+    enabled: true
+
+alternateConfig:
+  exporters:
+    debug: {}
+  service:
+    pipelines:
+      logs:
+        exporters:
+          - debug
+      metrics:
+        exporters: 
+          - debug
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml
new file mode 100644
index 00000000..5b21b7bb
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml
@@ -0,0 +1,34 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+config:
+  exporters:
+    otlp:
+      endpoint: example-opentelemetry-collector:4317
+      tls:
+        insecure: true
+  service:
+    pipelines:
+      logs:
+        exporters:
+         - otlp
+         - debug
+      metrics:
+        exporters:
+         - otlp
+         - debug
+      traces:
+        exporters:
+         - otlp
+         - debug
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml
new file mode 100644
index 00000000..1c80d158
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml
@@ -0,0 +1,13 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
new file mode 100644
index 00000000..c606f8b5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
@@ -0,0 +1,93 @@
+---
+# Source: opentelemetry-collector/templates/configmap-agent.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+      otlp:
+        endpoint: example-opentelemetry-collector:4317
+        tls:
+          insecure: true
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - otlp
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - otlp
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - otlp
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
new file mode 100644
index 00000000..c16fb522
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
new file mode 100644
index 00000000..89d3d2e5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
@@ -0,0 +1,104 @@
+---
+# Source: opentelemetry-collector/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: agent-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: a2d0d31bd929305e52879f78f502d56ad49d9ef9396838490646e9034d2243de
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: agent-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+              hostPort: 6831
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+              hostPort: 14250
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+              hostPort: 14268
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+              hostPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+              hostPort: 4318
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+              hostPort: 9411
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-agent
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
new file mode 100644
index 00000000..a5da929b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
@@ -0,0 +1,100 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
new file mode 100644
index 00000000..9b7052f6
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
@@ -0,0 +1,100 @@
+---
+# Source: opentelemetry-collector/templates/configmap-agent.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      filelog:
+        exclude: []
+        include:
+        - /var/log/pods/*/*/*.log
+        include_file_name: false
+        include_file_path: true
+        operators:
+        - id: container-parser
+          max_log_size: 102400
+          type: container
+        retry_on_failure:
+          enabled: true
+        start_at: end
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - filelog
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
new file mode 100644
index 00000000..5490aa7c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
@@ -0,0 +1,110 @@
+---
+# Source: opentelemetry-collector/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: agent-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 5237e54a1cdaad762876da10a5bab6f686506211aaa2c70b901a74fec8b82140
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: agent-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+              hostPort: 6831
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+              hostPort: 14250
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+              hostPort: 14268
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+              hostPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+              hostPort: 4318
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+              hostPort: 9411
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+            - name: varlogpods
+              mountPath: /var/log/pods
+              readOnly: true
+            - name: varlibdockercontainers
+              mountPath: /var/lib/docker/containers
+              readOnly: true
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-agent
+            items:
+              - key: relay
+                path: relay.yaml
+        - name: varlogpods
+          hostPath:
+            path: /var/log/pods
+        - name: varlibdockercontainers
+          hostPath:
+            path: /var/lib/docker/containers
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml
new file mode 100644
index 00000000..085361ed
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml
@@ -0,0 +1,12 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  logsCollection:
+    enabled: true
+    includeCollectorLogs: true
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
new file mode 100644
index 00000000..c6cefe66
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
@@ -0,0 +1,133 @@
+---
+# Source: opentelemetry-collector/templates/configmap-agent.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      hostmetrics:
+        collection_interval: 10s
+        root_path: /hostfs
+        scrapers:
+          cpu: null
+          disk: null
+          filesystem:
+            exclude_fs_types:
+              fs_types:
+              - autofs
+              - binfmt_misc
+              - bpf
+              - cgroup2
+              - configfs
+              - debugfs
+              - devpts
+              - devtmpfs
+              - fusectl
+              - hugetlbfs
+              - iso9660
+              - mqueue
+              - nsfs
+              - overlay
+              - proc
+              - procfs
+              - pstore
+              - rpc_pipefs
+              - securityfs
+              - selinuxfs
+              - squashfs
+              - sysfs
+              - tracefs
+              match_type: strict
+            exclude_mount_points:
+              match_type: regexp
+              mount_points:
+              - /dev/*
+              - /proc/*
+              - /sys/*
+              - /run/k3s/containerd/*
+              - /var/lib/docker/*
+              - /var/lib/kubelet/*
+              - /snap/*
+          load: null
+          memory: null
+          network: null
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+          - hostmetrics
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
new file mode 100644
index 00000000..8163477b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
@@ -0,0 +1,105 @@
+---
+# Source: opentelemetry-collector/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: agent-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 98dea268c8a8fe987e082a4e85801387f2b60fefc281f9b1edd1080f0af62574
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: agent-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+              hostPort: 6831
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+              hostPort: 14250
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+              hostPort: 14268
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+              hostPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+              hostPort: 4318
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+              hostPort: 9411
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+            - name: hostfs
+              mountPath: /hostfs
+              readOnly: true
+              mountPropagation: HostToContainer
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-agent
+            items:
+              - key: relay
+                path: relay.yaml
+        - name: hostfs
+          hostPath:
+            path: /
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml
new file mode 100644
index 00000000..10dd2576
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml
@@ -0,0 +1,12 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  hostMetrics:
+    enabled: true
+
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
new file mode 100644
index 00000000..14ebd417
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap-agent.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
new file mode 100644
index 00000000..6b09682d
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
@@ -0,0 +1,119 @@
+---
+# Source: opentelemetry-collector/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: agent-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: c81f167b09355b9a9b3d7e1a4f994dfb1ef88379ded1a4b902cd4a2ace196a79
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: agent-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+              hostPort: 6831
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+              hostPort: 14250
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+              hostPort: 14268
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+              hostPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+              hostPort: 4318
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+              hostPort: 9411
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                - /test/sleep
+                - "5"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+            - mountPath: /test
+              name: test
+      initContainers:
+        - args:
+          - /bin/sleep
+          - /test/sleep
+          command:
+          - cp
+          image: 'busybox:latest'
+          name: test
+          volumeMounts:
+          - mountPath: /test
+            name: test
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-agent
+            items:
+              - key: relay
+                path: relay.yaml
+        - emptyDir: {}
+          name: test
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
new file mode 100644
index 00000000..58acddac
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml
@@ -0,0 +1,37 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+global:
+  image: busybox:latest
+initContainers:
+  - name: test
+    command:
+      - cp
+    args:
+      - /bin/sleep
+      - /test/sleep
+    image: "{{ .Values.global.image }}"
+    volumeMounts:
+      - name: test
+        mountPath: /test
+
+extraVolumes:
+  - name: test
+    emptyDir: {}
+
+extraVolumeMounts:
+  - name: test
+    mountPath: /test
+
+lifecycleHooks:
+  preStop:
+    exec:
+      command:
+      - /test/sleep
+      - "5"
+
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
new file mode 100644
index 00000000..14ebd417
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap-agent.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
new file mode 100644
index 00000000..535b458a
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
@@ -0,0 +1,98 @@
+---
+# Source: opentelemetry-collector/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: example-opentelemetry-collector-agent
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: agent-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: c81f167b09355b9a9b3d7e1a4f994dfb1ef88379ded1a4b902cd4a2ace196a79
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: agent-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+              hostPort: 6831
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+              hostPort: 14250
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+              hostPort: 14268
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+              hostPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+              hostPort: 4318
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+              hostPort: 9411
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-agent
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/values.yaml
new file mode 100644
index 00000000..71002cc6
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/values.yaml
@@ -0,0 +1,7 @@
+mode: daemonset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
new file mode 100644
index 00000000..c16fb522
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
new file mode 100644
index 00000000..2425fd5c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
@@ -0,0 +1,100 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 3
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "3276MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 2
+              memory: 4Gi
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/values.yaml
new file mode 100644
index 00000000..91820513
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/values.yaml
@@ -0,0 +1,14 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+replicaCount: 3
+
+resources:
+  limits:
+    cpu: 2
+    memory: 4Gi
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
new file mode 100644
index 00000000..b2a37412
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
new file mode 100644
index 00000000..b42bda27
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
@@ -0,0 +1,82 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 09d236d9b1f430ef0e0c20f6667eb2f1d17c9f550a8648c0bc86ecf703089397
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
new file mode 100644
index 00000000..38e16e6d
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
@@ -0,0 +1,33 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml
new file mode 100644
index 00000000..3297147a
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml
@@ -0,0 +1,30 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+ports:
+  jaeger-compact:
+    enabled: false
+  jaeger-thrift:
+    enabled: false
+  jaeger-grpc:
+    enabled: false
+  zipkin:
+    enabled: false
+
+config:
+  receivers:
+    jaeger: null
+    prometheus: null
+    zipkin: null
+  service:
+    pipelines:
+      traces:
+        receivers:
+          - otlp
+      metrics: null
+      logs: null
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml
new file mode 100644
index 00000000..098843d5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml
@@ -0,0 +1,28 @@
+mode: deployment
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+configMap:
+  create: false
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+  extraArgs: ["--config=/conf/config.yaml"]
+
+extraVolumes:
+  - name: custom-otelcol-configmap
+    configMap:
+      name: custom-otel-collector-config
+      items:
+        - key: config
+          path: config.yaml
+      defaultMode: 420
+extraVolumeMounts:
+  - name: custom-otelcol-configmap
+    mountPath: /conf/config.yaml
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
new file mode 100644
index 00000000..e28a6b3b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
@@ -0,0 +1,101 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/config.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf/config.yaml
+              name: custom-otelcol-configmap
+      volumes:
+        - configMap:
+            defaultMode: 420
+            items:
+            - key: config
+              path: config.yaml
+            name: custom-otel-collector-config
+          name: custom-otelcol-configmap
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
new file mode 100644
index 00000000..9455c12f
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
@@ -0,0 +1,23 @@
+---
+# Source: opentelemetry-collector/templates/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: example-opentelemetry-collector
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+rules:
+  - apiGroups: [""]
+    resources: ["pods", "namespaces"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
new file mode 100644
index 00000000..3f14fb34
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
@@ -0,0 +1,21 @@
+---
+# Source: opentelemetry-collector/templates/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: example-opentelemetry-collector
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: example-opentelemetry-collector
+subjects:
+- kind: ServiceAccount
+  name: example-opentelemetry-collector
+  namespace: default
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
new file mode 100644
index 00000000..1111d1c6
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
@@ -0,0 +1,112 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      k8sattributes:
+        extract:
+          metadata:
+          - k8s.namespace.name
+          - k8s.deployment.name
+          - k8s.statefulset.name
+          - k8s.daemonset.name
+          - k8s.cronjob.name
+          - k8s.job.name
+          - k8s.node.name
+          - k8s.pod.name
+          - k8s.pod.uid
+          - k8s.pod.start_time
+        passthrough: false
+        pod_association:
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: connection
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - k8sattributes
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - k8sattributes
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - resource
+          - k8sattributes
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
new file mode 100644
index 00000000..fdaf9e98
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
@@ -0,0 +1,94 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 63dd878669e1f465c60f65786dc6091bd23f761e6332c1eb2c14dc626f85a246
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml
new file mode 100644
index 00000000..666a1eeb
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml
@@ -0,0 +1,21 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+presets:
+  kubernetesAttributes:
+    enabled: true
+
+config:
+  service:
+    pipelines:      
+      traces:
+        processors:
+          - resource
+          - k8sattributes
+          - batch
+      
\ No newline at end of file
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml
new file mode 100644
index 00000000..1b9f35dc
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap-statefulset.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-statefulset
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml
new file mode 100644
index 00000000..284ee6c7
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: statefulset-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: statefulset-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml
new file mode 100644
index 00000000..e68020ef
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml
@@ -0,0 +1,101 @@
+---
+# Source: opentelemetry-collector/templates/statefulset.yaml
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  serviceName: example-opentelemetry-collector
+  podManagementPolicy: Parallel
+  replicas: 2
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: statefulset-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 1d41134c1cf3e69cb683b501ecc5e5a8ef07a5fe44edec2851e0fd923cac34a6
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: statefulset-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-statefulset
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/values.yaml
new file mode 100644
index 00000000..c1e9dba5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/values.yaml
@@ -0,0 +1,14 @@
+mode: statefulset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+replicaCount: 2
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml
new file mode 100644
index 00000000..1b9f35dc
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap-statefulset.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector-statefulset
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml
new file mode 100644
index 00000000..284ee6c7
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: statefulset-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: statefulset-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml
new file mode 100644
index 00000000..7fdd460f
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml
@@ -0,0 +1,126 @@
+---
+# Source: opentelemetry-collector/templates/statefulset.yaml
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  serviceName: example-opentelemetry-collector
+  podManagementPolicy: Parallel
+  replicas: 2
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: statefulset-collector
+  updateStrategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 1d41134c1cf3e69cb683b501ecc5e5a8ef07a5fe44edec2851e0fd923cac34a6
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: statefulset-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+            - mountPath: /var/lib/storage/queue
+              name: queue
+      initContainers:
+        - command:
+          - sh
+          - -c
+          - 'chown -R 10001: /var/lib/storage/queue'
+          image: busybox:latest
+          name: init-fs
+          volumeMounts:
+          - mountPath: /var/lib/storage/queue
+            name: queue
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector-statefulset
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
+  volumeClaimTemplates:
+  - metadata:
+      name: queue
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 1Gi
+      storageClassName: standard
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml
new file mode 100644
index 00000000..269e20a8
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml
@@ -0,0 +1,46 @@
+mode: statefulset
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+replicaCount: 2
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+
+statefulset:
+  persistentVolumeClaimRetentionPolicy:
+    enabled: true
+    whenDeleted: Delete
+    whenScaled: Delete
+
+  volumeClaimTemplates:
+    - metadata:
+        name: queue
+      spec:
+        storageClassName: standard
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: "1Gi"
+
+extraVolumeMounts:
+  - name: queue
+    mountPath: /var/lib/storage/queue
+
+initContainers:
+  - name: init-fs
+    image: busybox:latest
+    command:
+      - sh
+      - "-c"
+      - "chown -R 10001: /var/lib/storage/queue"
+    volumeMounts:
+      - name: queue
+        mountPath: /var/lib/storage/queue
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml
new file mode 100644
index 00000000..c16fb522
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml
new file mode 100644
index 00000000..a5da929b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml
@@ -0,0 +1,100 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          command:
+            - /otelcol-k8s
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              value: "152MiB"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200M
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml
new file mode 100644
index 00000000..7a29aad5
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml
@@ -0,0 +1,13 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+command:
+  name: "otelcol-k8s"
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 200M
+useGOMEMLIMIT: true
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml
new file mode 100644
index 00000000..9e60935d
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml
@@ -0,0 +1,92 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      containers:
+        - name: opentelemetry-collector
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector-k8s:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: user-config
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/values.yaml
new file mode 100644
index 00000000..06ed084b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/values.yaml
@@ -0,0 +1,8 @@
+mode: deployment
+
+image:
+  repository: "otel/opentelemetry-collector-k8s"
+
+configMap:
+  create: false
+  existingName: user-config
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml
new file mode 100644
index 00000000..c16fb522
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml
@@ -0,0 +1,86 @@
+---
+# Source: opentelemetry-collector/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+data:
+  relay: |
+    exporters:
+      debug: {}
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    processors:
+      batch: {}
+      memory_limiter:
+        check_interval: 5s
+        limit_percentage: 80
+        spike_limit_percentage: 25
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:14250
+          thrift_compact:
+            endpoint: ${env:MY_POD_IP}:6831
+          thrift_http:
+            endpoint: ${env:MY_POD_IP}:14268
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            endpoint: ${env:MY_POD_IP}:4318
+      prometheus:
+        config:
+          scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+            - targets:
+              - ${env:MY_POD_IP}:8888
+      zipkin:
+        endpoint: ${env:MY_POD_IP}:9411
+    service:
+      extensions:
+      - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - prometheus
+        traces:
+          exporters:
+          - debug
+          processors:
+          - memory_limiter
+          - batch
+          receivers:
+          - otlp
+          - jaeger
+          - zipkin
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml
new file mode 100644
index 00000000..4558f3bc
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml
@@ -0,0 +1,93 @@
+---
+# Source: opentelemetry-collector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-collector
+      app.kubernetes.io/instance: example
+      component: standalone-collector
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d
+        
+      labels:
+        app.kubernetes.io/name: opentelemetry-collector
+        app.kubernetes.io/instance: example
+        component: standalone-collector
+        
+    spec:
+      
+      serviceAccountName: example-opentelemetry-collector
+      securityContext:
+        {}
+      shareProcessNamespace: true
+      containers:
+        - name: opentelemetry-collector
+          args:
+            - --config=/conf/relay.yaml
+          securityContext:
+            {}
+          image: "otel/opentelemetry-collector:0.111.0"
+          imagePullPolicy: IfNotPresent
+          ports:
+            
+            - name: jaeger-compact
+              containerPort: 6831
+              protocol: UDP
+            - name: jaeger-grpc
+              containerPort: 14250
+              protocol: TCP
+            - name: jaeger-thrift
+              containerPort: 14268
+              protocol: TCP
+            - name: otlp
+              containerPort: 4317
+              protocol: TCP
+            - name: otlp-http
+              containerPort: 4318
+              protocol: TCP
+            - name: zipkin
+              containerPort: 9411
+              protocol: TCP
+          env:
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          volumeMounts:
+            - mountPath: /conf
+              name: opentelemetry-collector-configmap
+      volumes:
+        - name: opentelemetry-collector-configmap
+          configMap:
+            name: example-opentelemetry-collector
+            items:
+              - key: relay
+                path: relay.yaml
+      hostNetwork: false
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml
new file mode 100644
index 00000000..a805ec64
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml
@@ -0,0 +1,49 @@
+---
+# Source: opentelemetry-collector/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
+    
+    component: standalone-collector
+spec:
+  type: ClusterIP
+  ports:
+    
+    - name: jaeger-compact
+      port: 6831
+      targetPort: 6831
+      protocol: UDP
+    - name: jaeger-grpc
+      port: 14250
+      targetPort: 14250
+      protocol: TCP
+    - name: jaeger-thrift
+      port: 14268
+      targetPort: 14268
+      protocol: TCP
+    - name: otlp
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+      appProtocol: grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+    - name: zipkin
+      port: 9411
+      targetPort: 9411
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    component: standalone-collector
+  internalTrafficPolicy: Cluster
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml
new file mode 100644
index 00000000..3fb5379c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml
@@ -0,0 +1,13 @@
+---
+# Source: opentelemetry-collector/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: example-opentelemetry-collector
+  namespace: default
+  labels:
+    helm.sh/chart: opentelemetry-collector-0.108.0
+    app.kubernetes.io/name: opentelemetry-collector
+    app.kubernetes.io/instance: example
+    app.kubernetes.io/version: "0.111.0"
+    app.kubernetes.io/managed-by: Helm
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/values.yaml
new file mode 100644
index 00000000..6c12f1b1
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/values.yaml
@@ -0,0 +1,6 @@
+mode: deployment
+
+image:
+  repository: otel/opentelemetry-collector
+
+shareProcessNamespace: true
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt
new file mode 100644
index 00000000..83f8a11c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt
@@ -0,0 +1,49 @@
+{{- if not .Values.image.repository }}
+{{ fail "[ERROR] 'image.repository' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }}
+{{ end }}
+
+{{- if and (not (eq .Values.mode "daemonset")) (not (eq .Values.mode "deployment")) (not (eq .Values.mode "statefulset")) }}
+{{ fail "[ERROR] 'mode' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }}
+{{ end }}
+
+{{- if and (eq .Values.dnsPolicy "None") (not .Values.dnsConfig) }}
+{{- fail "[ERROR] dnsConfig should be provided when dnsPolicy is None" }}
+{{ end }}
+
+{{- if .Values.presets.clusterMetrics.enabled }}
+{{- if eq .Values.mode "daemonset"}}
+{{- fail "Cluster Metrics preset is not suitable for daemonset mode. Please use statefulset or deployment mode with replicaCount: 1"}}
+{{ end }}
+{{- if gt (int .Values.replicaCount) 1 }}
+{{- fail "Cluster Metrics preset is not suitable for replicaCount greater than one. Please change replica count to one." }}
+{{ end }}
+{{ end }}
+
+{{/* validate extensions must include health_check */}}
+{{- if not (has "health_check" .Values.config.service.extensions) }}
+{{ fail "[ERROR] The opentelemetry-collector chart requires that the health_check extension to be included in the extension list." }}
+{{- end}}
+
+{{- if not .Values.configMap.create }}
+[WARNING] "configMap" wil not be created and "config" will not take effect.
+{{ end }}
+
+{{- if and .Values.configMap.create .Values.configMap.existingName }}
+{{ fail "[ERROR] Cannot set configMap.existingName when configMap.create is true" }}
+{{ end }}
+
+{{- if and .Values.configMap.create .Values.configMap.existingPath }}
+{{ fail "[ERROR] Cannot set configMap.existingPath when configMap.create is true" }}
+{{ end }}
+
+{{- if not .Values.resources }}
+[WARNING] No resource limits or requests were set. Consider setter resource requests and limits for your collector(s) via the `resources` field.
+{{ end }}
+
+{{- if and (eq .Values.mode "daemonset") (eq .Values.service.internalTrafficPolicy "Cluster") }}
+[WARNING] Setting internalTrafficPolicy to 'Cluster' on Daemonset is not recommended. Consider using 'Local' instead.
+{{ end }}
+
+{{- if and (.Values.useGOMEMLIMIT) (not ((((.Values.resources).limits).memory))) }}
+[WARNING] "useGOMEMLIMIT" is enabled but memory limits have not been supplied so the GOMEMLIMIT env var could not be added. Solve this problem by setting resources.limits.memory or disabling useGOMEMLIMIT
+{{ end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl
new file mode 100644
index 00000000..4b670f94
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl
@@ -0,0 +1,299 @@
+{{- define "opentelemetry-collector.baseConfig" -}}
+{{- if .Values.alternateConfig }}
+{{- .Values.alternateConfig | toYaml }}
+{{- else}}
+{{- .Values.config | toYaml }}
+{{- end }}
+{{- end }}
+
+{{/*
+Build config file for daemonset OpenTelemetry Collector
+*/}}
+{{- define "opentelemetry-collector.daemonsetConfig" -}}
+{{- $values := deepCopy .Values }}
+{{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
+{{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
+{{- if .Values.presets.logsCollection.enabled }}
+{{- $config = (include "opentelemetry-collector.applyLogsCollectionConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.hostMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyHostMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.kubeletMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyKubeletMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.kubernetesAttributes.enabled }}
+{{- $config = (include "opentelemetry-collector.applyKubernetesAttributesConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.clusterMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyClusterMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- tpl (toYaml $config) . }}
+{{- end }}
+
+{{/*
+Build config file for deployment OpenTelemetry Collector
+*/}}
+{{- define "opentelemetry-collector.deploymentConfig" -}}
+{{- $values := deepCopy .Values }}
+{{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
+{{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
+{{- if .Values.presets.logsCollection.enabled }}
+{{- $config = (include "opentelemetry-collector.applyLogsCollectionConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.hostMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyHostMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.kubeletMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyKubeletMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.kubernetesAttributes.enabled }}
+{{- $config = (include "opentelemetry-collector.applyKubernetesAttributesConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.kubernetesEvents.enabled }}
+{{- $config = (include "opentelemetry-collector.applyKubernetesEventsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- if .Values.presets.clusterMetrics.enabled }}
+{{- $config = (include "opentelemetry-collector.applyClusterMetricsConfig" (dict "Values" $data "config" $config) | fromYaml) }}
+{{- end }}
+{{- tpl (toYaml $config) . }}
+{{- end }}
+
+{{- define "opentelemetry-collector.applyHostMetricsConfig" -}}
+{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.hostMetricsConfig" .Values | fromYaml) .config }}
+{{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "hostmetrics" | uniq)  }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.hostMetricsConfig" -}}
+receivers:
+  hostmetrics:
+    root_path: /hostfs
+    collection_interval: 10s
+    scrapers:
+        cpu:
+        load:
+        memory:
+        disk:
+        filesystem:
+          exclude_mount_points:
+            mount_points:
+              - /dev/*
+              - /proc/*
+              - /sys/*
+              - /run/k3s/containerd/*
+              - /var/lib/docker/*
+              - /var/lib/kubelet/*
+              - /snap/*
+            match_type: regexp
+          exclude_fs_types:
+            fs_types:
+              - autofs
+              - binfmt_misc
+              - bpf
+              - cgroup2
+              - configfs
+              - debugfs
+              - devpts
+              - devtmpfs
+              - fusectl
+              - hugetlbfs
+              - iso9660
+              - mqueue
+              - nsfs
+              - overlay
+              - proc
+              - procfs
+              - pstore
+              - rpc_pipefs
+              - securityfs
+              - selinuxfs
+              - squashfs
+              - sysfs
+              - tracefs
+            match_type: strict
+        network:
+{{- end }}
+
+{{- define "opentelemetry-collector.applyClusterMetricsConfig" -}}
+{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.clusterMetricsConfig" .Values | fromYaml) .config }}
+{{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "k8s_cluster" | uniq)  }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.clusterMetricsConfig" -}}
+receivers:
+  k8s_cluster:
+    collection_interval: 10s
+{{- end }}
+
+{{- define "opentelemetry-collector.applyKubeletMetricsConfig" -}}
+{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "receivers" list)))) (include "opentelemetry-collector.kubeletMetricsConfig" .Values | fromYaml) .config }}
+{{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "kubeletstats" | uniq)  }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.kubeletMetricsConfig" -}}
+receivers:
+  kubeletstats:
+    collection_interval: 20s
+    auth_type: "serviceAccount"
+    endpoint: "${env:K8S_NODE_NAME}:10250"
+{{- end }}
+
+{{- define "opentelemetry-collector.applyLogsCollectionConfig" -}}
+{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "receivers" list)))) (include "opentelemetry-collector.logsCollectionConfig" .Values | fromYaml) .config }}
+{{- $_ := set $config.service.pipelines.logs "receivers" (append $config.service.pipelines.logs.receivers "filelog" | uniq)  }}
+{{- if .Values.Values.presets.logsCollection.storeCheckpoints}}
+{{- $configExtensions := mustMergeOverwrite (dict "service" (dict "extensions" list)) $config }}
+{{- $_ := set $config.service "extensions" (append $configExtensions.service.extensions "file_storage" | uniq)  }}
+{{- end }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.logsCollectionConfig" -}}
+{{- if .Values.presets.logsCollection.storeCheckpoints }}
+extensions:
+  file_storage:
+    directory: /var/lib/otelcol
+{{- end }}
+receivers:
+  filelog:
+    include: [ /var/log/pods/*/*/*.log ]
+    {{- if .Values.presets.logsCollection.includeCollectorLogs }}
+    exclude: []
+    {{- else }}
+    # Exclude collector container's logs. The file format is /var/log/pods/<namespace_name>_<pod_name>_<pod_uid>/<container_name>/<run_id>.log
+    exclude: [ /var/log/pods/{{ include "opentelemetry-collector.namespace" . }}_{{ include "opentelemetry-collector.fullname" . }}*_*/{{ include "opentelemetry-collector.lowercase_chartname" . }}/*.log ]
+    {{- end }}
+    start_at: end
+    retry_on_failure:
+        enabled: true
+    {{- if .Values.presets.logsCollection.storeCheckpoints}}
+    storage: file_storage
+    {{- end }}
+    include_file_path: true
+    include_file_name: false
+    operators:
+      # parse container logs
+      - type: container
+        id: container-parser
+        max_log_size: {{ $.Values.presets.logsCollection.maxRecombineLogSize }}
+{{- end }}
+
+{{- define "opentelemetry-collector.applyKubernetesAttributesConfig" -}}
+{{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubernetesAttributesConfig" .Values | fromYaml) .config }}
+{{- if $config.service.pipelines.logs }}
+  {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "processors" list)))) $config }}
+  {{- if not (has "k8sattributes" $config.service.pipelines.logs.processors) }}
+    {{- $_ := set $config.service.pipelines.logs "processors" (prepend $config.service.pipelines.logs.processors "k8sattributes" | uniq)  }}
+  {{- end }}
+{{- end }}
+{{- if and $config.service.pipelines.metrics }}
+  {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "metrics" (dict "processors" list)))) $config }}
+  {{- if not (has "k8sattributes" $config.service.pipelines.metrics.processors) }}
+    {{- $_ := set $config.service.pipelines.metrics "processors" (prepend $config.service.pipelines.metrics.processors "k8sattributes" | uniq)  }}
+  {{- end }}
+{{- end }}
+{{- if and $config.service.pipelines.traces }}
+  {{- $config = mustMergeOverwrite (dict "service" (dict "pipelines" (dict "traces" (dict "processors" list)))) $config }}
+  {{- if not (has "k8sattributes" $config.service.pipelines.traces.processors) }}
+    {{- $_ := set $config.service.pipelines.traces "processors" (prepend $config.service.pipelines.traces.processors "k8sattributes" | uniq)  }}
+  {{- end }}
+{{- end }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.kubernetesAttributesConfig" -}}
+processors:
+  k8sattributes:
+  {{- if eq .Values.mode "daemonset" }}
+    filter:
+      node_from_env_var: K8S_NODE_NAME
+  {{- end }}
+    passthrough: false
+    pod_association:
+    - sources:
+      - from: resource_attribute
+        name: k8s.pod.ip
+    - sources:
+      - from: resource_attribute
+        name: k8s.pod.uid
+    - sources:
+      - from: connection
+    extract:
+      metadata:
+        - "k8s.namespace.name"
+        - "k8s.deployment.name"
+        - "k8s.statefulset.name"
+        - "k8s.daemonset.name"
+        - "k8s.cronjob.name"
+        - "k8s.job.name"
+        - "k8s.node.name"
+        - "k8s.pod.name"
+        - "k8s.pod.uid"
+        - "k8s.pod.start_time"
+      {{- if .Values.presets.kubernetesAttributes.extractAllPodLabels }}
+      labels:
+        - tag_name: $$1
+          key_regex: (.*)
+          from: pod
+      {{- end }}
+      {{- if .Values.presets.kubernetesAttributes.extractAllPodAnnotations }}
+      annotations:
+        - tag_name: $$1
+          key_regex: (.*)
+          from: pod
+      {{- end }}
+{{- end }}
+
+{{/* Build the list of port for service */}}
+{{- define "opentelemetry-collector.servicePortsConfig" -}}
+{{- $ports := deepCopy .Values.ports }}
+{{- range $key, $port := $ports }}
+{{- if $port.enabled }}
+- name: {{ $key }}
+  port: {{ $port.servicePort }}
+  targetPort: {{ $port.containerPort }}
+  protocol: {{ $port.protocol }}
+  {{- if $port.appProtocol }}
+  appProtocol: {{ $port.appProtocol }}
+  {{- end }}
+{{- if $port.nodePort }}
+  nodePort: {{ $port.nodePort }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/* Build the list of port for pod */}}
+{{- define "opentelemetry-collector.podPortsConfig" -}}
+{{- $ports := deepCopy .Values.ports }}
+{{- range $key, $port := $ports }}
+{{- if $port.enabled }}
+- name: {{ $key }}
+  containerPort: {{ $port.containerPort }}
+  protocol: {{ $port.protocol }}
+  {{- if and $.isAgent $port.hostPort }}
+  hostPort: {{ $port.hostPort }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "opentelemetry-collector.applyKubernetesEventsConfig" -}}
+{{- $config := mustMergeOverwrite (dict "service" (dict "pipelines" (dict "logs" (dict "receivers" list)))) (include "opentelemetry-collector.kubernetesEventsConfig" .Values | fromYaml) .config }}
+{{- $_ := set $config.service.pipelines.logs "receivers" (append $config.service.pipelines.logs.receivers "k8sobjects" | uniq)  }}
+{{- $config | toYaml }}
+{{- end }}
+
+{{- define "opentelemetry-collector.kubernetesEventsConfig" -}}
+receivers:
+  k8sobjects:
+    objects:
+      - name: events
+        mode: "watch"
+        group: "events.k8s.io"
+        exclude_watch_type:
+          - "DELETED"
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl
new file mode 100644
index 00000000..130bf2a7
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl
@@ -0,0 +1,244 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "opentelemetry-collector.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "opentelemetry-collector.lowercase_chartname" -}}
+{{- default .Chart.Name | lower }}
+{{- end }}
+
+{{/*
+Get component name
+*/}}
+{{- define "opentelemetry-collector.component" -}}
+{{- if eq .Values.mode "deployment" -}}
+component: standalone-collector
+{{- end -}}
+{{- if eq .Values.mode "daemonset" -}}
+component: agent-collector
+{{- end -}}
+{{- if eq .Values.mode "statefulset" -}}
+component: statefulset-collector
+{{- end -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "opentelemetry-collector.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "opentelemetry-collector.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "opentelemetry-collector.labels" -}}
+helm.sh/chart: {{ include "opentelemetry-collector.chart" . }}
+{{ include "opentelemetry-collector.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "opentelemetry-collector.additionalLabels" . }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "opentelemetry-collector.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "opentelemetry-collector.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "opentelemetry-collector.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "opentelemetry-collector.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+
+{{/*
+Create the name of the clusterRole to use
+*/}}
+{{- define "opentelemetry-collector.clusterRoleName" -}}
+{{- default (include "opentelemetry-collector.fullname" .) .Values.clusterRole.name }}
+{{- end }}
+
+{{/*
+Create the name of the clusterRoleBinding to use
+*/}}
+{{- define "opentelemetry-collector.clusterRoleBindingName" -}}
+{{- default (include "opentelemetry-collector.fullname" .) .Values.clusterRole.clusterRoleBinding.name }}
+{{- end }}
+
+{{- define "opentelemetry-collector.podAnnotations" -}}
+{{- if .Values.podAnnotations }}
+{{- tpl (.Values.podAnnotations | toYaml) . }}
+{{- end }}
+{{- end }}
+
+{{- define "opentelemetry-collector.podLabels" -}}
+{{- if .Values.podLabels }}
+{{- tpl (.Values.podLabels | toYaml) . }}
+{{- end }}
+{{- end }}
+
+{{- define "opentelemetry-collector.additionalLabels" -}}
+{{- if .Values.additionalLabels }}
+{{- tpl (.Values.additionalLabels | toYaml) . }}
+{{- end }}
+{{- end }}
+
+{{/*
+Return the appropriate apiVersion for podDisruptionBudget.
+*/}}
+{{- define "podDisruptionBudget.apiVersion" -}}
+  {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}}
+    {{- print "policy/v1" -}}
+  {{- else -}}
+    {{- print "policy/v1beta1" -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Compute Service creation on mode
+*/}}
+{{- define "opentelemetry-collector.serviceEnabled" }}
+  {{- $serviceEnabled := true }}
+  {{- if not (eq (toString .Values.service.enabled) "<nil>") }}
+    {{- $serviceEnabled = .Values.service.enabled -}}
+  {{- end }}
+  {{- if and (eq .Values.mode "daemonset") (not .Values.service.enabled) }}
+    {{- $serviceEnabled = false -}}
+  {{- end }}
+
+  {{- print $serviceEnabled }}
+{{- end -}}
+
+
+{{/*
+Compute InternalTrafficPolicy on Service creation
+*/}}
+{{- define "opentelemetry-collector.serviceInternalTrafficPolicy" }}
+  {{- if and (eq .Values.mode "daemonset") (eq .Values.service.enabled true) }}
+    {{- print (.Values.service.internalTrafficPolicy | default "Local") -}}
+  {{- else }}
+    {{- print (.Values.service.internalTrafficPolicy | default "Cluster") -}}
+  {{- end }}
+{{- end -}}
+
+{{/*
+Allow the release namespace to be overridden
+*/}}
+{{- define "opentelemetry-collector.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+  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 }}
+
+{{/*
+Get ConfigMap name if existingName is defined, otherwise use default name for generated config.
+*/}}
+{{- define "opentelemetry-collector.configName" -}}
+  {{- if .Values.configMap.existingName -}}
+    {{- .Values.configMap.existingName }}
+  {{- else }}
+    {{- printf "%s%s" (include "opentelemetry-collector.fullname" .) (.configmapSuffix) }}
+  {{- end -}}
+{{- end }}
+
+{{/*
+Create ConfigMap checksum annotation if configMap.existingPath is defined, otherwise use default templates
+*/}}
+{{- define "opentelemetry-collector.configTemplateChecksumAnnotation" -}}
+  {{- if .Values.configMap.existingPath -}}
+  checksum/config: {{ include (print $.Template.BasePath "/" .Values.configMap.existingPath) . | sha256sum }}
+  {{- else -}}
+    {{- if eq .Values.mode "daemonset" -}}
+    checksum/config: {{ include (print $.Template.BasePath "/configmap-agent.yaml") . | sha256sum }}
+    {{- else if eq .Values.mode "deployment" -}}
+    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    {{- else if eq .Values.mode "statefulset" -}}
+    checksum/config: {{ include (print $.Template.BasePath "/configmap-statefulset.yaml") . | sha256sum }}
+    {{- end -}}
+  {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl
new file mode 100644
index 00000000..07332ccc
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl
@@ -0,0 +1,221 @@
+{{- define "opentelemetry-collector.pod" -}}
+{{- with .Values.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+serviceAccountName: {{ include "opentelemetry-collector.serviceAccountName" . }}
+securityContext:
+  {{- toYaml .Values.podSecurityContext | nindent 2 }}
+{{- with .Values.hostAliases }}
+hostAliases:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- if $.Values.shareProcessNamespace }}
+shareProcessNamespace: true
+{{- end }}
+containers:
+  - name: {{ include "opentelemetry-collector.lowercase_chartname" . }}
+    {{- if .Values.command.name }}
+    command:
+      - /{{ .Values.command.name }}
+    {{- end }}
+    args:
+      {{- if or .Values.configMap.create .Values.configMap.existingName }}
+      - --config=/conf/relay.yaml
+      {{- end }}
+      {{- range .Values.command.extraArgs }}
+      - {{ . }}
+      {{- end }}
+    securityContext:
+      {{- if and (not (.Values.securityContext)) (.Values.presets.logsCollection.storeCheckpoints) }}
+      runAsUser: 0
+      runAsGroup: 0
+      {{- else -}}
+      {{- toYaml .Values.securityContext | nindent 6 }}
+      {{- end }}
+    {{- if .Values.image.digest }}
+    image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}@{{ .Values.image.digest }}"
+    {{- else }}
+    image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+    {{- end }}
+    imagePullPolicy: {{ .Values.image.pullPolicy }}
+
+    {{- $ports := include "opentelemetry-collector.podPortsConfig" . }}
+    {{- if $ports }}
+    ports:
+      {{- $ports | nindent 6}}
+    {{- end }}
+    env:
+      - name: MY_POD_IP
+        valueFrom:
+          fieldRef:
+            apiVersion: v1
+            fieldPath: status.podIP
+      {{- if or .Values.presets.kubeletMetrics.enabled (and .Values.presets.kubernetesAttributes.enabled (eq .Values.mode "daemonset")) }}
+      - name: K8S_NODE_NAME
+        valueFrom:
+          fieldRef:
+            fieldPath: spec.nodeName
+      {{- end }}
+      {{- if and (.Values.useGOMEMLIMIT) ((((.Values.resources).limits).memory))  }}
+      - name: GOMEMLIMIT
+        value: {{ include "opentelemetry-collector.gomemlimit" .Values.resources.limits.memory | quote }}
+      {{- end }}
+      {{- with .Values.extraEnvs }}
+      {{- . | toYaml | nindent 6 }}
+      {{- end }}
+    {{- with .Values.extraEnvsFrom }}
+    envFrom:
+    {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.lifecycleHooks }}
+    lifecycle:
+      {{- toYaml .Values.lifecycleHooks | nindent 6 }}
+    {{- end }}
+    livenessProbe:
+      {{- if .Values.livenessProbe.initialDelaySeconds | empty | not }}
+      initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+      {{- end }}
+      {{- if .Values.livenessProbe.periodSeconds | empty | not }}
+      periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+      {{- end }}
+      {{- if .Values.livenessProbe.timeoutSeconds | empty | not }}
+      timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+      {{- end }}
+      {{- if .Values.livenessProbe.failureThreshold | empty | not }}
+      failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+      {{- end }}
+      {{- if .Values.livenessProbe.terminationGracePeriodSeconds | empty | not }}
+      terminationGracePeriodSeconds: {{ .Values.livenessProbe.terminationGracePeriodSeconds }}
+      {{- end }}
+      httpGet:
+        path: {{ .Values.livenessProbe.httpGet.path }}
+        port: {{ .Values.livenessProbe.httpGet.port }}
+    readinessProbe:
+      {{- if .Values.readinessProbe.initialDelaySeconds | empty | not }}
+      initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+      {{- end }}
+      {{- if .Values.readinessProbe.periodSeconds | empty | not }}
+      periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+      {{- end }}
+      {{- if .Values.readinessProbe.timeoutSeconds | empty | not }}
+      timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+      {{- end }}
+      {{- if .Values.readinessProbe.successThreshold | empty | not }}
+      successThreshold: {{ .Values.readinessProbe.successThreshold }}
+      {{- end }}
+      {{- if .Values.readinessProbe.failureThreshold | empty | not }}
+      failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+      {{- end }}
+      httpGet:
+        path: {{ .Values.readinessProbe.httpGet.path }}
+        port: {{ .Values.readinessProbe.httpGet.port }}
+    {{- if .Values.startupProbe }}
+    startupProbe:
+      {{- if .Values.startupProbe.initialDelaySeconds | empty | not }}
+      initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+      {{- end }}
+      {{- if .Values.startupProbe.periodSeconds | empty | not }}
+      periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+      {{- end }}
+      {{- if .Values.startupProbe.timeoutSeconds | empty | not }}
+      timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+      {{- end }}
+      {{- if .Values.startupProbe.failureThreshold | empty | not }}
+      failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+      {{- end }}
+      {{- if .Values.startupProbe.terminationGracePeriodSeconds | empty | not }}
+      terminationGracePeriodSeconds: {{ .Values.startupProbe.terminationGracePeriodSeconds }}
+      {{- end }}
+      httpGet:
+        path: {{ .Values.startupProbe.httpGet.path }}
+        port: {{ .Values.startupProbe.httpGet.port }}
+    {{- end }}
+    {{- with .Values.resources }}
+    resources:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    volumeMounts:
+      {{- if or .Values.configMap.create .Values.configMap.existingName }}
+      - mountPath: /conf
+        name: {{ include "opentelemetry-collector.lowercase_chartname" . }}-configmap
+      {{- end }}
+      {{- if .Values.presets.logsCollection.enabled }}
+      - name: varlogpods
+        mountPath: /var/log/pods
+        readOnly: true
+      - name: varlibdockercontainers
+        mountPath: /var/lib/docker/containers
+        readOnly: true
+      {{- if .Values.presets.logsCollection.storeCheckpoints}}
+      - name: varlibotelcol
+        mountPath: /var/lib/otelcol
+      {{- end }}
+      {{- end }}
+      {{- if .Values.presets.hostMetrics.enabled }}
+      - name: hostfs
+        mountPath: /hostfs
+        readOnly: true
+        mountPropagation: HostToContainer
+      {{- end }}
+      {{- if .Values.extraVolumeMounts }}
+      {{- tpl (toYaml .Values.extraVolumeMounts) . | nindent 6 }}
+      {{- end }}
+{{- if .Values.extraContainers }}
+  {{- tpl (toYaml .Values.extraContainers) . | nindent 2 }}
+{{- end }}
+{{- if .Values.initContainers }}
+initContainers:
+  {{- tpl (toYaml .Values.initContainers) . | nindent 2 }}
+{{- end }}
+{{- if .Values.priorityClassName }}
+priorityClassName: {{ .Values.priorityClassName | quote }}
+{{- end }}
+volumes:
+  {{- if or .Values.configMap.create .Values.configMap.existingName }}
+  - name: {{ include "opentelemetry-collector.lowercase_chartname" . }}-configmap
+    configMap:
+      name: {{ include "opentelemetry-collector.configName" . }}
+      items:
+        - key: relay
+          path: relay.yaml
+  {{- end }}
+  {{- if .Values.presets.logsCollection.enabled }}
+  - name: varlogpods
+    hostPath:
+      path: /var/log/pods
+  {{- if .Values.presets.logsCollection.storeCheckpoints}}
+  - name: varlibotelcol
+    hostPath:
+      path: /var/lib/otelcol
+      type: DirectoryOrCreate
+  {{- end }}
+  - name: varlibdockercontainers
+    hostPath:
+      path: /var/lib/docker/containers
+  {{- end }}
+  {{- if .Values.presets.hostMetrics.enabled }}
+  - name: hostfs
+    hostPath:
+      path: /
+  {{- end }}
+  {{- if .Values.extraVolumes }}
+  {{- tpl (toYaml .Values.extraVolumes) . | nindent 2 }}
+  {{- end }}
+{{- with .Values.nodeSelector }}
+nodeSelector:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.affinity }}
+affinity:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.tolerations }}
+tolerations:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.topologySpreadConstraints }}
+topologySpreadConstraints:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrole.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrole.yaml
new file mode 100644
index 00000000..a589d2f6
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrole.yaml
@@ -0,0 +1,56 @@
+{{- if or (.Values.clusterRole.create) (.Values.presets.kubernetesAttributes.enabled) (.Values.presets.clusterMetrics.enabled) (.Values.presets.kubeletMetrics.enabled) (.Values.presets.kubernetesEvents.enabled) -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "opentelemetry-collector.clusterRoleName" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.clusterRole.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.clusterRole.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+rules:
+  {{- if .Values.clusterRole.rules -}}
+  {{ toYaml .Values.clusterRole.rules | nindent 2 -}}
+  {{- end }}
+  {{- if .Values.presets.kubernetesAttributes.enabled}}
+  - apiGroups: [""]
+    resources: ["pods", "namespaces"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["replicasets"]
+    verbs: ["get", "list", "watch"]
+  {{- end }}
+  {{- if .Values.presets.clusterMetrics.enabled}}
+  - apiGroups: [""]
+    resources: ["events", "namespaces", "namespaces/status", "nodes", "nodes/spec", "pods", "pods/status", "replicationcontrollers", "replicationcontrollers/status", "resourcequotas", "services" ]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["apps"]
+    resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources: ["daemonsets", "deployments", "replicasets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["batch"]
+    resources: ["jobs", "cronjobs"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["autoscaling"]
+    resources: ["horizontalpodautoscalers"]
+    verbs: ["get", "list", "watch"]
+  {{- end}}
+  {{- if .Values.presets.kubeletMetrics.enabled}}
+  - apiGroups: [""]
+    resources: ["nodes/stats"]
+    verbs: ["get", "watch", "list"]
+  {{- end }}
+  {{- if .Values.presets.kubernetesEvents.enabled }}
+  - apiGroups: ["events.k8s.io"]
+    resources: ["events"]
+    verbs: ["watch", "list"]
+  {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrolebinding.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrolebinding.yaml
new file mode 100644
index 00000000..e0da0c95
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/clusterrolebinding.yaml
@@ -0,0 +1,22 @@
+{{- if or (.Values.clusterRole.create) (.Values.presets.kubernetesAttributes.enabled) (.Values.presets.clusterMetrics.enabled) (.Values.presets.kubeletMetrics.enabled) (.Values.presets.kubernetesEvents.enabled) -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "opentelemetry-collector.clusterRoleBindingName" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.clusterRole.clusterRoleBinding.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.clusterRole.clusterRoleBinding.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "opentelemetry-collector.clusterRoleName" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "opentelemetry-collector.serviceAccountName" . }}
+  namespace: {{ include "opentelemetry-collector.namespace" . }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-agent.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-agent.yaml
new file mode 100644
index 00000000..5e07daae
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-agent.yaml
@@ -0,0 +1,12 @@
+{{- if and (eq .Values.mode "daemonset") (.Values.configMap.create) (not .Values.configMap.existingName) -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}-agent
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+data:
+  relay: |
+    {{- include "opentelemetry-collector.daemonsetConfig" . | nindent 4 -}}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-statefulset.yaml
new file mode 100644
index 00000000..157f6a07
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap-statefulset.yaml
@@ -0,0 +1,12 @@
+{{- if and (eq .Values.mode "statefulset") (.Values.configMap.create) (not .Values.configMap.existingName) -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}-statefulset
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+data:
+  relay: |
+    {{- include "opentelemetry-collector.deploymentConfig" . | nindent 4 -}}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap.yaml
new file mode 100644
index 00000000..c72c50cb
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/configmap.yaml
@@ -0,0 +1,12 @@
+{{- if and (eq .Values.mode "deployment") (.Values.configMap.create) (not .Values.configMap.existingName) -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+data:
+  relay: |
+    {{- include "opentelemetry-collector.deploymentConfig" . | nindent 4 -}}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/daemonset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/daemonset.yaml
new file mode 100644
index 00000000..de563e56
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/daemonset.yaml
@@ -0,0 +1,49 @@
+{{- if eq .Values.mode "daemonset" -}}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}-agent
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  updateStrategy:
+    {{- if eq .Values.rollout.strategy "RollingUpdate" }}
+    {{- with .Values.rollout.rollingUpdate }}
+    rollingUpdate:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- end }}
+    type: {{ .Values.rollout.strategy }}
+  template:
+    metadata:
+      annotations:
+        {{- include "opentelemetry-collector.configTemplateChecksumAnnotation" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podAnnotations" . | nindent 8 }}
+      labels:
+        {{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
+        {{- include "opentelemetry-collector.component" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podLabels" . | nindent 8 }}
+    spec:
+      {{- $podValues := deepCopy .Values }}
+      {{- $podData := dict "Values" $podValues "configmapSuffix" "-agent" "isAgent" true }}
+      {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      {{- with .Values.dnsPolicy }}
+      dnsPolicy: {{ . }}
+      {{- end }}
+      {{- with .Values.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml
new file mode 100644
index 00000000..110130a9
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml
@@ -0,0 +1,53 @@
+{{- if eq .Values.mode "deployment" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+{{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  strategy:
+    {{- if eq .Values.rollout.strategy "RollingUpdate" }}
+    {{- with .Values.rollout.rollingUpdate }}
+    rollingUpdate:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- end }}
+    type: {{ .Values.rollout.strategy }}
+  template:
+    metadata:
+      annotations:
+        {{- include "opentelemetry-collector.configTemplateChecksumAnnotation" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podAnnotations" . | nindent 8 }}
+      labels:
+        {{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
+        {{- include "opentelemetry-collector.component" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.dnsPolicy }}
+      dnsPolicy: {{ . }}
+      {{- end }}
+      {{- with .Values.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- $podValues := deepCopy .Values }}
+      {{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }}
+      {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }}
+      hostNetwork: {{ .Values.hostNetwork }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/fluent-bit/templates/hpa.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/hpa.yaml
similarity index 65%
rename from charts/kubezero-telemetry/charts/fluent-bit/templates/hpa.yaml
rename to charts/kubezero-telemetry/charts/opentelemetry-collector/templates/hpa.yaml
index 243459f8..c5d06333 100644
--- a/charts/kubezero-telemetry/charts/fluent-bit/templates/hpa.yaml
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/hpa.yaml
@@ -1,40 +1,37 @@
-{{- if and  ( eq  .Values.kind "Deployment" )  .Values.autoscaling.enabled  }}
-apiVersion: {{ include "fluent-bit.hpa.apiVersion" . }}
+{{- if and .Values.autoscaling.enabled (or (eq .Values.mode "deployment") (eq .Values.mode "statefulset")) }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
   labels:
-    {{- include "fluent-bit.labels" . | nindent 4 }}
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
 spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: {{ include "opentelemetry-collector.hpaKind" . }}
+    name: {{ include "opentelemetry-collector.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   {{- if .Values.autoscaling.behavior }}
   behavior:
     {{- toYaml .Values.autoscaling.behavior | nindent 4 }}
   {{- end }}
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "fluent-bit.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-          type: Utilization
-  {{- end }}
   {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
         target:
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
           type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- end }}
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
   {{- end }}
-  {{- if .Values.autoscaling.customRules -}}
-    {{- toYaml .Values.autoscaling.customRules | nindent 4}}
-  {{- end -}}
 {{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/ingress.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/ingress.yaml
new file mode 100644
index 00000000..0a5a4ef6
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/ingress.yaml
@@ -0,0 +1,55 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingresses := prepend .Values.ingress.additionalIngresses .Values.ingress -}}
+{{- range $ingresses }}
+apiVersion: "networking.k8s.io/v1"
+kind: Ingress
+metadata:
+  {{- if .name }}
+  name: {{ printf "%s-%s" (include "opentelemetry-collector.fullname" $) .name }}
+  {{- else }}
+  name: {{ include "opentelemetry-collector.fullname" $ }}
+  {{- end }}
+  namespace: {{ template "opentelemetry-collector.namespace" $ }}
+  labels:
+    {{- include "opentelemetry-collector.labels" $ | nindent 4 }}
+    {{- include "opentelemetry-collector.component" $ | nindent 4 }}
+  {{- if .annotations }}
+  annotations:
+    {{- range $key, $value := .annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  {{- if .ingressClassName }}
+  ingressClassName: {{ .ingressClassName }}
+  {{- end -}}
+  {{- if .tls }}
+  tls:
+    {{- range .tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ tpl . $ | quote }}
+        {{- end }}
+      {{- with .secretName }}
+      secretName: {{ . }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .hosts }}
+    - host: {{ tpl .host $ | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "opentelemetry-collector.fullname" $ }}
+                port:
+                  number: {{ .port }}
+          {{- end }}
+    {{- end }}
+---
+{{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/networkpolicy.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/networkpolicy.yaml
new file mode 100644
index 00000000..58d58c9e
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/networkpolicy.yaml
@@ -0,0 +1,39 @@
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.networkPolicy.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.networkPolicy.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  ingress:
+    - ports:
+        {{- range $port := .Values.ports }}
+        {{- if $port.enabled }}
+        - port: {{ $port.containerPort }}
+          protocol: {{ $port.protocol }}
+        {{- end }}
+        {{- end }}
+      {{- if .Values.networkPolicy.allowIngressFrom }}
+      from:
+        {{- toYaml .Values.networkPolicy.allowIngressFrom | nindent 8 }}
+      {{- end }}
+    {{- if .Values.networkPolicy.extraIngressRules }}
+    {{- toYaml .Values.networkPolicy.extraIngressRules | nindent 4 }}
+    {{- end }}
+  {{- if .Values.networkPolicy.egressRules }}
+  egress:
+    {{- toYaml .Values.networkPolicy.egressRules | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/pdb.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/pdb.yaml
new file mode 100644
index 00000000..c386a47b
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.podDisruptionBudget.enabled (eq .Values.mode "deployment") }}
+apiVersion: {{ include "podDisruptionBudget.apiVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end  }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end  }}
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml
new file mode 100644
index 00000000..782e8fac
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.podMonitor.enabled .Values.podMonitor.metricsEndpoints (eq .Values.mode "daemonset") }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}-agent
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.podMonitor.extraLabels }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  podMetricsEndpoints:
+  {{- toYaml .Values.podMonitor.metricsEndpoints | nindent 2 }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml
new file mode 100644
index 00000000..d6446aba
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml
@@ -0,0 +1,112 @@
+{{- if and .Values.prometheusRule.enabled .Values.serviceMonitor.enabled  }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.prometheusRule.extraLabels }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+{{- if .Values.prometheusRule.groups }}
+    {{- toYaml .Values.prometheusRule.groups | nindent 4 }}
+{{- end }}
+{{- if .Values.prometheusRule.defaultRules.enabled }}
+  - name: collectorRules
+    rules:
+    - alert: ReceiverDroppedSpans
+      expr: rate(otelcol_receiver_refused_spans[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.receiver }} receiver is dropping spans at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#receive-failures'
+    - alert: ReceiverDroppedMetrics
+      expr: rate(otelcol_receiver_refused_metric_points[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.receiver }} receiver is dropping metrics at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#receive-failures'
+    - alert: ReceiverDroppedLogs
+      expr: rate(otelcol_receiver_refused_log_records[5m]) > 0
+      for: 5m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{` The {{ $labels.receiver }} is dropping logs at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#receive-failures'
+    - alert: ProcessorDroppedSpans
+      expr: rate(otelcol_processor_dropped_spans[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.processor }} processor is dropping spans at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-loss'
+    - alert: ProcessorDroppedMetrics
+      expr: rate(otelcol_processor_dropped_metric_points[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.processor }} processor is dropping metrics at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-loss'
+    - alert: ProcessorDroppedLogs
+      expr: rate(otelcol_processor_dropped_log_records[5m]) > 0
+      for: 5m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{` The {{ $labels.processor }} is dropping logs at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-loss'
+    - alert: ExporterDroppedSpans
+      expr: rate(otelcol_exporter_send_failed_spans[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.exporter }} exporter is dropping spans at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-egress'
+    - alert: ExporterDroppedMetrics
+      expr: rate(otelcol_exporter_send_failed_metric_points[5m]) > 0
+      for: 2m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{`The {{ $labels.exporter }} exporter is dropping metrics at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-egress'
+    - alert: ExporterDroppedLogs
+      expr: rate(otelcol_exporter_send_failed_log_records[5m]) > 0
+      for: 5m
+      labels:
+        severity: critical
+      annotations:
+        description: '{{` The {{ $labels.exporter }} is dropping logs at a rate of {{ humanize $value }} per second `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#data-egress'
+    - alert: ExporterQueueSize
+      expr: otelcol_exporter_queue_size > 5000
+      for: 1m
+      labels:
+        severity: warning
+      annotations:
+        description: '{{`The {{ $labels.exporter }} queue has reached a size of {{ $value }} `}}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#queue-length'
+{{- $signals := list "spans" "metric_points" "log_records" }}
+{{- range $signal := $signals }}
+    - alert: SendQueueFailed{{ $signal }}
+      expr: rate(otelcol_exporter_enqueue_failed_{{ $signal }}[5m]) > 0
+      for: 1m
+      labels:
+        severity: warning
+      annotations:
+        description: '{{`The {{ $labels.exporter }} sending queue failed to accept {{ $value }} `}} {{ $signal }}'
+        runbook_url: 'https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md#queue-length'
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml
new file mode 100644
index 00000000..c97ad247
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml
@@ -0,0 +1,42 @@
+{{- if or (eq (include "opentelemetry-collector.serviceEnabled" .) "true") (.Values.ingress.enabled) -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+    {{- include "opentelemetry-collector.component" . | nindent 4 }}
+  {{- if .Values.service.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.service.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerSourceRanges (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerSourceRanges:
+    {{- range .Values.service.loadBalancerSourceRanges }}
+    - {{ . }}
+    {{- end }}
+  {{- end }}
+  {{- $ports := include "opentelemetry-collector.servicePortsConfig" . }}
+  {{- if $ports }}
+  ports:
+    {{- $ports | nindent 4}}
+  {{- end }}
+  selector:
+    {{- include "opentelemetry-collector.selectorLabels" . | nindent 4 }}
+    {{- include "opentelemetry-collector.component" . | nindent 4 }}
+  internalTrafficPolicy: {{ include "opentelemetry-collector.serviceInternalTrafficPolicy" . }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.externalTrafficPolicy) }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/serviceaccount.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/serviceaccount.yaml
new file mode 100644
index 00000000..3240acba
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/serviceaccount.yaml
@@ -0,0 +1,15 @@
+{{- if or (.Values.serviceAccount.create) (.Values.presets.kubeletMetrics.enabled) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "opentelemetry-collector.serviceAccountName" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.serviceAccount.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.serviceAccount.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+{{ end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/servicemonitor.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/servicemonitor.yaml
new file mode 100644
index 00000000..04fe55b2
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/servicemonitor.yaml
@@ -0,0 +1,27 @@
+{{- if and (eq (include "opentelemetry-collector.serviceEnabled" .) "true") .Values.serviceMonitor.enabled .Values.serviceMonitor.metricsEndpoints }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.serviceMonitor.extraLabels }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  endpoints:
+  {{- toYaml .Values.serviceMonitor.metricsEndpoints | nindent 4 }}
+      {{- with .Values.serviceMonitor.relabelings }}
+      relabelings:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/statefulset.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/statefulset.yaml
new file mode 100644
index 00000000..7a2cb964
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/statefulset.yaml
@@ -0,0 +1,57 @@
+{{- if eq .Values.mode "statefulset" -}}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "opentelemetry-collector.fullname" . }}
+  namespace: {{ template "opentelemetry-collector.namespace" . }}
+  labels:
+    {{- include "opentelemetry-collector.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.annotations }}
+    {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  serviceName: {{ include "opentelemetry-collector.fullname" . }}
+  podManagementPolicy: {{ .Values.statefulset.podManagementPolicy }}
+{{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+{{- if .Values.statefulset.persistentVolumeClaimRetentionPolicy.enabled }}
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: {{ .Values.statefulset.persistentVolumeClaimRetentionPolicy.whenDeleted }}
+    whenScaled: {{ .Values.statefulset.persistentVolumeClaimRetentionPolicy.whenScaled }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }}
+      {{- include "opentelemetry-collector.component" . | nindent 6 }}
+  updateStrategy:
+    type: {{ .Values.rollout.strategy }}
+  template:
+    metadata:
+      annotations:
+        {{- include "opentelemetry-collector.configTemplateChecksumAnnotation" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podAnnotations" . | nindent 8 }}
+      labels:
+        {{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
+        {{- include "opentelemetry-collector.component" . | nindent 8 }}
+        {{- include "opentelemetry-collector.podLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.dnsPolicy }}
+      dnsPolicy: {{ . }}
+      {{- end }}
+      {{- with .Values.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- $podValues := deepCopy .Values }}
+      {{- $podData := dict "Values" $podValues "configmapSuffix" "-statefulset" "isAgent" false }}
+      {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }}
+      hostNetwork: {{ .Values.hostNetwork }}
+  {{- with .Values.statefulset.volumeClaimTemplates }}
+  volumeClaimTemplates:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json
new file mode 100644
index 00000000..7ecfe75c
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json
@@ -0,0 +1,989 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$defs": {
+    "intOrString": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "integer"
+        }
+      ]
+    }
+  },
+  "type": "object",
+  "title": "Values",
+  "additionalProperties": false,
+  "properties": {
+    "enabled": {
+      "description": "Usually used when using Opentelemetry-collector as a subchart.",
+      "type": "boolean"
+    },
+    "global": {
+      "type": "object"
+    },
+    "nameOverride": {
+      "description": "Override name of the chart used in Kubernetes object names.",
+      "type": "string"
+    },
+    "fullnameOverride": {
+      "description": "Override fully qualified app name.",
+      "type": "string"
+    },
+    "mode": {
+      "type": "string",
+      "enum": ["daemonset", "deployment", "statefulset", ""]
+    },
+    "namespaceOverride": {
+      "type": "string",
+      "description": "Name of the namespace to deploy the resources into."
+    },
+    "presets": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "logsCollection": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should collect logs.",
+              "type": "boolean"
+            },
+            "includeCollectorLogs": {
+              "description": "Specifies whether the collector should collect its own logs.",
+              "type": "boolean"
+            },
+            "storeCheckpoints": {
+              "description": "Specifies whether logs checkpoints should be stored in /var/lib/otelcol/ host directory.",
+              "type": "boolean"
+            },
+            "maxRecombineLogSize": {
+              "description": "Specifies the max recombine log size.",
+              "type": "integer"
+            }
+          }
+        },
+        "hostMetrics": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should collect host metrics.",
+              "type": "boolean"
+            }
+          }
+        },
+        "kubeletMetrics": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should collect kubelet metrics.",
+              "type": "boolean"
+            }
+          }
+        },
+        "kubernetesAttributes": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should add Kubernetes metdata to resource attributes.",
+              "type": "boolean"
+            },
+            "extractAllPodLabels": {
+              "description": "Specifies whether the k8sattributes processor should extract all pod labels.",
+              "type": "boolean"
+            },
+            "extractAllPodAnnotations": {
+              "description": "Specifies whether the k8sattributes processor should extract all pod annotations.",
+              "type": "boolean"
+            }
+          }
+        },
+        "kubernetesEvents": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should collect Kubernetes objects.",
+              "type": "boolean"
+            }
+          }
+        },
+        "clusterMetrics": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "description": "Specifies whether the collector should collect cluster metrics.",
+              "type": "boolean"
+            }
+          }
+        }
+      }
+    },
+    "configMap": {
+      "type": "object",
+      "properties": {
+        "create": {
+          "description": "Specifies whether a configMap should be created (true by default).",
+          "type": "boolean"
+        },
+        "existingName": {
+          "description": "Specifies an existing configMap to be mounted to the pod",
+          "type": "string"
+        },
+        "existingPath": {
+          "description": "Relative path to the template file used to generate a custom configMap. Needed for pod restart on custom config change.",
+          "type": "string"
+        }
+      }
+    },
+    "alternateConfig": {
+      "description": "When not empty, will be used instead of config. Presets will be merged in the same way they are for config.",
+      "type": "object"
+    },
+    "config": {
+      "description": "Configuration that applies to both standalone and agent collector. Overwritable by standalone and agent specific configs.",
+      "type": "object"
+    },
+    "image": {
+      "description": "Image use in both standalone and agent configs",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "registry": {
+          "type": "string"
+        },
+        "repository": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        },
+        "digest": {
+          "type": "string"
+        },
+        "pullPolicy": {
+          "type": "string",
+          "enum": ["IfNotPresent", "Always", "Never"]
+        }
+      }
+    },
+    "imagePullSecrets": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "command": {
+      "description": "OpenTelemetry Collector executable",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "extraArgs": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "serviceAccount": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "create": {
+          "type": "boolean"
+        },
+        "annotations": {
+          "type": "object"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "required": ["create"]
+    },
+    "clusterRole": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "create": {
+          "type": "boolean"
+        },
+        "annotations": {
+          "type": "object"
+        },
+        "name": {
+          "type": "string"
+        },
+        "rules": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "clusterRoleBinding": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "annotations": {
+              "type": "object"
+            },
+            "name": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "required": ["create"]
+    },
+    "podSecurityContext": {
+      "type": "object"
+    },
+    "securityContext": {
+      "type": "object"
+    },
+    "nodeSelector": {
+      "type": "object"
+    },
+    "tolerations": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "affinity": {
+      "type": "object"
+    },
+    "topologySpreadConstraints": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "priorityClassName": {
+      "type": "string"
+    },
+    "extraContainers": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": ["name"]
+      }
+    },
+    "initContainers": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": ["name"]
+      }
+    },
+    "extraEnvs": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "extraEnvsFrom": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "extraVolumes": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "extraVolumeMounts": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "ports": {
+      "type": "object",
+      "patternProperties": {
+        ".*": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "containerPort": {
+              "type": "integer"
+            },
+            "servicePort": {
+              "type": "integer"
+            },
+            "hostPort": {
+              "type": "integer"
+            },
+            "nodePort": {
+              "type": "integer"
+            },
+            "protocol": {
+              "type": "string"
+            },
+            "appProtocol": {
+              "type": "string"
+            }
+          },
+          "required": ["enabled"]
+        }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "limits": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "cpu": {
+              "type": ["string", "integer"]
+            },
+            "ephemeral-storage": {
+              "type": "string"
+            },
+            "memory": {
+              "type": "string"
+            }
+          }
+        },
+        "requests": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "cpu": {
+              "type": ["string", "integer"]
+            },
+            "ephemeral-storage": {
+              "type": "string"
+            },
+            "memory": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "lifecycleHooks": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "postStart": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "exec": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "command": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "httpGet": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "host": {
+                  "type": "string"
+                },
+                "httpHeaders": {
+                  "type": "array"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "port": {
+                  "type": "integer"
+                },
+                "scheme": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "oneOf": [
+            {
+              "required": ["exec"]
+            },
+            {
+              "required": ["httpGet"]
+            }
+          ]
+        },
+        "preStop": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "exec": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "command": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "httpGet": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "host": {
+                  "type": "string"
+                },
+                "httpHeaders": {
+                  "type": "array"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "port": {
+                  "type": "integer"
+                },
+                "scheme": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "oneOf": [
+            {
+              "required": ["exec"]
+            },
+            {
+              "required": ["httpGet"]
+            }
+          ]
+        }
+      }
+    },
+    "livenessProbe": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "initialDelaySeconds": {
+          "type": "integer"
+        },
+        "periodSeconds": {
+          "type": "integer"
+        },
+        "timeoutSeconds": {
+          "type": "integer"
+        },
+        "failureThreshold": {
+          "type": "integer"
+        },
+        "terminationGracePeriodSeconds": {
+          "type": "integer"
+        },
+        "httpGet": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "port": {
+              "type": "integer"
+            },
+            "path": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "readinessProbe": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "initialDelaySeconds": {
+          "type": "integer"
+        },
+        "periodSeconds": {
+          "type": "integer"
+        },
+        "timeoutSeconds": {
+          "type": "integer"
+        },
+        "successThreshold": {
+          "type": "integer"
+        },
+        "failureThreshold": {
+          "type": "integer"
+        },
+        "httpGet": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "port": {
+              "type": "integer"
+            },
+            "path": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "startupProbe": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "initialDelaySeconds": {
+          "type": "integer"
+        },
+        "periodSeconds": {
+          "type": "integer"
+        },
+        "timeoutSeconds": {
+          "type": "integer"
+        },
+        "failureThreshold": {
+          "type": "integer"
+        },
+        "terminationGracePeriodSeconds": {
+          "type": "integer"
+        },
+        "httpGet": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "port": {
+              "type": "integer"
+            },
+            "path": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "podAnnotations": {
+      "type": "object"
+    },
+    "podLabels": {
+      "type": "object"
+    },
+    "additionalLabels": {
+      "type": "object"
+    },
+    "hostNetwork": {
+      "type": "boolean"
+    },
+    "hostAliases": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "dnsPolicy": {
+      "type": "string",
+      "enum": ["ClusterFirst", "ClusterFirstWithHostNet", "Default", "None", ""]
+    },
+    "dnsConfig": {
+      "type": "object"
+    },
+    "replicaCount": {
+      "type": "integer"
+    },
+    "revisionHistoryLimit": {
+      "type": "integer"
+    },
+    "annotations": {
+      "type": "object"
+    },
+    "service": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "type": {
+          "type": "string",
+          "enum": ["ClusterIP", "NodePort", "LoadBalancer", "ExternalName"]
+        },
+        "clusterIP": {
+          "type": "string"
+        },
+        "loadBalancerIP": {
+          "type": "string"
+        },
+        "loadBalancerSourceRanges": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "annotations": {
+          "type": "object"
+        },
+        "internalTrafficPolicy": {
+          "type": "string",
+          "enum": ["Cluster", "Local", ""]
+        },
+        "externalTrafficPolicy": {
+          "type": "string",
+          "enum": ["Cluster", "Local", ""]
+        }
+      }
+    },
+    "ingress": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "ingressClassName": {
+          "type": "string"
+        },
+        "annotations": {
+          "type": "object"
+        },
+        "hosts": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "host": {
+                "type": "string"
+              },
+              "paths": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "path": {
+                      "type": "string"
+                    },
+                    "pathType": {
+                      "type": "string",
+                      "enum": ["Exact", "Prefix", "ImplementationSpecific"]
+                    },
+                    "port": {
+                      "type": "integer"
+                    }
+                  },
+                  "required": ["path", "pathType", "port"]
+                }
+              }
+            },
+            "required": ["paths"]
+          }
+        },
+        "tls": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "secretName": {
+                "type": "string"
+              },
+              "hosts": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "additionalIngresses": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "ingressClassName": {
+                "type": "string"
+              },
+              "annotations": {
+                "type": "object"
+              },
+              "hosts": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "host": {
+                      "type": "string"
+                    },
+                    "paths": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                          "path": {
+                            "type": "string"
+                          },
+                          "pathType": {
+                            "type": "string",
+                            "enum": [
+                              "Exact",
+                              "Prefix",
+                              "ImplementationSpecific"
+                            ]
+                          },
+                          "port": {
+                            "type": "integer"
+                          }
+                        },
+                        "required": ["path", "pathType", "port"]
+                      }
+                    }
+                  },
+                  "required": ["paths"]
+                }
+              },
+              "tls": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "secretName": {
+                      "type": "string"
+                    },
+                    "hosts": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "required": ["name"]
+          }
+        }
+      },
+      "required": ["enabled"]
+    },
+    "podMonitor": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "metricsEndpoints": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "extraLabels": {
+          "type": "object"
+        }
+      },
+      "required": ["enabled"]
+    },
+    "serviceMonitor": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "metricsEndpoints": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "extraLabels": {
+          "type": "object"
+        },
+        "relabelings": {
+          "type": "array",
+          "description": "The relabelings Schema",
+          "default": [],
+          "items": {}
+        },
+        "metricRelabelings": {
+            "type": "array",
+            "default": [],
+            "title": "The metricRelabelings Schema",
+            "items": {},
+            "examples": [
+                []
+            ]
+        }
+      },
+      "required": ["enabled"]
+    },
+    "podDisruptionBudget": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "required": ["enabled"]
+    },
+    "autoscaling": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "minReplicas": {
+          "type": "integer"
+        },
+        "maxReplicas": {
+          "type": "integer"
+        },
+        "behavior": {
+          "type": "object"
+        },
+        "targetCPUUtilizationPercentage": {
+          "type": "integer"
+        }
+      },
+      "required": ["enabled"]
+    },
+    "rollout": {
+      "type": "object",
+      "properties": {
+        "rollingUpdate": {
+          "type": "object",
+          "properties": {
+            "maxSurge": {
+              "$ref": "#/$defs/intOrString"
+            },
+            "maxUnavailable": {
+              "$ref": "#/$defs/intOrString"
+            }
+          }
+        },
+        "strategy": {
+          "type": "string",
+          "enum": ["OnDelete", "Recreate", "RollingUpdate"],
+          "default": "RollingUpdate"
+        }
+      },
+      "required": ["strategy"]
+    },
+    "prometheusRule": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "groups": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "defaultRules": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          },
+          "required": ["enabled"]
+        },
+        "extraLabels": {
+          "type": "object"
+        }
+      },
+      "required": ["enabled"]
+    },
+    "statefulset": {
+      "type": "object",
+      "properties": {
+        "volumeClaimTemplates": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "podManagementPolicy": {
+          "type": "string"
+        }
+      }
+    },
+    "networkPolicy": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+            "enabled": {
+                "type": "boolean"
+            },
+            "annotations": {
+              "type": "object"
+            },
+            "allowIngressFrom": {
+              "type": "array",
+              "description": "List of sources which should be able to access the collector. See the standard NetworkPolicy 'spec.ingress.from' definition for more information: https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/. If left empty, ingress traffic will be permitted on to all enabled ports from all sources.",
+              "items": {
+                "type": "object"
+              }
+            },
+            "extraIngressRules": {
+              "type": "array",
+              "description": "Additional ingress rules to apply to the policy. See the standard NetworkPolicy 'spec.ingress' definition for more information: https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/",
+              "items": {
+                "type": "object"
+              }
+            },
+            "egressRules": {
+              "description": "Optional egress configuration, see the standard NetworkPolicy 'spec.egress' definition for more information: https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/",
+              "type": "array",
+              "items": {
+                "type": "object"
+              }
+            }
+        }
+    },
+    "useGOMEMLIMIT": {
+      "type": "boolean"
+    },
+    "shareProcessNamespace": {
+      "type": "boolean"
+    }
+  },
+  "required": ["mode"]
+}
diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml
new file mode 100644
index 00000000..e989806f
--- /dev/null
+++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml
@@ -0,0 +1,569 @@
+# Default values for opentelemetry-collector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+nameOverride: ""
+fullnameOverride: ""
+# Valid values are "daemonset", "deployment", and "statefulset".
+mode: ""
+# Specify which namespace should be used to deploy the resources into
+namespaceOverride: ""
+# Handles basic configuration of components that
+# also require k8s modifications to work correctly.
+# .Values.config can be used to modify/add to a preset
+# component configuration, but CANNOT be used to remove
+# preset configuration. If you require removal of any
+# sections of a preset configuration, you cannot use
+# the preset. Instead, configure the component manually in
+# .Values.config and use the other fields supplied in the
+# values.yaml to configure k8s as necessary.
+presets:
+  # Configures the collector to collect logs.
+  # Adds the filelog receiver to the logs pipeline
+  # and adds the necessary volumes and volume mounts.
+  # Best used with mode = daemonset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#filelog-receiver for details on the receiver.
+  logsCollection:
+    enabled: false
+    includeCollectorLogs: false
+    # Enabling this writes checkpoints in /var/lib/otelcol/ host directory.
+    # Note this changes collector's user to root, so that it can write to host directory.
+    storeCheckpoints: false
+    # The maximum bytes size of the recombined field.
+    # Once the size exceeds the limit, all received entries of the source will be combined and flushed.
+    maxRecombineLogSize: 102400
+  # Configures the collector to collect host metrics.
+  # Adds the hostmetrics receiver to the metrics pipeline
+  # and adds the necessary volumes and volume mounts.
+  # Best used with mode = daemonset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#host-metrics-receiver for details on the receiver.
+  hostMetrics:
+    enabled: false
+  # Configures the Kubernetes Processor to add Kubernetes metadata.
+  # Adds the k8sattributes processor to all the pipelines
+  # and adds the necessary rules to ClusteRole.
+  # Best used with mode = daemonset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-attributes-processor for details on the receiver.
+  kubernetesAttributes:
+    enabled: false
+    # When enabled the processor will extra all labels for an associated pod and add them as resource attributes.
+    # The label's exact name will be the key.
+    extractAllPodLabels: false
+    # When enabled the processor will extra all annotations for an associated pod and add them as resource attributes.
+    # The annotation's exact name will be the key.
+    extractAllPodAnnotations: false
+  # Configures the collector to collect node, pod, and container metrics from the API server on a kubelet..
+  # Adds the kubeletstats receiver to the metrics pipeline
+  # and adds the necessary rules to ClusteRole.
+  # Best used with mode = daemonset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubeletstats-receiver for details on the receiver.
+  kubeletMetrics:
+    enabled: false
+  # Configures the collector to collect kubernetes events.
+  # Adds the k8sobject receiver to the logs pipeline
+  # and collects kubernetes events by default.
+  # Best used with mode = deployment or statefulset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-objects-receiver for details on the receiver.
+  kubernetesEvents:
+    enabled: false
+  # Configures the Kubernetes Cluster Receiver to collect cluster-level metrics.
+  # Adds the k8s_cluster receiver to the metrics pipeline
+  # and adds the necessary rules to ClusteRole.
+  # Best used with mode = deployment or statefulset.
+  # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-cluster-receiver for details on the receiver.
+  clusterMetrics:
+    enabled: false
+configMap:
+  # Specifies whether a configMap should be created (true by default)
+  create: true
+  # Specifies an existing ConfigMap to be mounted to the pod
+  # The ConfigMap MUST include the collector configuration via a key named 'relay' or the collector will not start.
+  existingName: ""
+  # Specifies the relative path to custom ConfigMap template file. This option SHOULD be used when bundling a custom
+  # ConfigMap template, as it enables pod restart via a template checksum annotation.
+  # existingPath: ""
+# Base collector configuration.
+# Supports templating. To escape existing instances of {{ }}, use {{` <original content> `}}.
+# For example, {{ REDACTED_EMAIL }} becomes {{` {{ REDACTED_EMAIL }} `}}.
+config:
+  exporters:
+    debug: {}
+  extensions:
+    # 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:
+      endpoint: ${env:MY_POD_IP}:13133
+  processors:
+    batch: {}
+    # Default memory limiter configuration for the collector based on k8s resource limits.
+    memory_limiter:
+      # check_interval is the time between measurements of memory usage.
+      check_interval: 5s
+      # By default limit_mib is set to 80% of ".Values.resources.limits.memory"
+      limit_percentage: 80
+      # By default spike_limit_mib is set to 25% of ".Values.resources.limits.memory"
+      spike_limit_percentage: 25
+  receivers:
+    otlp:
+      protocols:
+        grpc:
+          endpoint: ${env:MY_POD_IP}:4317
+        http:
+          endpoint: ${env:MY_POD_IP}:4318
+    prometheus:
+      config:
+        scrape_configs:
+          - job_name: opentelemetry-collector
+            scrape_interval: 10s
+            static_configs:
+              - targets:
+                  - ${env:MY_POD_IP}:8888
+  service:
+    telemetry:
+      metrics:
+        address: ${env:MY_POD_IP}:8888
+    extensions:
+      - health_check
+    pipelines:
+      traces:
+        exporters:
+          - debug
+        processors:
+          - memory_limiter
+          - batch
+        receivers:
+          - otlp
+          - jaeger
+          - zipkin
+# Helm currently has an issue (https://github.com/helm/helm/pull/12879) when using null to remove
+# default configuration from a subchart. The result is that you cannot remove default configuration
+# from `config`, such as a specific recevier or a specific pipeline, when the chart is used as a
+# subchart.
+#
+# Until the helm bug is fixed, this field is provided as an alternative when using this chart as a subchart.
+# It is not recommended to use this field when installing the chart directly.
+#
+# When not empty, `alternateConfig` will be used to set the collector's configuration. It has NO default
+# values and IS NOT MERGED with config. Any configuration provided via `config` will be ignored when
+# `alternateConfig` is set. You MUST provide your own collector configuration.
+#
+# Reminder that the healthcheck extension (or something else that provides the same functionality) is required.
+#
+# Components configured by presets will be injected in the same way they are for `config`.
+alternateConfig: {}
+image:
+  # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`.
+  repository: ""
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+  # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
+  digest: ""
+imagePullSecrets: []
+# OpenTelemetry Collector executable
+command:
+  name: ""
+  extraArgs: []
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+clusterRole:
+  # Specifies whether a clusterRole should be created
+  # Some presets also trigger the creation of a cluster role and cluster role binding.
+  # If using one of those presets, this field is no-op.
+  create: false
+  # Annotations to add to the clusterRole
+  # Can be used in combination with presets that create a cluster role.
+  annotations: {}
+  # The name of the clusterRole to use.
+  # If not set a name is generated using the fullname template
+  # Can be used in combination with presets that create a cluster role.
+  name: ""
+  # A set of rules as documented here : https://kubernetes.io/docs/reference/access-authn-authz/rbac/
+  # Can be used in combination with presets that create a cluster role to add additional rules.
+  rules: []
+  # - apiGroups:
+  #   - ''
+  #   resources:
+  #   - 'pods'
+  #   - 'nodes'
+  #   verbs:
+  #   - 'get'
+  #   - 'list'
+  #   - 'watch'
+
+  clusterRoleBinding:
+    # Annotations to add to the clusterRoleBinding
+    # Can be used in combination with presets that create a cluster role binding.
+    annotations: {}
+    # The name of the clusterRoleBinding to use.
+    # If not set a name is generated using the fullname template
+    # Can be used in combination with presets that create a cluster role binding.
+    name: ""
+podSecurityContext: {}
+securityContext: {}
+nodeSelector: {}
+tolerations: []
+affinity: {}
+topologySpreadConstraints: []
+# Allows for pod scheduler prioritisation
+priorityClassName: ""
+extraEnvs: []
+extraEnvsFrom: []
+# This also supports template content, which will eventually be converted to yaml.
+extraVolumes: []
+# This also supports template content, which will eventually be converted to yaml.
+extraVolumeMounts: []
+# Configuration for ports
+# nodePort is also allowed
+ports:
+  otlp:
+    enabled: true
+    containerPort: 4317
+    servicePort: 4317
+    hostPort: 4317
+    protocol: TCP
+    # nodePort: 30317
+    appProtocol: grpc
+  otlp-http:
+    enabled: true
+    containerPort: 4318
+    servicePort: 4318
+    hostPort: 4318
+    protocol: TCP
+  jaeger-compact:
+    enabled: true
+    containerPort: 6831
+    servicePort: 6831
+    hostPort: 6831
+    protocol: UDP
+  jaeger-thrift:
+    enabled: true
+    containerPort: 14268
+    servicePort: 14268
+    hostPort: 14268
+    protocol: TCP
+  jaeger-grpc:
+    enabled: true
+    containerPort: 14250
+    servicePort: 14250
+    hostPort: 14250
+    protocol: TCP
+  zipkin:
+    enabled: true
+    containerPort: 9411
+    servicePort: 9411
+    hostPort: 9411
+    protocol: TCP
+  metrics:
+    # The metrics port is disabled by default. However you need to enable the port
+    # in order to use the ServiceMonitor (serviceMonitor.enabled) or PodMonitor (podMonitor.enabled).
+    enabled: false
+    containerPort: 8888
+    servicePort: 8888
+    protocol: TCP
+# When enabled, the chart will set the GOMEMLIMIT env var to 80% of the configured resources.limits.memory.
+# If no resources.limits.memory are defined then enabling does nothing.
+# It is HIGHLY recommend to enable this setting and set a value for resources.limits.memory.
+useGOMEMLIMIT: true
+# Resource limits & requests.
+# It is HIGHLY recommended to set resource limits.
+resources: {}
+# resources:
+#   limits:
+#     cpu: 250m
+#     memory: 512Mi
+
+podAnnotations: {}
+podLabels: {}
+# Common labels to add to all otel-collector resources. Evaluated as a template.
+additionalLabels: {}
+#  app.kubernetes.io/part-of: my-app
+
+# Host networking requested for this pod. Use the host's network namespace.
+hostNetwork: false
+# Adding entries to Pod /etc/hosts with HostAliases
+# https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/
+hostAliases: []
+# - ip: "1.2.3.4"
+#   hostnames:
+#     - "my.host.com"
+
+# Pod DNS policy ClusterFirst, ClusterFirstWithHostNet, None, Default, None
+dnsPolicy: ""
+# Custom DNS config. Required when DNS policy is None.
+dnsConfig: {}
+# only used with deployment mode
+replicaCount: 1
+# only used with deployment mode
+revisionHistoryLimit: 10
+annotations: {}
+# List of extra sidecars to add.
+# This also supports template content, which will eventually be converted to yaml.
+extraContainers: []
+# extraContainers:
+#   - name: test
+#     command:
+#       - cp
+#     args:
+#       - /bin/sleep
+#       - /test/sleep
+#     image: busybox:latest
+#     volumeMounts:
+#       - name: test
+#         mountPath: /test
+
+# List of init container specs, e.g. for copying a binary to be executed as a lifecycle hook.
+# This also supports template content, which will eventually be converted to yaml.
+# Another usage of init containers is e.g. initializing filesystem permissions to the OTLP Collector user `10001` in case you are using persistence and the volume is producing a permission denied error for the OTLP Collector container.
+initContainers: []
+# initContainers:
+#   - name: test
+#     image: busybox:latest
+#     command:
+#       - cp
+#     args:
+#       - /bin/sleep
+#       - /test/sleep
+#     volumeMounts:
+#       - name: test
+#         mountPath: /test
+#  - name: init-fs
+#    image: busybox:latest
+#    command:
+#      - sh
+#      - '-c'
+#      - 'chown -R 10001: /var/lib/storage/otc' # use the path given as per `extensions.file_storage.directory` & `extraVolumeMounts[x].mountPath`
+#    volumeMounts:
+#      - name: opentelemetry-collector-data # use the name of the volume used for persistence
+#        mountPath: /var/lib/storage/otc # use the path given as per `extensions.file_storage.directory` & `extraVolumeMounts[x].mountPath`
+
+# Pod lifecycle policies.
+lifecycleHooks: {}
+# lifecycleHooks:
+#   preStop:
+#     exec:
+#       command:
+#       - /test/sleep
+#       - "5"
+
+# liveness probe configuration
+# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+##
+livenessProbe:
+  # Number of seconds after the container has started before startup, liveness or readiness probes are initiated.
+  # initialDelaySeconds: 1
+  # How often in seconds to perform the probe.
+  # periodSeconds: 10
+  # Number of seconds after which the probe times out.
+  # timeoutSeconds: 1
+  # Minimum consecutive failures for the probe to be considered failed after having succeeded.
+  # failureThreshold: 1
+  # Duration in seconds the pod needs to terminate gracefully upon probe failure.
+  # terminationGracePeriodSeconds: 10
+  httpGet:
+    port: 13133
+    path: /
+# readiness probe configuration
+# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+##
+readinessProbe:
+  # Number of seconds after the container has started before startup, liveness or readiness probes are initiated.
+  # initialDelaySeconds: 1
+  # How often (in seconds) to perform the probe.
+  # periodSeconds: 10
+  # Number of seconds after which the probe times out.
+  # timeoutSeconds: 1
+  # Minimum consecutive successes for the probe to be considered successful after having failed.
+  # successThreshold: 1
+  # Minimum consecutive failures for the probe to be considered failed after having succeeded.
+  # failureThreshold: 1
+  httpGet:
+    port: 13133
+    path: /
+# startup probe configuration
+# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+##
+startupProbe: {}
+# Number of seconds after the container has started before startup probes are initiated.
+# initialDelaySeconds: 1
+# How often in seconds to perform the probe.
+# periodSeconds: 10
+# Number of seconds after which the probe times out.
+# timeoutSeconds: 1
+# Minimum consecutive failures for the probe to be considered failed after having succeeded.
+# failureThreshold: 1
+# Duration in seconds the pod needs to terminate gracefully upon probe failure.
+# terminationGracePeriodSeconds: 10
+# httpGet:
+#   port: 13133
+#   path: /
+
+service:
+  # Enable the creation of a Service.
+  # By default, it's enabled on mode != daemonset.
+  # However, to enable it on mode = daemonset, its creation must be explicitly enabled
+  # enabled: true
+  type: ClusterIP
+  # type: LoadBalancer
+  # loadBalancerIP: 1.2.3.4
+  # loadBalancerSourceRanges: []
+
+  # By default, Service of type 'LoadBalancer' will be created setting 'externalTrafficPolicy: Cluster'
+  # unless other value is explicitly set.
+  # Possible values are Cluster or Local (https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip)
+  # externalTrafficPolicy: Cluster
+  annotations: {}
+  # By default, Service will be created setting 'internalTrafficPolicy: Local' on mode = daemonset
+  # unless other value is explicitly set.
+  # Setting 'internalTrafficPolicy: Cluster' on a daemonset is not recommended
+  # internalTrafficPolicy: Cluster
+ingress:
+  enabled: false
+  # annotations: {}
+  # ingressClassName: nginx
+  # hosts:
+  #   - host: collector.example.com
+  #     paths:
+  #       - path: /
+  #         pathType: Prefix
+  #         port: 4318
+  # tls:
+  #   - secretName: collector-tls
+  #     hosts:
+  #       - collector.example.com
+
+  # Additional ingresses - only created if ingress.enabled is true
+  # Useful for when differently annotated ingress services are required
+  # Each additional ingress needs key "name" set to something unique
+  additionalIngresses: []
+  # - name: cloudwatch
+  #   ingressClassName: nginx
+  #   annotations: {}
+  #   hosts:
+  #     - host: collector.example.com
+  #       paths:
+  #         - path: /
+  #           pathType: Prefix
+  #           port: 4318
+  #   tls:
+  #     - secretName: collector-tls
+  #       hosts:
+  #         - collector.example.com
+podMonitor:
+  # The pod monitor by default scrapes the metrics port.
+  # The metrics port needs to be enabled as well.
+  enabled: false
+  metricsEndpoints:
+    - port: metrics
+      # interval: 15s
+  # additional labels for the PodMonitor
+  extraLabels: {}
+  #   release: kube-prometheus-stack
+serviceMonitor:
+  # The service monitor by default scrapes the metrics port.
+  # The metrics port needs to be enabled as well.
+  enabled: false
+  metricsEndpoints:
+    - port: metrics
+      # interval: 15s
+  # additional labels for the ServiceMonitor
+  extraLabels: {}
+  #  release: kube-prometheus-stack
+  # Used to set relabeling and metricRelabeling configs on the ServiceMonitor
+  # https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+  relabelings: []
+  metricRelabelings: []
+# PodDisruptionBudget is used only if deployment enabled
+podDisruptionBudget:
+  enabled: false
+#   minAvailable: 2
+#   maxUnavailable: 1
+
+# autoscaling is used only if mode is "deployment" or "statefulset"
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 10
+  behavior: {}
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+rollout:
+  rollingUpdate: {}
+  # When 'mode: daemonset', maxSurge cannot be used when hostPort is set for any of the ports
+  # maxSurge: 25%
+  # maxUnavailable: 0
+  strategy: RollingUpdate
+prometheusRule:
+  enabled: false
+  groups: []
+  # Create default rules for monitoring the collector
+  defaultRules:
+    enabled: false
+  # additional labels for the PrometheusRule
+  extraLabels: {}
+statefulset:
+  # volumeClaimTemplates for a statefulset
+  volumeClaimTemplates: []
+  podManagementPolicy: "Parallel"
+  # Controls if and how PVCs created by the StatefulSet are deleted. Available in Kubernetes 1.23+.
+  persistentVolumeClaimRetentionPolicy:
+    enabled: false
+    whenDeleted: Retain
+    whenScaled: Retain
+networkPolicy:
+  enabled: false
+  # Annotations to add to the NetworkPolicy
+  annotations: {}
+  # Configure the 'from' clause of the NetworkPolicy.
+  # By default this will restrict traffic to ports enabled for the Collector. If
+  # you wish to further restrict traffic to other hosts or specific namespaces,
+  # see the standard NetworkPolicy 'spec.ingress.from' definition for more info:
+  # https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/
+  allowIngressFrom: []
+  # # Allow traffic from any pod in any namespace, but not external hosts
+  # - namespaceSelector: {}
+  # # Allow external access from a specific cidr block
+  # - ipBlock:
+  #     cidr: 192.168.1.64/32
+  # # Allow access from pods in specific namespaces
+  # - namespaceSelector:
+  #     matchExpressions:
+  #       - key: kubernetes.io/metadata.name
+  #         operator: In
+  #         values:
+  #           - "cats"
+  #           - "dogs"
+
+  # Add additional ingress rules to specific ports
+  # Useful to allow external hosts/services to access specific ports
+  # An example is allowing an external prometheus server to scrape metrics
+  #
+  # See the standard NetworkPolicy 'spec.ingress' definition for more info:
+  # https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/
+  extraIngressRules: []
+  # - ports:
+  #   - port: metrics
+  #     protocol: TCP
+  #   from:
+  #     - ipBlock:
+  #         cidr: 192.168.1.64/32
+
+  # Restrict egress traffic from the OpenTelemetry collector pod
+  # See the standard NetworkPolicy 'spec.egress' definition for more info:
+  # https://kubernetes.io/docs/reference/kubernetes-api/policy-resources/network-policy-v1/
+  egressRules: []
+  #  - to:
+  #      - namespaceSelector: {}
+  #      - ipBlock:
+  #          cidr: 192.168.10.10/24
+  #    ports:
+  #      - port: 1234
+  #        protocol: TCP
+# Allow containers to share processes across pod namespace
+shareProcessNamespace: false
diff --git a/charts/kubezero-telemetry/update.sh b/charts/kubezero-telemetry/update.sh
index 21a62009..0d35de3d 100755
--- a/charts/kubezero-telemetry/update.sh
+++ b/charts/kubezero-telemetry/update.sh
@@ -9,8 +9,12 @@ update_helm
 FLUENT_BIT_VERSION=$(yq eval '.dependencies[] | select(.name=="fluent-bit") | .version' Chart.yaml)
 FLUENTD_VERSION=$(yq eval '.dependencies[] | select(.name=="fluentd") | .version' Chart.yaml)
 
+# OTEL
+patch_chart opentelemetry-collector
+yq -i 'del(.config.receivers.jaeger)|del(.config.receivers.zipkin)|del(.config.service.pipelines.metrics)|del(.config.service.pipelines.logs)' charts/opentelemetry-collector/values.yaml
+
 # fluent-bit
-patch_chart fluent-bit
+# patch_chart fluent-bit
 
 # FluentD
 patch_chart fluentd
diff --git a/charts/kubezero-telemetry/values.yaml b/charts/kubezero-telemetry/values.yaml
index b7914062..205dc5cb 100644
--- a/charts/kubezero-telemetry/values.yaml
+++ b/charts/kubezero-telemetry/values.yaml
@@ -1,6 +1,9 @@
 data-prepper:
   enabled: false
 
+  image:
+    tag: 2.10.1
+
   securityContext:
     capabilities:
       drop:
@@ -113,7 +116,6 @@ opentelemetry-collector:
     extensions:
       health_check:
         endpoint: ${env:MY_POD_IP}:13133
-      memory_ballast: {}
 
     exporters:
       otlp/jaeger:
@@ -125,14 +127,7 @@ opentelemetry-collector:
         tls:
           insecure: true
 
-    processors:
-      batch: {}
-      # If set to null, will be overridden with values based on k8s resource limits
-      memory_limiter: null
-
     receivers:
-      jaeger: null
-      zipkin: null
       otlp:
         protocols:
           grpc:
@@ -145,10 +140,7 @@ opentelemetry-collector:
           address: ${env:MY_POD_IP}:8888
       extensions:
         - health_check
-        - memory_ballast
       pipelines:
-        metrics: null
-        logs: null
         traces:
           exporters:
             - otlp/jaeger
@@ -228,7 +220,7 @@ jaeger:
     url: jaeger.example.com
 
 opensearch:
-  version: 2.16.0
+  version: 2.17.0
   prometheus: false
 
   # custom cluster settings
@@ -274,7 +266,7 @@ fluentd:
   #- fluent-plugin-s3
 
   source:
-    sharedKey: secretref+k8s://v1/Secret/kube-system/kubezero-secrets/telemetry.fluentd.source.sharedKey # "cloudbender"
+    sharedKey: secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey # "cloudbender"
 
   output:
     # Defaults to OpenSearch in same namespace
@@ -509,7 +501,7 @@ fluent-bit:
   config:
     output:
       host: telemetry-fluentd
-      sharedKey: secretref+k8s://v1/Secret/kube-system/kubezero-secrets/telemetry.fluentd.source.sharedKey
+      sharedKey: secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey
       tls: false
 
     output_otel:
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index f9c6f5c0..77f65806 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -91,7 +91,7 @@ falco:
 telemetry:
   enabled: false
   namespace: telemetry
-  targetRevision: 0.4.0
+  targetRevision: 0.4.1
 
 operators:
   enabled: false