Skip to content

Commit 5bae4cc

Browse files
Clee2691openshift-merge-bot[bot]
Clee2691
authored and
openshift-merge-bot[bot]
committed
LOG-7012: Parsing errors under Loki distributor for audit tenant when using Otel DataModel
1 parent ed41d1f commit 5bae4cc

File tree

9 files changed

+53
-14
lines changed

9 files changed

+53
-14
lines changed

‎internal/generator/vector/output/lokistack/lokistack_otel.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,13 @@ r.attributes = append(r.attributes,
254254
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
255255
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
256256
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
257-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
258257
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
259258
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
260259
]
261260
)
261+
if exists(.responseStatus.code) {
262+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
263+
}
262264
values = []
263265
for_each(array!(.user.groups)) -> |_index,group| {
264266
.group = group
@@ -335,11 +337,13 @@ r.attributes = append(r.attributes,
335337
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
336338
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
337339
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
338-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
339340
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
340341
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
341342
]
342343
)
344+
if exists(.responseStatus.code) {
345+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
346+
}
343347
values = []
344348
for_each(array!(.user.groups)) -> |_index,group| {
345349
.group = group

‎internal/generator/vector/output/otlp/otlp_all.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,13 @@ r.attributes = append(r.attributes,
280280
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
281281
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
282282
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
283-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
284283
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
285284
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
286285
]
287286
)
287+
if exists(.responseStatus.code) {
288+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
289+
}
288290
values = []
289291
for_each(array!(.user.groups)) -> |_index,group| {
290292
.group = group
@@ -361,11 +363,13 @@ r.attributes = append(r.attributes,
361363
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
362364
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
363365
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
364-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
365366
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
366367
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
367368
]
368369
)
370+
if exists(.responseStatus.code) {
371+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
372+
}
369373
values = []
370374
for_each(array!(.user.groups)) -> |_index,group| {
371375
.group = group

‎internal/generator/vector/output/otlp/otlp_tuning.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,13 @@ r.attributes = append(r.attributes,
280280
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
281281
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
282282
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
283-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
284283
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
285284
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
286285
]
287286
)
287+
if exists(.responseStatus.code) {
288+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
289+
}
288290
values = []
289291
for_each(array!(.user.groups)) -> |_index,group| {
290292
.group = group
@@ -361,11 +363,13 @@ r.attributes = append(r.attributes,
361363
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
362364
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
363365
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
364-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
365366
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
366367
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
367368
]
368369
)
370+
if exists(.responseStatus.code) {
371+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
372+
}
369373
values = []
370374
for_each(array!(.user.groups)) -> |_index,group| {
371375
.group = group

‎internal/generator/vector/output/otlp/otlp_with_auth_basic.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,13 @@ r.attributes = append(r.attributes,
280280
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
281281
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
282282
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
283-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
284283
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
285284
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
286285
]
287286
)
287+
if exists(.responseStatus.code) {
288+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
289+
}
288290
values = []
289291
for_each(array!(.user.groups)) -> |_index,group| {
290292
.group = group
@@ -361,11 +363,13 @@ r.attributes = append(r.attributes,
361363
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
362364
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
363365
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
364-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
365366
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
366367
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
367368
]
368369
)
370+
if exists(.responseStatus.code) {
371+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
372+
}
369373
values = []
370374
for_each(array!(.user.groups)) -> |_index,group| {
371375
.group = group

‎internal/generator/vector/output/otlp/otlp_with_auth_sa_token.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,13 @@ r.attributes = append(r.attributes,
280280
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
281281
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
282282
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
283-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
284283
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
285284
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
286285
]
287286
)
287+
if exists(.responseStatus.code) {
288+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
289+
}
288290
values = []
289291
for_each(array!(.user.groups)) -> |_index,group| {
290292
.group = group
@@ -361,11 +363,13 @@ r.attributes = append(r.attributes,
361363
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
362364
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
363365
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
364-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
365366
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
366367
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
367368
]
368369
)
370+
if exists(.responseStatus.code) {
371+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
372+
}
369373
values = []
370374
for_each(array!(.user.groups)) -> |_index,group| {
371375
.group = group

‎internal/generator/vector/output/otlp/otlp_with_auth_token.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,13 @@ r.attributes = append(r.attributes,
280280
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
281281
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
282282
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
283-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
284283
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
285284
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
286285
]
287286
)
287+
if exists(.responseStatus.code) {
288+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
289+
}
288290
values = []
289291
for_each(array!(.user.groups)) -> |_index,group| {
290292
.group = group
@@ -361,11 +363,13 @@ r.attributes = append(r.attributes,
361363
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
362364
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
363365
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
364-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
365366
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
366367
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
367368
]
368369
)
370+
if exists(.responseStatus.code) {
371+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
372+
}
369373
values = []
370374
for_each(array!(.user.groups)) -> |_index,group| {
371375
.group = group

‎internal/generator/vector/output/otlp/transform.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@ r.attributes = append(r.attributes,
6868
{"key": "k8s.audit.event.stage", "value": {"stringValue": .stage}},
6969
{"key": "k8s.audit.event.request.uri", "value": {"stringValue": .requestURI}},
7070
{"key": "k8s.audit.event.request.verb", "value": {"stringValue": .verb}},
71-
{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}},
7271
{"key": "k8s.audit.event.user_agent", "value": {"stringValue": .userAgent}},
7372
{"key": "k8s.user.username", "value": {"stringValue": .user.username}}
7473
]
7574
)
75+
if exists(.responseStatus.code) {
76+
r.attributes = push(r.attributes,{"key": "k8s.audit.event.response.code", "value": {"intValue": to_string!(.responseStatus.code)}})
77+
}
7678
values = []
7779
for_each(array!(.user.groups)) -> |_index,group| {
7880
.group = group

‎test/e2e/logforwarding/lokistack/forward_to_lokistack_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
. "github.com/onsi/gomega"
1313
obs "github.com/openshift/cluster-logging-operator/api/observability/v1"
1414
corev1 "k8s.io/api/core/v1"
15+
"k8s.io/apimachinery/pkg/api/resource"
1516
)
1617

1718
var _ = Describe("[ClusterLogForwarder] Forward to Lokistack", func() {
@@ -61,6 +62,13 @@ var _ = Describe("[ClusterLogForwarder] Forward to Lokistack", func() {
6162
OutputRefs: []string{outputName},
6263
InputRefs: []string{string(obs.InputTypeApplication), string(obs.InputTypeAudit), string(obs.InputTypeInfrastructure)},
6364
})
65+
clf.Spec.Collector = &obs.CollectorSpec{
66+
Resources: &corev1.ResourceRequirements{
67+
Requests: corev1.ResourceList{
68+
corev1.ResourceMemory: resource.MustParse("500m"),
69+
},
70+
},
71+
}
6472
})
6573

6674
lokiStackOut = &obs.OutputSpec{

‎test/framework/e2e/lokistack.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ metadata:
274274
name: %s
275275
namespace: %s
276276
spec:
277-
size: 1x.pico
277+
size: 1x.demo
278278
storage:
279279
schemas:
280280
- version: v13
@@ -293,6 +293,11 @@ spec:
293293
namespaceSelector:
294294
matchLabels:
295295
openshift.io/cluster-monitoring: "true"
296+
limits:
297+
global:
298+
ingestion:
299+
ingestionBurstSize: 10
300+
ingestionRate: 10
296301
`, LokistackName, namespace, minioName+"-secret")
297302

298303
uri := fmt.Sprintf(lokistackURI, namespace, LokistackName)

0 commit comments

Comments
 (0)