Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(events): add sourceCategoryReplaceDash #3214

Merged
merged 1 commit into from
Aug 17, 2023
Merged

feat(events): add sourceCategoryReplaceDash #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3214.added.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(events): add sourceCategoryReplaceDash
1 change: 1 addition & 0 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `sumologic.events.provider` | Defines which provider is used for Kubernetes events collection - `otelcol` or `fluentd`. `otelcol` is the default and is recommended. `fluentd` is deprecated. | `otelcol` |
| `sumologic.events.sourceName` | Source name for the Events source. | `events` |
| `sumologic.events.sourceCategory` | Source category for the Events source. | `{clusterName}/events` |
| `sumologic.events.sourceCategoryReplaceDash` | Used to replace - with another character. | `"/"` |
| `sumologic.events.persistence.enabled` | Enable persistence for the event collector. Persistence lets the collector avoid reingesting events on restart and buffer them locally if unable to reach the backend. | `true` |
| `sumologic.events.persistence.persistentVolume.path` | Local filesystem path the persistent storage volume will be mounted at. | `/var/lib/storage/events` |
| `sumologic.events.persistence.size` | Size of the persistent storage volume | `10Gi` |
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/events/otelcol/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ processors:
collector: {{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
source_category: {{ .Values.sumologic.events.sourceCategory | default (printf "%s/%s" (include "sumologic.clusterNameReplaceSpaceWithDash" .) (.Values.fluentd.events.sourceName )) | quote}}
source_category_prefix: ""
source_category_replace_dash: {{ .Values.sumologic.events.sourceCategoryReplaceDash | quote}}
source_name: {{ .Values.sumologic.events.sourceName | quote}}
sumologic_schema:
add_cloud_namespace: false
Expand Down
3 changes: 3 additions & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ sumologic:
## Source category for the Events source. Default: "" which is resolved to "{clusterName}/events"
# sourceCategory: "kubernetes/events"

## Used to replace '-' with another character.
sourceCategoryReplaceDash: "/"

persistence:
enabled: true
size: 10Gi
Expand Down
1 change: 1 addition & 0 deletions tests/helm/testdata/goldenfile/events_otc/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ data:
collector: kubernetes
source_category: kubernetes/events
source_category_prefix: ""
source_category_replace_dash: /
source_name: events
sumologic_schema:
add_cloud_namespace: false
Expand Down
1 change: 1 addition & 0 deletions tests/helm/testdata/goldenfile/events_otc/options.input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ sumologic:
provider: otelcol
sourceName: testSourceName
sourceCategory: testSourceCategory
sourceCategoryReplaceDash: ";"
persistence:
enabled: false
1 change: 1 addition & 0 deletions tests/helm/testdata/goldenfile/events_otc/options.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ data:
collector: testCollector
source_category: testSourceCategory
source_category_prefix: ""
source_category_replace_dash: ;
source_name: testSourceName
sumologic_schema:
add_cloud_namespace: false
Expand Down