diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a78e80d..1923da0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/kube-logging/telemetry-controller - newTag: 0.0.6 + newTag: 0.0.7-dev.4 diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go index 5167832..b796959 100644 --- a/internal/controller/telemetry/collector_controller.go +++ b/internal/controller/telemetry/collector_controller.go @@ -168,7 +168,7 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( UpgradeStrategy: "none", Config: otelConfig, Mode: otelv1alpha1.ModeDaemonSet, - Image: "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.98.0-count2", + Image: "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.98.0-count3", ServiceAccount: saName.Name, VolumeMounts: []corev1.VolumeMount{ { diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go index 26f376d..76399cc 100644 --- a/internal/controller/telemetry/otel_conf_gen.go +++ b/internal/controller/telemetry/otel_conf_gen.go @@ -465,6 +465,9 @@ func generateCountConnectors() map[string]any { { Key: "k8s.pod.labels.app.kubernetes.io/name", }, + { + Key: "k8s.pod.labels.app", + }, }, }, }, @@ -498,6 +501,9 @@ func generateCountConnectors() map[string]any { { Key: "k8s.pod.labels.app.kubernetes.io/name", }, + { + Key: "k8s.pod.labels.app", + }, }, }, }, @@ -558,9 +564,8 @@ func generateMetricsProcessors() map[string]any { { Action: "insert", Key: "app", - FromAttribute: "k8s.pod.labels.app.kubernetes.io/name", - }, - { + FromAttribute: "k8s.pod.labels.app", + }, { Action: "insert", Key: "host", FromAttribute: "k8s.node.name",