Skip to content

Commit ed41d1f

Browse files
vparfonovopenshift-merge-bot[bot]
authored andcommitted
LOG-6860: fixup: changes in generated CRD and CSV
Signed-off-by: Vitalii Parfonov <[email protected]>
1 parent 42b314c commit ed41d1f

5 files changed

+202
-5
lines changed

api/observability/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/cluster-logging.clusterserviceversion.yaml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ metadata:
8282
categories: OpenShift Optional, Logging & Tracing, Observability
8383
certified: "false"
8484
containerImage: quay.io/openshift-logging/cluster-logging-operator:latest
85-
createdAt: "2025-04-08T15:35:39Z"
85+
createdAt: "2025-04-22T11:06:54Z"
8686
description: The Red Hat OpenShift Logging Operator for OCP provides a means for
8787
configuring and managing log collection and forwarding.
8888
features.operators.openshift.io/cnf: "false"
@@ -1449,6 +1449,50 @@ spec:
14491449
path: outputs[0].splunk.index
14501450
x-descriptors:
14511451
- urn:alm:descriptor:com.tectonic.ui:text
1452+
- description: |-
1453+
IndexedFields are the list of fields to be indexed by Splunk, increase storage usage, they should be used sparingly and only for high-value fields that provide significant search benefits.
1454+
Nested fields are flattened into top-level fields.
1455+
Field paths are joined using dot notation, and unsupported characters are replaced with underscores (_).
1456+
Non-string values are automatically converted to strings (e.g., 3 → "3", true → "true").
1457+
Object values serialized as JSON strings (e.g., { status: 200 } → "{\"status\":200}").
1458+
1459+
Examples: [`.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`]
1460+
displayName: Indexed Fields
1461+
path: outputs[0].splunk.indexedFields
1462+
- description: |-
1463+
PayloadKey specifies record field to use as payload.
1464+
The PayloadKey must be a single field path.
1465+
1466+
Field paths must only contain alphanumeric and underscores. Any field with other characters must be quoted.
1467+
1468+
By default, payloadKey is not set, which means the complete log record is forwarded as the payload.
1469+
Use payloadKey carefully. Selecting a single field as the payload may cause other important information in the
1470+
log to be dropped, potentially leading to inconsistent or incomplete log events.
1471+
1472+
Examples: `.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
1473+
displayName: Payload Key
1474+
path: outputs[0].splunk.payloadKey
1475+
x-descriptors:
1476+
- urn:alm:descriptor:com.tectonic.ui:text
1477+
- description: |-
1478+
Source identifies the origin of a log event.
1479+
The Source can be a combination of static and dynamic values consisting of field paths followed by `||` followed by another field path or a static value.
1480+
A dynamic value is encased in single curly brackets `{}` and MUST end with a static fallback value separated with `||`.
1481+
Static values can only contain alphanumeric characters along with dashes, underscores, dots and forward slashes.
1482+
If not specified will be detected according to .log_source and .log_type value.
1483+
Details see in: docs/features/logforwarding/outputs/splunk-forwarding.adoc
1484+
1485+
Example:
1486+
1487+
1. foo-{.bar||"none"}
1488+
1489+
2. {.foo||.bar||"missing"}
1490+
1491+
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
1492+
displayName: Source
1493+
path: outputs[0].splunk.source
1494+
x-descriptors:
1495+
- urn:alm:descriptor:com.tectonic.ui:text
14521496
- description: Tuning specs tuning for the output
14531497
displayName: Tuning Options
14541498
path: outputs[0].splunk.tuning

bundle/manifests/observability.openshift.io_clusterlogforwarders.yaml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ spec:
13331333
NOTE2: If this filter is used in a pipeline with GoogleCloudLogging, `.hostname` CANNOT be added to this list as it is a required field.
13341334
items:
13351335
description: |-
1336-
FieldPath represents a path to find a value for a given field. The format must a value that can be converted to a
1336+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
13371337
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
13381338
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
13391339
If segments contain characters outside of this range, the segment must be quoted.
@@ -1366,7 +1366,7 @@ spec:
13661366
NOTE2: If this filter is used in a pipeline with GoogleCloudLogging, `.hostname` MUST be added to this list as it is a required field.
13671367
items:
13681368
description: |-
1369-
FieldPath represents a path to find a value for a given field. The format must a value that can be converted to a
1369+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
13701370
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
13711371
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
13721372
If segments contain characters outside of this range, the segment must be quoted.
@@ -3184,6 +3184,58 @@ spec:
31843184
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
31853185
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
31863186
type: string
3187+
indexedFields:
3188+
description: |-
3189+
IndexedFields are the list of fields to be indexed by Splunk, increase storage usage, they should be used sparingly and only for high-value fields that provide significant search benefits.
3190+
Nested fields are flattened into top-level fields.
3191+
Field paths are joined using dot notation, and unsupported characters are replaced with underscores (_).
3192+
Non-string values are automatically converted to strings (e.g., 3 → "3", true → "true").
3193+
Object values serialized as JSON strings (e.g., { status: 200 } → "{\"status\":200}").
3194+
3195+
Examples: [`.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`]
3196+
items:
3197+
description: |-
3198+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
3199+
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
3200+
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
3201+
If segments contain characters outside of this range, the segment must be quoted.
3202+
Examples: `.kubernetes.namespace_name`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
3203+
pattern: ^(\.[a-zA-Z0-9_]+|\."[^"]+")(\.[a-zA-Z0-9_]+|\."[^"]+")*$
3204+
type: string
3205+
nullable: true
3206+
type: array
3207+
payloadKey:
3208+
description: |-
3209+
PayloadKey specifies record field to use as payload.
3210+
The PayloadKey must be a single field path.
3211+
3212+
Field paths must only contain alphanumeric and underscores. Any field with other characters must be quoted.
3213+
3214+
By default, payloadKey is not set, which means the complete log record is forwarded as the payload.
3215+
Use payloadKey carefully. Selecting a single field as the payload may cause other important information in the
3216+
log to be dropped, potentially leading to inconsistent or incomplete log events.
3217+
3218+
Examples: `.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
3219+
pattern: ^(\.[a-zA-Z0-9_]+|\."[^"]+")(\.[a-zA-Z0-9_]+|\."[^"]+")*$
3220+
type: string
3221+
source:
3222+
description: |-
3223+
Source identifies the origin of a log event.
3224+
The Source can be a combination of static and dynamic values consisting of field paths followed by `||` followed by another field path or a static value.
3225+
A dynamic value is encased in single curly brackets `{}` and MUST end with a static fallback value separated with `||`.
3226+
Static values can only contain alphanumeric characters along with dashes, underscores, dots and forward slashes.
3227+
If not specified will be detected according to .log_source and .log_type value.
3228+
Details see in: docs/features/logforwarding/outputs/splunk-forwarding.adoc
3229+
3230+
Example:
3231+
3232+
1. foo-{.bar||"none"}
3233+
3234+
2. {.foo||.bar||"missing"}
3235+
3236+
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
3237+
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
3238+
type: string
31873239
tuning:
31883240
description: Tuning specs tuning for the output
31893241
nullable: true

config/crd/bases/observability.openshift.io_clusterlogforwarders.yaml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ spec:
13331333
NOTE2: If this filter is used in a pipeline with GoogleCloudLogging, `.hostname` CANNOT be added to this list as it is a required field.
13341334
items:
13351335
description: |-
1336-
FieldPath represents a path to find a value for a given field. The format must a value that can be converted to a
1336+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
13371337
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
13381338
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
13391339
If segments contain characters outside of this range, the segment must be quoted.
@@ -1366,7 +1366,7 @@ spec:
13661366
NOTE2: If this filter is used in a pipeline with GoogleCloudLogging, `.hostname` MUST be added to this list as it is a required field.
13671367
items:
13681368
description: |-
1369-
FieldPath represents a path to find a value for a given field. The format must a value that can be converted to a
1369+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
13701370
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
13711371
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
13721372
If segments contain characters outside of this range, the segment must be quoted.
@@ -3184,6 +3184,58 @@ spec:
31843184
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
31853185
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
31863186
type: string
3187+
indexedFields:
3188+
description: |-
3189+
IndexedFields are the list of fields to be indexed by Splunk, increase storage usage, they should be used sparingly and only for high-value fields that provide significant search benefits.
3190+
Nested fields are flattened into top-level fields.
3191+
Field paths are joined using dot notation, and unsupported characters are replaced with underscores (_).
3192+
Non-string values are automatically converted to strings (e.g., 3 → "3", true → "true").
3193+
Object values serialized as JSON strings (e.g., { status: 200 } → "{\"status\":200}").
3194+
3195+
Examples: [`.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`]
3196+
items:
3197+
description: |-
3198+
FieldPath represents a path to find a value for a given field. The format must be a value that can be converted to a
3199+
valid collector configuration. It is a dot delimited path to a field in the log record. It must start with a `.`.
3200+
The path can contain alphanumeric characters and underscores (a-zA-Z0-9_).
3201+
If segments contain characters outside of this range, the segment must be quoted.
3202+
Examples: `.kubernetes.namespace_name`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
3203+
pattern: ^(\.[a-zA-Z0-9_]+|\."[^"]+")(\.[a-zA-Z0-9_]+|\."[^"]+")*$
3204+
type: string
3205+
nullable: true
3206+
type: array
3207+
payloadKey:
3208+
description: |-
3209+
PayloadKey specifies record field to use as payload.
3210+
The PayloadKey must be a single field path.
3211+
3212+
Field paths must only contain alphanumeric and underscores. Any field with other characters must be quoted.
3213+
3214+
By default, payloadKey is not set, which means the complete log record is forwarded as the payload.
3215+
Use payloadKey carefully. Selecting a single field as the payload may cause other important information in the
3216+
log to be dropped, potentially leading to inconsistent or incomplete log events.
3217+
3218+
Examples: `.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
3219+
pattern: ^(\.[a-zA-Z0-9_]+|\."[^"]+")(\.[a-zA-Z0-9_]+|\."[^"]+")*$
3220+
type: string
3221+
source:
3222+
description: |-
3223+
Source identifies the origin of a log event.
3224+
The Source can be a combination of static and dynamic values consisting of field paths followed by `||` followed by another field path or a static value.
3225+
A dynamic value is encased in single curly brackets `{}` and MUST end with a static fallback value separated with `||`.
3226+
Static values can only contain alphanumeric characters along with dashes, underscores, dots and forward slashes.
3227+
If not specified will be detected according to .log_source and .log_type value.
3228+
Details see in: docs/features/logforwarding/outputs/splunk-forwarding.adoc
3229+
3230+
Example:
3231+
3232+
1. foo-{.bar||"none"}
3233+
3234+
2. {.foo||.bar||"missing"}
3235+
3236+
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
3237+
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
3238+
type: string
31873239
tuning:
31883240
description: Tuning specs tuning for the output
31893241
nullable: true

config/manifests/bases/cluster-logging.clusterserviceversion.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,50 @@ spec:
13721372
path: outputs[0].splunk.index
13731373
x-descriptors:
13741374
- urn:alm:descriptor:com.tectonic.ui:text
1375+
- description: |-
1376+
IndexedFields are the list of fields to be indexed by Splunk, increase storage usage, they should be used sparingly and only for high-value fields that provide significant search benefits.
1377+
Nested fields are flattened into top-level fields.
1378+
Field paths are joined using dot notation, and unsupported characters are replaced with underscores (_).
1379+
Non-string values are automatically converted to strings (e.g., 3 → "3", true → "true").
1380+
Object values serialized as JSON strings (e.g., { status: 200 } → "{\"status\":200}").
1381+
1382+
Examples: [`.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`]
1383+
displayName: Indexed Fields
1384+
path: outputs[0].splunk.indexedFields
1385+
- description: |-
1386+
PayloadKey specifies record field to use as payload.
1387+
The PayloadKey must be a single field path.
1388+
1389+
Field paths must only contain alphanumeric and underscores. Any field with other characters must be quoted.
1390+
1391+
By default, payloadKey is not set, which means the complete log record is forwarded as the payload.
1392+
Use payloadKey carefully. Selecting a single field as the payload may cause other important information in the
1393+
log to be dropped, potentially leading to inconsistent or incomplete log events.
1394+
1395+
Examples: `.kubernetes`, `.log_type`, '.kubernetes.labels.foobar', `.kubernetes.labels."foo-bar/baz"`
1396+
displayName: Payload Key
1397+
path: outputs[0].splunk.payloadKey
1398+
x-descriptors:
1399+
- urn:alm:descriptor:com.tectonic.ui:text
1400+
- description: |-
1401+
Source identifies the origin of a log event.
1402+
The Source can be a combination of static and dynamic values consisting of field paths followed by `||` followed by another field path or a static value.
1403+
A dynamic value is encased in single curly brackets `{}` and MUST end with a static fallback value separated with `||`.
1404+
Static values can only contain alphanumeric characters along with dashes, underscores, dots and forward slashes.
1405+
If not specified will be detected according to .log_source and .log_type value.
1406+
Details see in: docs/features/logforwarding/outputs/splunk-forwarding.adoc
1407+
1408+
Example:
1409+
1410+
1. foo-{.bar||"none"}
1411+
1412+
2. {.foo||.bar||"missing"}
1413+
1414+
3. foo.{.bar.baz||.qux.quux.corge||.grault||"nil"}-waldo.fred{.plugh||"none"}
1415+
displayName: Source
1416+
path: outputs[0].splunk.source
1417+
x-descriptors:
1418+
- urn:alm:descriptor:com.tectonic.ui:text
13751419
- description: Tuning specs tuning for the output
13761420
displayName: Tuning Options
13771421
path: outputs[0].splunk.tuning

0 commit comments

Comments
 (0)