Skip to content

Commit

Permalink
chore: Update images for telemetry-manager 1.17.1 (#1167)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrkl authored Jun 11, 2024
1 parent 3abac3d commit 6129ce3
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Default Environment Variables
## General
ENV_K3S_K8S_VERSION=1.28.3 # refers to the version of kubernetes used in K3s
ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.0 # Image URL to use all building/pushing image targets
ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.1 # Image URL to use all building/pushing image targets

## Gardener
ENV_GARDENER_K8S_VERSION=1.28
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ kind: Kustomization
images:
- name: controller
newName: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager
newTag: 1.17.0
newTag: 1.17.1
6 changes: 3 additions & 3 deletions internal/otelcollector/config/metric/agent/processors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestProcessors(t *testing.T) {
require.Len(t, collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements, 1)
require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Context)
require.Len(t, collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements, 2)
require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[0])
require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[0])
require.Equal(t, "set(name, \"io.kyma-project.telemetry/runtime\") where name == \"otelcol/kubeletstatsreceiver\"", collectorConfig.Processors.SetInstrumentationScopeRuntime.MetricStatements[0].Statements[1])
})

Expand All @@ -84,7 +84,7 @@ func TestProcessors(t *testing.T) {
require.Len(t, collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements, 1)
require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Context)
require.Len(t, collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements, 2)
require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[0])
require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[0])
require.Equal(t, "set(name, \"io.kyma-project.telemetry/prometheus\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopePrometheus.MetricStatements[0].Statements[1])
})

Expand All @@ -97,7 +97,7 @@ func TestProcessors(t *testing.T) {
require.Len(t, collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements, 1)
require.Equal(t, "scope", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Context)
require.Len(t, collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements, 2)
require.Equal(t, "set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[0])
require.Equal(t, "set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[0])
require.Equal(t, "set(name, \"io.kyma-project.telemetry/istio\") where name == \"otelcol/prometheusreceiver\"", collectorConfig.Processors.SetInstrumentationScopeIstio.MetricStatements[0].Statements[1])
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestTransformedInstrumentationScope(t *testing.T) {
MetricStatements: []config.TransformProcessorStatements{{
Context: "scope",
Statements: []string{
"set(version, \"1.17.0\") where name == \"otelcol/kubeletstatsreceiver\"",
"set(version, \"1.17.1\") where name == \"otelcol/kubeletstatsreceiver\"",
"set(name, \"io.kyma-project.telemetry/runtime\") where name == \"otelcol/kubeletstatsreceiver\"",
},
}},
Expand All @@ -33,7 +33,7 @@ func TestTransformedInstrumentationScope(t *testing.T) {
MetricStatements: []config.TransformProcessorStatements{{
Context: "scope",
Statements: []string{
"set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"",
"set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"",
"set(name, \"io.kyma-project.telemetry/prometheus\") where name == \"otelcol/prometheusreceiver\"",
},
}},
Expand All @@ -46,7 +46,7 @@ func TestTransformedInstrumentationScope(t *testing.T) {
MetricStatements: []config.TransformProcessorStatements{{
Context: "scope",
Statements: []string{
"set(version, \"1.17.0\") where name == \"otelcol/prometheusreceiver\"",
"set(version, \"1.17.1\") where name == \"otelcol/prometheusreceiver\"",
"set(name, \"io.kyma-project.telemetry/istio\") where name == \"otelcol/prometheusreceiver\"",
},
}},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,21 +308,21 @@ processors:
metric_statements:
- context: scope
statements:
- set(version, "1.17.0") where name == "otelcol/kubeletstatsreceiver"
- set(version, "1.17.1") where name == "otelcol/kubeletstatsreceiver"
- set(name, "io.kyma-project.telemetry/runtime") where name == "otelcol/kubeletstatsreceiver"
transform/set-instrumentation-scope-prometheus:
error_mode: ignore
metric_statements:
- context: scope
statements:
- set(version, "1.17.0") where name == "otelcol/prometheusreceiver"
- set(version, "1.17.1") where name == "otelcol/prometheusreceiver"
- set(name, "io.kyma-project.telemetry/prometheus") where name == "otelcol/prometheusreceiver"
transform/set-instrumentation-scope-istio:
error_mode: ignore
metric_statements:
- context: scope
statements:
- set(version, "1.17.0") where name == "otelcol/prometheusreceiver"
- set(version, "1.17.1") where name == "otelcol/prometheusreceiver"
- set(name, "io.kyma-project.telemetry/istio") where name == "otelcol/prometheusreceiver"
exporters:
otlp:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ processors:
metric_statements:
- context: scope
statements:
- set(version, "1.17.0") where name == "otelcol/kubeletstatsreceiver"
- set(version, "1.17.1") where name == "otelcol/kubeletstatsreceiver"
- set(name, "io.kyma-project.telemetry/runtime") where name == "otelcol/kubeletstatsreceiver"
transform/set-instrumentation-scope-prometheus:
error_mode: ignore
metric_statements:
- context: scope
statements:
- set(version, "1.17.0") where name == "otelcol/prometheusreceiver"
- set(version, "1.17.1") where name == "otelcol/prometheusreceiver"
- set(name, "io.kyma-project.telemetry/prometheus") where name == "otelcol/prometheusreceiver"
exporters:
otlp:
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package version

var Version = "1.17.0"
var Version = "1.17.1"
2 changes: 1 addition & 1 deletion sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module-name: telemetry
protecode:
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.0
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.17.1
- europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.102.1-fbfb6cdc
- europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:3.0.4-5d3fb7b6
- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240404-fd3588ce
Expand Down

0 comments on commit 6129ce3

Please sign in to comment.