diff --git a/charts/kubezero-telemetry/Chart.yaml b/charts/kubezero-telemetry/Chart.yaml index 7c2571ae..cd585b1c 100644 --- a/charts/kubezero-telemetry/Chart.yaml +++ b/charts/kubezero-telemetry/Chart.yaml @@ -22,6 +22,14 @@ dependencies: version: 0.125.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-collector.enabled + - name: opensearch + version: 3.0.0 + repository: https://opensearch-project.github.io/helm-charts/ + condition: opensearch.enabled + - name: opensearch-dashboards + version: 3.0.0 + repository: https://opensearch-project.github.io/helm-charts/ + condition: opensearch-dashboards.enabled - name: data-prepper version: 0.3.1 repository: https://opensearch-project.github.io/helm-charts/ diff --git a/charts/kubezero-telemetry/README.md b/charts/kubezero-telemetry/README.md index 655a802c..9e3b07db 100644 --- a/charts/kubezero-telemetry/README.md +++ b/charts/kubezero-telemetry/README.md @@ -1,6 +1,6 @@ # kubezero-telemetry -![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) +![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for OpenTelemetry, Jaeger etc. @@ -18,12 +18,14 @@ 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.10 | -| https://fluent.github.io/helm-charts | fluentd | 0.5.2 | -| 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 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | 0.2.1 | +| https://fluent.github.io/helm-charts | fluent-bit | 0.49.0 | +| https://fluent.github.io/helm-charts | fluentd | 0.5.3 | +| https://jaegertracing.github.io/helm-charts | jaeger | 3.4.1 | +| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.125.0 | +| https://opensearch-project.github.io/helm-charts/ | data-prepper | 0.3.1 | +| https://opensearch-project.github.io/helm-charts/ | opensearch | 3.0.0 | +| https://opensearch-project.github.io/helm-charts/ | opensearch-dashboards | 3.0.0 | ## Values @@ -135,7 +137,7 @@ Kubernetes: `>= 1.26.0` | fluentd.service.ports[1].containerPort | int | `9880` | | | fluentd.service.ports[1].name | string | `"http-fluentd"` | | | fluentd.service.ports[1].protocol | string | `"TCP"` | | -| fluentd.source.sharedKey | string | `"secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey"` | | +| fluentd.source.sharedKey | string | `"secretref+k8s://v1/Secret/kubezero/kubezero-secrets/telemetry.fluentd.source.sharedKey?inCluster"` | | | fluentd.volumeMounts[0].mountPath | string | `"/run/pki"` | | | fluentd.volumeMounts[0].name | string | `"trust-store"` | | | fluentd.volumeMounts[0].readOnly | bool | `true` | | @@ -167,10 +169,11 @@ Kubernetes: `>= 1.26.0` | jaeger.storage.elasticsearch.user | string | `"admin"` | | | jaeger.storage.type | string | `"elasticsearch"` | | | metrics.enabled | bool | `false` | | -| opensearch.dashboard.enabled | bool | `false` | | -| opensearch.dashboard.istio.enabled | bool | `false` | | -| opensearch.dashboard.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| opensearch.dashboard.istio.url | string | `"telemetry-dashboard.example.com"` | | +| opensearch-dashboards.enabled | bool | `false` | | +| opensearch-dashboards.istio.enabled | bool | `false` | | +| opensearch-dashboards.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | +| opensearch-dashboards.istio.url | string | `"telemetry-dashboard.example.com"` | | +| opensearch.enabled | bool | `false` | | | opensearch.nodeSets | list | `[]` | | | opensearch.prometheus | bool | `false` | | | opensearch.version | string | `"2.17.0"` | | diff --git a/charts/kubezero-telemetry/charts/fluentd/Chart.yaml b/charts/kubezero-telemetry/charts/fluentd/Chart.yaml index 1feac00b..0fb06148 100644 --- a/charts/kubezero-telemetry/charts/fluentd/Chart.yaml +++ b/charts/kubezero-telemetry/charts/fluentd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v1.16.2 +appVersion: v1.17.1 description: A Helm chart for Kubernetes home: https://www.fluentd.org/ icon: https://www.fluentd.org/images/miscellany/fluentd-logo_2x.png @@ -12,4 +12,4 @@ name: fluentd sources: - https://github.com/fluent/fluentd/ - https://github.com/fluent/fluentd-kubernetes-daemonset -version: 0.5.2 +version: 0.5.3 diff --git a/charts/kubezero-telemetry/charts/fluentd/templates/_pod.tpl b/charts/kubezero-telemetry/charts/fluentd/templates/_pod.tpl index e285e3a8..4289fe02 100644 --- a/charts/kubezero-telemetry/charts/fluentd/templates/_pod.tpl +++ b/charts/kubezero-telemetry/charts/fluentd/templates/_pod.tpl @@ -1,5 +1,5 @@ {{- define "fluentd.pod" -}} -{{- $defaultTag := printf "%s-debian-%s-1.0" (.Chart.AppVersion) (.Values.variant) -}} +{{- $defaultTag := printf "%s-debian-%s-1.2" (.Chart.AppVersion) (.Values.variant) -}} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore b/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore index 7e03f4bc..8343df64 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/.helmignore @@ -21,7 +21,7 @@ .idea/ *.tmproj .vscode/ - +examples/ # Ignore unittest tests/ */__snapshot__/* diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml index e6e44bcd..2a09f29f 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.111.0 +appVersion: 0.126.0 description: OpenTelemetry Collector Helm chart for Kubernetes home: https://opentelemetry.io/ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png @@ -12,4 +12,4 @@ sources: - https://github.com/open-telemetry/opentelemetry-collector - https://github.com/open-telemetry/opentelemetry-collector-contrib type: application -version: 0.108.0 +version: 0.125.0 diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md index a085a887..b3092277 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/README.md @@ -19,7 +19,7 @@ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm 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= --set image.repository="otel/opentelemetry-collector-k8s" --set command.name="otelcol-k8s" +helm install my-opentelemetry-collector open-telemetry/opentelemetry-collector --set mode= --set image.repository="ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" --set command.name="otelcol-k8s" ``` Where the `mode` value needs to be set to one of `daemonset`, `deployment` or `statefulset`. @@ -35,7 +35,7 @@ See [UPGRADING.md](UPGRADING.md). 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) +More info is available in the [Security Best Practices documentation](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. @@ -106,6 +106,29 @@ to read the files where Kubernetes container runtime writes all containers' cons #### :warning: Warning: Risk of looping the exported logs back into the receiver, causing "log explosion" +#### Log collection for a subset of pods or containers + +The `logsCollection` preset will by default ingest the logs of all kubernetes containers. +This is achieved by using an include path of `/var/log/pods/*/*/*.log` for the `filelog`receiver. + +To limit the import to a certain subset of pods or containers, the `filelog` +receivers `include` list can be overwritten by supplying explicit configuration. + +E.g. The following configuration would only import logs for pods within the namespace: `example-namespace`: + +```yaml +mode: daemonset + +presets: + logsCollection: + enabled: true +config: + receivers: + filelog: + include: + - /var/log/pods/example-namespace_*/*/*.log +``` + 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. @@ -149,6 +172,10 @@ 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. +#### :memo: Note: Changing or supplementing `k8sattributes` scopes + +In order to minimize the collector's privileges, the [Kubernetes RBAC Rules](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) that are applied to the collector as part of this chart are the minimum required for the `presets.kubernetesAttributes` preset to work. If additional configuration scopes are desired outside of the preset you must apply the corresponding RBAC rules to grant the collector access. + To enable this feature, set the `presets.kubernetesAttributes.enabled` property to `true`. Here is an example `values.yaml`: diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md index 83102433..23933543 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/UPGRADING.md @@ -4,6 +4,14 @@ These upgrade guidelines only contain instructions for version upgrades which re 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.121.0 to 0.122.0 + +In the v0.123.1 Collector release we stopped pushing images to Dockerhub due to how their new rate limit changes affected our CI. If you're using `otel/opentelemetry-collector-k8s` for the image you should switch to `ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s`. See https://github.com/open-telemetry/community/issues/2641 for more details. + +## 0.110.0 to 0.110.1 or 0.110.2 + +We broke the selector labels in `0.110.0`, which causes `helm upgrades` to fail. Do not attempt to upgrade from `0.110.0` to either `0.110.1` or `0.110.2`. Go straight to `0.110.3` instead. + ## 0.97.2 to 0.98.0 > [!WARNING] diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml index cc0570fe..ed207cb6 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml index 01acd446..c9576767 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/clusterrole-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 577cf4d2..98b01816 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/config-override-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml index 0f1d6190..f3e0a7a6 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/daemonset-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml index 447a3f13..024b868a 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/deployment-values.yaml @@ -4,7 +4,7 @@ global: mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" @@ -19,6 +19,10 @@ resources: podLabels: testLabel: "{{ .Values.global.test }}" +additionalLabels: + testLabel: "{{ .Values.global.test }}" + someLabel: "someValue" + ingress: enabled: true hosts: 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 index b7a67bdf..686ae686 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 3fe38538..c191c4fa 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index cbf3c605..2a6567a9 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml @@ -1,7 +1,7 @@ mode: statefulset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/internalTelemetryViaOTLP-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/internalTelemetryViaOTLP-values.yaml new file mode 100644 index 00000000..c685e919 --- /dev/null +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/internalTelemetryViaOTLP-values.yaml @@ -0,0 +1,21 @@ +mode: deployment + +image: + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" + +resources: + limits: + cpu: 100m + memory: 200M + +internalTelemetryViaOTLP: + endpoint: "http://localhost:4318" + headers: + - name: "x-opentelemetry-customer" + value: "a value" + traces: + enabled: true + metrics: + enabled: true + logs: + enabled: true 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 index 4b9df752..eb7a4ce5 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index d08d368c..d822cde4 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml index 7e80cb47..c90a8379 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/networkpolicy-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-env-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-env-values.yaml new file mode 100644 index 00000000..a9422a2f --- /dev/null +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-env-values.yaml @@ -0,0 +1,15 @@ +mode: deployment + +image: + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" + +resources: + limits: + cpu: 100m + memory: 200M + +config: + service: + telemetry: + metrics: + address: ${env:MY_POD_IP}:8888 diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-url-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-url-values.yaml new file mode 100644 index 00000000..cf8ce62d --- /dev/null +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/old-metrics-url-values.yaml @@ -0,0 +1,17 @@ +mode: deployment + +image: + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" + +resources: + limits: + cpu: 100m + memory: 200M + +config: + service: + telemetry: + metrics: + address: 0.0.0.0:8888 + resource: + "k8s.namespace.name": "default" 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 index 8c21aeb3..905306b8 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 4889c014..f521ed2c 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 65782919..35ac2f5c 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml @@ -1,7 +1,7 @@ mode: deployment image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 83dd9cab..875dd3a9 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index ef32ac98..634d9122 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" 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 index 1dd9a8e5..903702a0 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml index 60600dc1..ed3c3978 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/probes-values.yaml @@ -1,7 +1,7 @@ mode: daemonset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml index 76de30c7..09639a11 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/ci/statefulset-values.yaml @@ -1,7 +1,7 @@ mode: statefulset image: - repository: "otel/opentelemetry-collector-k8s" + repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s" command: name: "otelcol-k8s" diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md b/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md deleted file mode 100644 index 8f2ac4c2..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# 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 deleted file mode 100644 index 1e78af46..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3f14fb34..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# 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 deleted file mode 100644 index 41ae5379..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml +++ /dev/null @@ -1,68 +0,0 @@ ---- -# 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 deleted file mode 100644 index e6a0c233..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index e0f6a5fd..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/alternate-config/values.yaml +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 5b21b7bb..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 1c80d158..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index c606f8b5..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml +++ /dev/null @@ -1,93 +0,0 @@ ---- -# 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 deleted file mode 100644 index c16fb522..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 89d3d2e5..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ /dev/null @@ -1,104 +0,0 @@ ---- -# 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 deleted file mode 100644 index a5da929b..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 9b7052f6..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# 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 deleted file mode 100644 index 5490aa7c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ /dev/null @@ -1,110 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 085361ed..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index c6cefe66..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ /dev/null @@ -1,133 +0,0 @@ ---- -# 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 deleted file mode 100644 index 8163477b..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ /dev/null @@ -1,105 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 10dd2576..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 14ebd417..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 6b09682d..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ /dev/null @@ -1,119 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 58acddac..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 14ebd417..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 535b458a..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ /dev/null @@ -1,98 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 71002cc6..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/daemonset-only/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index c16fb522..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 2425fd5c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 91820513..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-only/values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index b2a37412..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index b42bda27..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ /dev/null @@ -1,82 +0,0 @@ ---- -# 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 deleted file mode 100644 index 38e16e6d..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3297147a..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 098843d5..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index e28a6b3b..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ /dev/null @@ -1,101 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 9455c12f..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3f14fb34..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# 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 deleted file mode 100644 index 1111d1c6..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ /dev/null @@ -1,112 +0,0 @@ ---- -# 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 deleted file mode 100644 index fdaf9e98..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ /dev/null @@ -1,94 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 666a1eeb..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 1b9f35dc..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 284ee6c7..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index e68020ef..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ /dev/null @@ -1,101 +0,0 @@ ---- -# 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 deleted file mode 100644 index c1e9dba5..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-only/values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 1b9f35dc..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 284ee6c7..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 7fdd460f..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml +++ /dev/null @@ -1,126 +0,0 @@ ---- -# 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 deleted file mode 100644 index 269e20a8..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index c16fb522..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index a5da929b..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 7a29aad5..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 9e60935d..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 06ed084b..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-custom-config/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index c16fb522..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# 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 deleted file mode 100644 index 4558f3bc..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml +++ /dev/null @@ -1,93 +0,0 @@ ---- -# 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 deleted file mode 100644 index a805ec64..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# 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 deleted file mode 100644 index 3fb5379c..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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 deleted file mode 100644 index 6c12f1b1..00000000 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/examples/using-shared-processes/values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -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 index 83f8a11c..d1a23125 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/NOTES.txt @@ -20,8 +20,8 @@ {{ 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." }} +{{- if and (not (has "health_check" .Values.config.service.extensions)) (not (has "healthcheckv2" .Values.config.service.extensions)) }} +{{ fail "[ERROR] The opentelemetry-collector chart requires that the health_check extension or the healthcheckv2 extension to be included in the extension list." }} {{- end}} {{- if not .Values.configMap.create }} @@ -37,7 +37,7 @@ {{ 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. +[WARNING] No resource limits or requests were set. Consider setting resource requests and limits for your collector(s) via the `resources` field. {{ end }} {{- if and (eq .Values.mode "daemonset") (eq .Values.service.internalTrafficPolicy "Cluster") }} @@ -47,3 +47,19 @@ {{- 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 }} + +{{- if or (and (.Values.internalTelemetryViaOTLP.traces.enabled) (not (or .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.traces.endpoint))) }} +{{ fail "[ERROR] internalTelemetryViaOTLP.endpoint or .Values.internalTelemetryViaOTLP.traces.endpoint must be set when internalTelemetryViaOTLP.traces.enabled is true" }} +{{ end }} + +{{- if or (and (.Values.internalTelemetryViaOTLP.metrics.enabled) (not (or .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.metrics.endpoint))) }} +{{ fail "[ERROR] internalTelemetryViaOTLP.endpoint or .Values.internalTelemetryViaOTLP.metrics.endpoint must be set when internalTelemetryViaOTLP.metrics.enabled is true" }} +{{ end }} + +{{- if or (and (.Values.internalTelemetryViaOTLP.logs.enabled) (not (or .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.logs.endpoint))) }} +{{ fail "[ERROR] internalTelemetryViaOTLP.endpoint or .Values.internalTelemetryViaOTLP.logs.endpoint must be set when internalTelemetryViaOTLP.logs.enabled is true" }} +{{ end }} + +{{- if .Values.config.service.telemetry.metrics.address }} +[WARNING] config.service.telemetry.metrics.address should not be used and will be removed in the future. Use internalTelemetryViaOTLP or config.service.telemetry.metrics.readers instead" +{{ end }} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl index 4b670f94..9f813657 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_config.tpl @@ -1,8 +1,87 @@ +{{- define "opentelemetry-collector.otelsdkotlp.traces" -}} +traces: + processors: + - batch: + exporter: + otlp: + protocol: http/protobuf + endpoint: {{ default .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.traces.endpoint }} + {{- if or .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.traces.headers }} + headers: + {{- toYaml (default .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.traces.headers) | nindent 14 }} + {{- end }} +{{- end }} + +{{- define "opentelemetry-collector.otelsdkotlp.metrics" -}} +metrics: + readers: + - periodic: + exporter: + otlp: + protocol: http/protobuf + endpoint: {{ default .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.metrics.endpoint }} + {{- if or .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.metrics.headers }} + headers: + {{- toYaml (default .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.metrics.headers) | nindent 14 }} + {{- end }} +{{- end }} + +{{- define "opentelemetry-collector.metrics.prometheus" -}} +metrics: + readers: + - pull: + exporter: + prometheus: + host: {{ .address._0 | replace "{env!" "{env:" }} + port: {{ .address._1 }} + {{- if .Values.config.service.telemetry.resource }} + with_resource_constant_labels: + included: + {{- range (keys .Values.config.service.telemetry.resource) }} + - {{ println . }} + {{- end }} + {{- end }} +{{- end }} + +{{- define "opentelemetry-collector.otelsdkotlp.logs" -}} +logs: + processors: + - batch: + exporter: + otlp: + protocol: http/protobuf + endpoint: {{ default .Values.internalTelemetryViaOTLP.endpoint .Values.internalTelemetryViaOTLP.logs.endpoint }} + {{- if or .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.logs.headers }} + headers: + {{- toYaml (default .Values.internalTelemetryViaOTLP.headers .Values.internalTelemetryViaOTLP.logs.headers) | nindent 14 }} + {{- end }} +{{- end }} + {{- define "opentelemetry-collector.baseConfig" -}} {{- if .Values.alternateConfig }} {{- .Values.alternateConfig | toYaml }} {{- else}} -{{- .Values.config | toYaml }} +{{- $config := deepCopy .Values.config }} +{{- if .Values.internalTelemetryViaOTLP.traces.enabled }} +{{- $_ := set $config.service "telemetry" (mustMerge $config.service.telemetry (include "opentelemetry-collector.otelsdkotlp.traces" . | fromYaml)) }} +{{- end }} +{{- if .Values.internalTelemetryViaOTLP.metrics.enabled }} +{{- $_ := unset $config.receivers "prometheus" }} +{{- if $config.service.pipelines.metrics }} +{{- $_ := set $config.service.pipelines.metrics "receivers" (mustWithout $config.service.pipelines.metrics.receivers "prometheus") }} +{{- end }} +{{- $_ := unset $config.service.telemetry.metrics "readers" }} +{{- $_ := set $config.service "telemetry" (mustMerge $config.service.telemetry (include "opentelemetry-collector.otelsdkotlp.metrics" . | fromYaml)) }} +{{- else if .Values.config.service.telemetry.metrics.address }} +{{/* First replace env: with env! so we can split the host with the port and replace it back later */}} +{{- $address:= .Values.config.service.telemetry.metrics.address | replace "{env:" "{env!" | split ":" }} +{{- $_ := unset $config.service.telemetry.metrics "address" }} +{{- $_ := set $config.service "telemetry" (mustMerge (include "opentelemetry-collector.metrics.prometheus" (mustMerge (dict "address" $address) .) | fromYaml) $config.service.telemetry ) }} +{{- end }} +{{- if .Values.internalTelemetryViaOTLP.logs.enabled }} +{{- $_ := set $config.service "telemetry" (mustMerge $config.service.telemetry (include "opentelemetry-collector.otelsdkotlp.logs" . | fromYaml)) }} +{{- end }} +{{- $config | toYaml }} {{- end }} {{- end }} @@ -138,7 +217,7 @@ receivers: kubeletstats: collection_interval: 20s auth_type: "serviceAccount" - endpoint: "${env:K8S_NODE_NAME}:10250" + endpoint: "${env:K8S_NODE_IP}:10250" {{- end }} {{- define "opentelemetry-collector.applyLogsCollectionConfig" -}} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl index 130bf2a7..01da8afb 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_helpers.tpl @@ -59,7 +59,18 @@ helm.sh/chart: {{ include "opentelemetry-collector.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} -{{ include "opentelemetry-collector.additionalLabels" . }} +{{- if eq .Values.mode "deployment" }} +app.kubernetes.io/component: standalone-collector +{{- end -}} +{{- if eq .Values.mode "daemonset" }} +app.kubernetes.io/component: agent-collector +{{- end -}} +{{- if eq .Values.mode "statefulset" }} +app.kubernetes.io/component: statefulset-collector +{{- end -}} +{{- if .Values.additionalLabels }} +{{ tpl (.Values.additionalLabels | toYaml) . }} +{{- end }} {{- end }} {{/* @@ -108,12 +119,6 @@ Create the name of the clusterRoleBinding to use {{- end }} {{- end }} -{{- define "opentelemetry-collector.additionalLabels" -}} -{{- if .Values.additionalLabels }} -{{- tpl (.Values.additionalLabels | toYaml) . }} -{{- end }} -{{- end }} - {{/* Return the appropriate apiVersion for podDisruptionBudget. */}} @@ -220,7 +225,7 @@ Get ConfigMap name if existingName is defined, otherwise use default name for ge */}} {{- define "opentelemetry-collector.configName" -}} {{- if .Values.configMap.existingName -}} - {{- .Values.configMap.existingName }} + {{- tpl (.Values.configMap.existingName | toYaml) . }} {{- else }} {{- printf "%s%s" (include "opentelemetry-collector.fullname" .) (.configmapSuffix) }} {{- end -}} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl index 07332ccc..58b94d48 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/_pod.tpl @@ -56,6 +56,10 @@ containers: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: K8S_NODE_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP {{- end }} {{- if and (.Values.useGOMEMLIMIT) ((((.Values.resources).limits).memory)) }} - name: GOMEMLIMIT diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml index 110130a9..71db96a4 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/deployment.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.replicaCount | default 1 }} {{- end }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} selector: @@ -46,6 +46,9 @@ spec: dnsConfig: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.schedulerName }} + schedulerName: {{ . }} + {{- end }} {{- $podValues := deepCopy .Values }} {{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }} {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/extraManifests.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/extraManifests.yaml new file mode 100644 index 00000000..928593c3 --- /dev/null +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/extraManifests.yaml @@ -0,0 +1,4 @@ +{{ range .Values.extraManifests }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} \ No newline at end of file diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml index 782e8fac..9bc5465a 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/podmonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.podMonitor.enabled .Values.podMonitor.metricsEndpoints (eq .Values.mode "daemonset") }} +{{- if and .Values.podMonitor.enabled .Values.podMonitor.metricsEndpoints }} apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml index d6446aba..bd522b6a 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/prometheusrule.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.prometheusRule.enabled .Values.serviceMonitor.enabled }} +{{- if .Values.prometheusRule.enabled }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: @@ -12,7 +12,7 @@ metadata: spec: groups: {{- if .Values.prometheusRule.groups }} - {{- toYaml .Values.prometheusRule.groups | nindent 4 }} + {{- toYaml .Values.prometheusRule.groups | nindent 2 }} {{- end }} {{- if .Values.prometheusRule.defaultRules.enabled }} - name: collectorRules diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml index c97ad247..cbf9894a 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/templates/service.yaml @@ -15,6 +15,9 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} + {{- if .Values.service.trafficDistribution }} + trafficDistribution: {{ .Values.service.trafficDistribution }} + {{- end }} {{- if .Values.service.clusterIP }} clusterIP: {{ .Values.service.clusterIP }} {{- end }} diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json index 7ecfe75c..56424954 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.schema.json @@ -33,7 +33,12 @@ }, "mode": { "type": "string", - "enum": ["daemonset", "deployment", "statefulset", ""] + "enum": [ + "daemonset", + "deployment", + "statefulset", + "" + ] }, "namespaceOverride": { "type": "string", @@ -169,7 +174,11 @@ }, "pullPolicy": { "type": "string", - "enum": ["IfNotPresent", "Always", "Never"] + "enum": [ + "IfNotPresent", + "Always", + "Never" + ] } } }, @@ -209,7 +218,9 @@ "type": "string" } }, - "required": ["create"] + "required": [ + "create" + ] }, "clusterRole": { "type": "object", @@ -243,7 +254,9 @@ } } }, - "required": ["create"] + "required": [ + "create" + ] }, "podSecurityContext": { "type": "object" @@ -282,7 +295,9 @@ "type": "string" } }, - "required": ["name"] + "required": [ + "name" + ] } }, "initContainers": { @@ -295,7 +310,9 @@ "type": "string" } }, - "required": ["name"] + "required": [ + "name" + ] } }, "extraEnvs": { @@ -322,6 +339,12 @@ "type": "object" } }, + "extraManifests": { + "type": "array", + "items": { + "type": "object" + } + }, "ports": { "type": "object", "patternProperties": { @@ -351,7 +374,9 @@ "type": "string" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] } } }, @@ -364,7 +389,10 @@ "additionalProperties": false, "properties": { "cpu": { - "type": ["string", "integer"] + "type": [ + "string", + "integer" + ] }, "ephemeral-storage": { "type": "string" @@ -379,7 +407,10 @@ "additionalProperties": false, "properties": { "cpu": { - "type": ["string", "integer"] + "type": [ + "string", + "integer" + ] }, "ephemeral-storage": { "type": "string" @@ -435,10 +466,14 @@ }, "oneOf": [ { - "required": ["exec"] + "required": [ + "exec" + ] }, { - "required": ["httpGet"] + "required": [ + "httpGet" + ] } ] }, @@ -478,14 +513,32 @@ "type": "string" } } + }, + "sleep": { + "type": "object", + "additionalProperties": false, + "properties": { + "seconds": { + "type": "integer" + } + } } }, "oneOf": [ { - "required": ["exec"] + "required": [ + "exec" + ] }, { - "required": ["httpGet"] + "required": [ + "httpGet" + ] + }, + { + "required": [ + "sleep" + ] } ] } @@ -610,11 +663,20 @@ }, "dnsPolicy": { "type": "string", - "enum": ["ClusterFirst", "ClusterFirstWithHostNet", "Default", "None", ""] + "enum": [ + "ClusterFirst", + "ClusterFirstWithHostNet", + "Default", + "None", + "" + ] }, "dnsConfig": { "type": "object" }, + "schedulerName": { + "type": "string" + }, "replicaCount": { "type": "integer" }, @@ -631,9 +693,20 @@ "enabled": { "type": "boolean" }, + "trafficDistribution": { + "type": "string", + "enum": [ + "PreferClose" + ] + }, "type": { "type": "string", - "enum": ["ClusterIP", "NodePort", "LoadBalancer", "ExternalName"] + "enum": [ + "ClusterIP", + "NodePort", + "LoadBalancer", + "ExternalName" + ] }, "clusterIP": { "type": "string" @@ -652,11 +725,19 @@ }, "internalTrafficPolicy": { "type": "string", - "enum": ["Cluster", "Local", ""] + "enum": [ + "Cluster", + "Local", + "" + ] }, "externalTrafficPolicy": { "type": "string", - "enum": ["Cluster", "Local", ""] + "enum": [ + "Cluster", + "Local", + "" + ] } } }, @@ -693,17 +774,27 @@ }, "pathType": { "type": "string", - "enum": ["Exact", "Prefix", "ImplementationSpecific"] + "enum": [ + "Exact", + "Prefix", + "ImplementationSpecific" + ] }, "port": { "type": "integer" } }, - "required": ["path", "pathType", "port"] + "required": [ + "path", + "pathType", + "port" + ] } } }, - "required": ["paths"] + "required": [ + "paths" + ] } }, "tls": { @@ -769,11 +860,17 @@ "type": "integer" } }, - "required": ["path", "pathType", "port"] + "required": [ + "path", + "pathType", + "port" + ] } } }, - "required": ["paths"] + "required": [ + "paths" + ] } }, "tls": { @@ -795,11 +892,15 @@ } } }, - "required": ["name"] + "required": [ + "name" + ] } } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "podMonitor": { "type": "object", @@ -817,7 +918,9 @@ "type": "object" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "serviceMonitor": { "type": "object", @@ -841,16 +944,18 @@ "items": {} }, "metricRelabelings": { - "type": "array", - "default": [], - "title": "The metricRelabelings Schema", - "items": {}, - "examples": [ - [] - ] + "type": "array", + "default": [], + "title": "The metricRelabelings Schema", + "items": {}, + "examples": [ + [] + ] } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "podDisruptionBudget": { "type": "object", @@ -859,7 +964,9 @@ "type": "boolean" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "autoscaling": { "type": "object", @@ -880,7 +987,9 @@ "type": "integer" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "rollout": { "type": "object", @@ -898,11 +1007,17 @@ }, "strategy": { "type": "string", - "enum": ["OnDelete", "Recreate", "RollingUpdate"], + "enum": [ + "OnDelete", + "Recreate", + "RollingUpdate" + ], "default": "RollingUpdate" } }, - "required": ["strategy"] + "required": [ + "strategy" + ] }, "prometheusRule": { "type": "object", @@ -923,13 +1038,17 @@ "type": "boolean" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "extraLabels": { "type": "object" } }, - "required": ["enabled"] + "required": [ + "enabled" + ] }, "statefulset": { "type": "object", @@ -946,37 +1065,142 @@ } }, "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" + "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" + } + } + } + }, + "internalTelemetryViaOTLP": { + "type": "object", + "additionalProperties": false, + "properties": { + "endpoint": { + "type": "string" + }, + "headers": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" } } + } + }, + "traces": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "type": "boolean" + }, + "endpoint": { + "type": "string" + }, + "headers": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + } + } + } + } + } + }, + "metrics": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "type": "boolean" + }, + "endpoint": { + "type": "string" + }, + "headers": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + } + } + } + } + } + }, + "logs": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "type": "boolean" + }, + "endpoint": { + "type": "string" + }, + "headers": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + } + } + } + } + } } + } }, "useGOMEMLIMIT": { "type": "boolean" @@ -985,5 +1209,7 @@ "type": "boolean" } }, - "required": ["mode"] + "required": [ + "mode" + ] } diff --git a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml index e989806f..b996c2d0 100644 --- a/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml +++ b/charts/kubezero-telemetry/charts/opentelemetry-collector/values.yaml @@ -40,7 +40,7 @@ presets: 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. + # and adds a preset of minimum required RBAC rules to ClusterRole. # Best used with mode = daemonset. # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-attributes-processor for details on the receiver. kubernetesAttributes: @@ -53,13 +53,13 @@ presets: 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. + # and adds the necessary rules to ClusterRole. # 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 + # Adds the k8sobjects 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. @@ -67,7 +67,7 @@ presets: 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. + # and adds the necessary rules to ClusterRole. # Best used with mode = deployment or statefulset. # See https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-cluster-receiver for details on the receiver. clusterMetrics: @@ -77,10 +77,42 @@ configMap: 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. + # This also supports template content, which will eventually be converted to yaml. 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: "" +# When enabled, the chart will configure the collector to emit its traces, metrics, and logs over http via the OTLP using the Otel Go SDK. +# If internalTelemetryViaOTLP.metrics.enabled Ithe chart will remove the default prometheus receiver (which was configured to scrape the Collector's metrics) +# and the service.telemetry.metrics.address value. +# Learn more about the Collector telemetry at https://opentelemetry.io/docs/collector/internal-telemetry/. +# +# THIS OPTION IS EXPERIMENTAL AND SUBJECT TO BREAKING CHANGES +internalTelemetryViaOTLP: + # The endpoint where the telemetry will be exported + endpoint: "" + # Optional headers to configure the exporters + headers: [] + # - name: "x-dest-auth" + # value: "some auth key" + traces: + enabled: false + # overrides internalTelemetryViaOTLP.endpoint for traces + endpoint: "" + # overrides internalTelemetryViaOTLP.headers for traces + headers: [] + metrics: + enabled: false + # overrides internalTelemetryViaOTLP.endpoint for metrics + endpoint: "" + # overrides internalTelemetryViaOTLP.headers for metrics + headers: [] + logs: + enabled: false + # overrides internalTelemetryViaOTLP.endpoint for logs + endpoint: "" + # overrides internalTelemetryViaOTLP.headers for logs + headers: [] # Base collector configuration. # Supports templating. To escape existing instances of {{ }}, use {{` `}}. # For example, {{ REDACTED_EMAIL }} becomes {{` {{ REDACTED_EMAIL }} `}}. @@ -110,6 +142,7 @@ config: endpoint: ${env:MY_POD_IP}:4317 http: endpoint: ${env:MY_POD_IP}:4318 + # if internalTelemetryViaOTLP.metrics.enabled = true, prometheus receiver will be removed prometheus: config: scrape_configs: @@ -121,7 +154,12 @@ config: service: telemetry: metrics: - address: ${env:MY_POD_IP}:8888 + readers: + - pull: + exporter: + prometheus: + host: ${env:MY_POD_IP} + port: 8888 extensions: - health_check pipelines: @@ -219,6 +257,8 @@ extraEnvsFrom: [] extraVolumes: [] # This also supports template content, which will eventually be converted to yaml. extraVolumeMounts: [] +# This also supports template content, which will eventually be converted to yaml. +extraManifests: [] # Configuration for ports # nodePort is also allowed ports: @@ -298,6 +338,8 @@ hostAliases: [] dnsPolicy: "" # Custom DNS config. Required when DNS policy is None. dnsConfig: {} +# Custom kube scheduler name. +schedulerName: "" # only used with deployment mode replicaCount: 1 # only used with deployment mode @@ -410,6 +452,7 @@ service: # However, to enable it on mode = daemonset, its creation must be explicitly enabled # enabled: true type: ClusterIP + # trafficDistribution: PreferClose # type: LoadBalancer # loadBalancerIP: 1.2.3.4 # loadBalancerSourceRanges: [] diff --git a/charts/kubezero-telemetry/values.yaml b/charts/kubezero-telemetry/values.yaml index 173f2c11..9b765d77 100644 --- a/charts/kubezero-telemetry/values.yaml +++ b/charts/kubezero-telemetry/values.yaml @@ -228,6 +228,8 @@ jaeger: url: jaeger.example.com opensearch: + enabled: false + version: 2.17.0 prometheus: false @@ -250,8 +252,9 @@ opensearch: # cpu: 500m # memory: 2Gi - dashboard: +opensearch-dashboards: enabled: false + istio: enabled: false gateway: istio-ingress/private-ingressgateway