Skip to content
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV_GORELEASER_VERSION=v1.23.0
## Default Docker Images
ENV_FLUENTBIT_EXPORTER_IMAGE="europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250910-86122076"
ENV_FLUENTBIT_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:4.0.9"
ENV_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.135.0-main"
ENV_OTEL_COLLECTOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.136.0-main"
ENV_SELFMONITOR_IMAGE="europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.5.0-8d9d348"
ENV_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.135.0"
ENV_TEST_TELEMETRYGEN_IMAGE="ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.136.0"
ENV_ALPINE_IMAGE="europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.22.1"
6 changes: 0 additions & 6 deletions docs/contributor/assets/sample-metric-agent-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ manager:
fluentBitExporterImage: europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250910-86122076
fluentBitImage: europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:4.0.9
gomemlimit: 300MiB
otelCollectorImage: europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.135.0-main
otelCollectorImage: europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.136.0-main
selfMonitorImage: europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.5.0-8d9d348
image:
repository: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@ func kubeletStatsReceiverConfig(runtimeResources runtimeResourceSources) *Kubele
MetricGroups: kubeletStatsMetricGroups(runtimeResources),
Metrics: KubeletStatsMetricsConfig{
ContainerCPUUsage: MetricConfig{Enabled: true},
ContainerCPUUtilization: MetricConfig{Enabled: false},
K8sPodCPUUsage: MetricConfig{Enabled: true},
K8sPodCPUUtilization: MetricConfig{Enabled: false},
K8sNodeCPUUsage: MetricConfig{Enabled: true},
K8sNodeCPUUtilization: MetricConfig{Enabled: false},
K8sNodeCPUTime: MetricConfig{Enabled: false},
K8sNodeMemoryMajorPageFaults: MetricConfig{Enabled: false},
K8sNodeMemoryPageFaults: MetricConfig{Enabled: false},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,8 @@ func TestKubeletStatsReceiver(t *testing.T) {
MetricGroups: test.expectedMetricGroups,
Metrics: KubeletStatsMetricsConfig{
ContainerCPUUsage: MetricConfig{Enabled: true},
ContainerCPUUtilization: MetricConfig{Enabled: false},
K8sPodCPUUsage: MetricConfig{Enabled: true},
K8sPodCPUUtilization: MetricConfig{Enabled: false},
K8sNodeCPUUsage: MetricConfig{Enabled: true},
K8sNodeCPUUtilization: MetricConfig{Enabled: false},
K8sNodeCPUTime: MetricConfig{Enabled: false},
K8sNodeMemoryMajorPageFaults: MetricConfig{Enabled: false},
K8sNodeMemoryPageFaults: MetricConfig{Enabled: false},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,10 @@ receivers:
metrics:
container.cpu.usage:
enabled: true
container.cpu.utilization:
enabled: false
k8s.pod.cpu.usage:
enabled: true
k8s.pod.cpu.utilization:
enabled: false
k8s.node.cpu.usage:
enabled: true
k8s.node.cpu.utilization:
enabled: false
k8s.node.cpu.time:
enabled: false
k8s.node.memory.major_page_faults:
Expand Down
3 changes: 0 additions & 3 deletions internal/otelcollector/config/metricagent/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ type MetricConfig struct {

type KubeletStatsMetricsConfig struct {
ContainerCPUUsage MetricConfig `yaml:"container.cpu.usage"`
ContainerCPUUtilization MetricConfig `yaml:"container.cpu.utilization"`
K8sPodCPUUsage MetricConfig `yaml:"k8s.pod.cpu.usage"`
K8sPodCPUUtilization MetricConfig `yaml:"k8s.pod.cpu.utilization"`
K8sNodeCPUUsage MetricConfig `yaml:"k8s.node.cpu.usage"`
K8sNodeCPUUtilization MetricConfig `yaml:"k8s.node.cpu.utilization"`
K8sNodeCPUTime MetricConfig `yaml:"k8s.node.cpu.time"`
K8sNodeMemoryMajorPageFaults MetricConfig `yaml:"k8s.node.memory.major_page_faults"`
K8sNodeMemoryPageFaults MetricConfig `yaml:"k8s.node.memory.page_faults"`
Expand Down
2 changes: 1 addition & 1 deletion sec-scanners-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bdba:
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main
- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250910-86122076
- europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:4.0.9
- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.135.0-main
- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.136.0-main
- europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.5.0-8d9d348
- europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.22.1
mend:
Expand Down
4 changes: 2 additions & 2 deletions test/testkit/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
package testkit

const (
DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.135.0"
DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.135.0-main"
DefaultTelemetryGenImage = "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.136.0"
DefaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.136.0-main"
)
Loading