Fix/persistent queue #668
Closed
Fix/persistent queue #668
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge main from signalfx
| # NOTE: The File Storage extension will persist state to the node's local file system. | ||
| # While using the persistent queue it is advised to increase memory limit for agent (agent.resources.limits.memory) | ||
| # to 1Gi. | ||
| persistentQueueEnabled: |
There was a problem hiding this comment.
Does it make more sense to nest this in sendingQueue since that's what uses it?
| @@ -11,6 +11,11 @@ extensions: | |||
| directory: {{ .Values.logsCollection.checkpointPath }} | |||
| {{- end }} | |||
|
|
|||
| {{- if or .Values.splunkPlatform.persistentQueueEnabled.logs .Values.splunkPlatform.persistentQueueEnabled.metrics }} | |||
There was a problem hiding this comment.
you defined the "splunk-otel-collector.persistentQueueEnabled" template for this purpose
| @@ -614,6 +619,9 @@ service: | |||
| {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq .Values.logsEngine "otel") }} | |||
| - file_storage | |||
| {{- end }} | |||
| {{- if or .Values.splunkPlatform.persistentQueueEnabled.logs .Values.splunkPlatform.persistentQueueEnabled.metrics }} | |||
There was a problem hiding this comment.
same template note (there are other cases throughout)**
| @@ -135,27 +135,39 @@ spec: | |||
| imagePullPolicy: {{ .Values.image.initPatchLogDirs.pullPolicy }} | |||
| command: ['sh', '-c', ' | |||
| mkdir -p {{ .Values.logsCollection.checkpointPath }}; | |||
| chown -Rv {{ $agent.securityContext.runAsUser | default 20000 }}:{{ $agent.securityContext.runAsGroup | default 20000 }} {{ .Values.logsCollection.checkpointPath }}; | |||
| chown -Rv {{ $agent.securityContext.runAsUser | default 999 }}:{{ $agent.securityContext.runAsGroup | default 999 }} {{ .Values.logsCollection.checkpointPath }}; | |||
There was a problem hiding this comment.
I think this is a good change but could be problematic if users have adopted the 20000 id. Can you please add a breaking change note in the changelog?
dmitryax
reviewed
Feb 23, 2023
| chmod -v g+rwxs {{ .Values.logsCollection.checkpointPath }}; | ||
| {{ if .Values.logsCollection.containers.enabled -}} | ||
| if [ -d "/var/lib/docker/containers" ]; | ||
| then | ||
| setfacl -n -Rm d:m::rx,m::rx,d:g:{{ $agent.securityContext.runAsGroup | default 20000 }}:rx,g:{{ $agent.securityContext.runAsGroup | default 20000 }}:rx /var/lib/docker/containers; | ||
| setfacl -n -Rm d:m::rx,m::rx,d:g:{{ $agent.securityContext.runAsGroup | default 999 }}:rx,g:{{ $agent.securityContext.runAsGroup | default 999 }}:rx /var/lib/docker/containers; |
There was a problem hiding this comment.
@wojtekzyla can you please make a separate PR for these changes? They seem unrelated and should be captured in a changelog separately. And please link an issue in that PR
Closed
Merged
|
Please rebase |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things included in this PR: