helm: Replace internal agent with Grafana Agent #2304
Merged
Conversation
This file contains hidden or 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
simonswine
reviewed
Aug 25, 2023
simonswine
reviewed
Aug 25, 2023
This reverts commit d434dcf.
simonswine
approved these changes
Aug 25, 2023
| {{- range $profileTypes }} | ||
|
|
||
| discovery.relabel "kubernetes_pods_{{.}}_default_name" { | ||
| targets = concat(discovery.relabel.kubernetes_pods.output) |
There was a problem hiding this comment.
Worth leaving a comment why those need to be tabs, vs. the ones in lines 36-65 which are spaces
There was a problem hiding this comment.
Yeah this is because of the river linter.
| {{- if hasKey .Values.pyroscope.components "query-frontend" }} | ||
| kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "pyroscope.fullname" . }}-query-frontend {{ .Values.pyroscope.service.port }}:{{ .Values.pyroscope.service.port }} | ||
| http://{{ include "pyroscope.fullname" . }}-query-frontend.{{ .Release.Namespace }}.svc.cluster.local.:{{ .Values.pyroscope.service.port }} |
There was a problem hiding this comment.
This port is wrong when you override the port only for that one component.
You would need to do the default thing here, too.
There was a problem hiding this comment.
Yeah not easy with the dash. 🤔
There was a problem hiding this comment.
{{ $port := ((index .Values.pyroscope.components "query-frontend").service).port | default .Values.pyroscope.service.port }}
did the trick :mindblowing:
This reverts commit 4a73dee.
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.
This replace the old agent module with Grafana Agent (as a subchart) in helm.
I decided to keep the agent on by default as it was before. I suspect this whole logic might be better in the agent helm chart.
I still needs to verify if the documentation needs edit.