Skip to content

Commit 6299f31

Browse files
a-thalerk15r
andauthored
feat: remove compass-system as system namespace (#2629)
Co-authored-by: Korbinian Stoemmer <[email protected]>
1 parent b5657e4 commit 6299f31

File tree

15 files changed

+29
-44
lines changed

15 files changed

+29
-44
lines changed

docs/contributor/assets/sample-metric-agent-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,27 +431,27 @@ processors:
431431
filter/sample-2-filter-by-namespace-runtime-input:
432432
metrics:
433433
metric:
434-
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
434+
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
435435
filter/sample-1-filter-by-namespace-runtime-input:
436436
metrics:
437437
metric:
438-
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
438+
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
439439
filter/sample-1-filter-by-namespace-prometheus-input:
440440
metrics:
441441
metric:
442-
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
442+
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
443443
filter/sample-2-filter-by-namespace-prometheus-input:
444444
metrics:
445445
metric:
446-
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
446+
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
447447
filter/sample-1-filter-by-namespace-istio-input:
448448
metrics:
449449
metric:
450-
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
450+
- resource.attributes["kyma.input.name"] == "prometheus" and (resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
451451
filter/sample-2-filter-by-namespace-istio-input:
452452
metrics:
453453
metric:
454-
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
454+
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
455455
filter/drop-envoy-metrics-if-disabled:
456456
metrics:
457457
metric:

docs/contributor/assets/sample-metric-gateway-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ processors:
155155
filter/sample-2-filter-by-namespace:
156156
metrics:
157157
metric:
158-
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
158+
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
159159
filter/sample-1-filter-by-namespace:
160160
metrics:
161161
metric:
162-
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system" or resource.attributes["k8s.namespace.name"] == "compass-system")
162+
- resource.attributes["kyma.input.name"] == "prometheus" and not(resource.attributes["k8s.namespace.name"] == "kyma-system" or resource.attributes["k8s.namespace.name"] == "kube-system" or resource.attributes["k8s.namespace.name"] == "istio-system")
163163
exporters:
164164
otlp/sample-1:
165165
endpoint: ${OTLP_ENDPOINT_SAMPLE}

internal/fluentbit/config/builder/input_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
6363
"/var/log/containers/*_kyma-system_*-*.log",
6464
"/var/log/containers/*_kube-system_*-*.log",
6565
"/var/log/containers/*_istio-system_*-*.log",
66-
"/var/log/containers/*_compass-system_*-*.log",
6766
},
6867
},
6968
{
@@ -82,7 +81,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
8281
"/var/log/containers/*_kyma-system_*-*.log",
8382
"/var/log/containers/*_kube-system_*-*.log",
8483
"/var/log/containers/*_istio-system_*-*.log",
85-
"/var/log/containers/*_compass-system_*-*.log",
8684
},
8785
},
8886
{
@@ -162,7 +160,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
162160
"/var/log/containers/*_kyma-system_*-*.log",
163161
"/var/log/containers/*_kube-system_*-*.log",
164162
"/var/log/containers/*_istio-system_*-*.log",
165-
"/var/log/containers/*_compass-system_*-*.log",
166163
},
167164
},
168165
{
@@ -314,7 +311,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
314311
"/var/log/containers/*_kyma-system_*-*.log",
315312
"/var/log/containers/*_kube-system_*-*.log",
316313
"/var/log/containers/*_istio-system_*-*.log",
317-
"/var/log/containers/*_compass-system_*-*.log",
318314
"/var/log/containers/*_*_foo-*.log",
319315
},
320316
},
@@ -362,7 +358,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
362358
"kyma-system",
363359
"kube-system",
364360
"istio-system",
365-
"compass-system",
366361
"foo",
367362
},
368363
},
@@ -375,7 +370,6 @@ func TestCreateIncludeAndExcludePath(t *testing.T) {
375370
"/var/log/containers/*_kyma-system_*-*.log",
376371
"/var/log/containers/*_kube-system_*-*.log",
377372
"/var/log/containers/*_istio-system_*-*.log",
378-
"/var/log/containers/*_compass-system_*-*.log",
379373
"/var/log/containers/*_foo_*-*.log",
380374
},
381375
[]string{

internal/namespaces/system.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package namespaces
22

33
func System() []string {
4-
return []string{"kyma-system", "kube-system", "istio-system", "compass-system"}
4+
return []string{"kyma-system", "kube-system", "istio-system"}
55
}

internal/otelcollector/config/logagent/filelog_reciever_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ func getExcludePaths(system bool, paths ...string) []string {
449449
"/var/log/pods/kyma-system_*/*/*.log",
450450
"/var/log/pods/kube-system_*/*/*.log",
451451
"/var/log/pods/istio-system_*/*/*.log",
452-
"/var/log/pods/compass-system_*/*/*.log",
453452
}
454453

455454
excludePaths := []string{}

internal/otelcollector/config/logagent/testdata/http-protocol-with-custom-path.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ receivers:
4545
- /var/log/pods/kyma-system_*/*/*.log
4646
- /var/log/pods/kube-system_*/*/*.log
4747
- /var/log/pods/istio-system_*/*/*.log
48-
- /var/log/pods/compass-system_*/*/*.log
4948
include:
5049
- /var/log/pods/*_*/*/*.log
5150
include_file_name: false

internal/otelcollector/config/logagent/testdata/http-protocol-without-custom-path.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ receivers:
4545
- /var/log/pods/kyma-system_*/*/*.log
4646
- /var/log/pods/kube-system_*/*/*.log
4747
- /var/log/pods/istio-system_*/*/*.log
48-
- /var/log/pods/compass-system_*/*/*.log
4948
include:
5049
- /var/log/pods/*_*/*/*.log
5150
include_file_name: false

internal/otelcollector/config/logagent/testdata/single-pipeline.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ receivers:
4545
- /var/log/pods/kyma-system_*/*/*.log
4646
- /var/log/pods/kube-system_*/*/*.log
4747
- /var/log/pods/istio-system_*/*/*.log
48-
- /var/log/pods/compass-system_*/*/*.log
4948
include:
5049
- /var/log/pods/*_*/*/*.log
5150
include_file_name: false

internal/otelcollector/config/logagent/testdata/user-defined-filters.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ receivers:
5959
- /var/log/pods/kyma-system_*/*/*.log
6060
- /var/log/pods/kube-system_*/*/*.log
6161
- /var/log/pods/istio-system_*/*/*.log
62-
- /var/log/pods/compass-system_*/*/*.log
6362
include:
6463
- /var/log/pods/*_*/*/*.log
6564
include_file_name: false
@@ -178,7 +177,6 @@ receivers:
178177
- /var/log/pods/kyma-system_*/*/*.log
179178
- /var/log/pods/kube-system_*/*/*.log
180179
- /var/log/pods/istio-system_*/*/*.log
181-
- /var/log/pods/compass-system_*/*/*.log
182180
include:
183181
- /var/log/pods/*_*/*/*.log
184182
include_file_name: false

internal/otelcollector/config/logagent/testdata/user-defined-transform-filter.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ receivers:
4747
- /var/log/pods/kyma-system_*/*/*.log
4848
- /var/log/pods/kube-system_*/*/*.log
4949
- /var/log/pods/istio-system_*/*/*.log
50-
- /var/log/pods/compass-system_*/*/*.log
5150
include:
5251
- /var/log/pods/*_*/*/*.log
5352
include_file_name: false

0 commit comments

Comments
 (0)