config: Add Prometheus config #191
Merged
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
hardillb
reviewed
Oct 5, 2023
Comment on lines
164
to
167
| prometheus: | ||
| enabled: {{ .Values.forge.telemetry.prometheus.enabled }} |
There was a problem hiding this comment.
This won't get added unless forge.telemtry.sentry is also set (controlled by the if block above and the end under).
Also it looks like the promethus tag should be one level deeper (to match the depth of sentry under backend
I can't suggest a change as it would need to include changes to lines not added by this PR
Something like this should work:
backend:
{{ if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "backend_dsn") -}}
sentry:
dsn: {{ .Values.forge.telemetry.sentry.backend_dsn}}
{{- end }}
prometheus:
enabled: {{ .Values.forge.telemetry.prometheus.enabled }}
There was a problem hiding this comment.
I also think the denting of prometheus is one level too deep, it's not a subkey of backend but top level. Thanks for catching this. Pushed a change, let me know if this is correct @hardillb
There was a problem hiding this comment.
But the code in the forge app expects it to be under backend
ZJvandeWeg
force-pushed
the
zj-prom-config
branch
from
3ac5e86
to
f78d305
Compare
The application now features a [/metrics endpoint][1] for Prometheus to scrape. Since merging, the configuration file structure has been updated since through [another PR][2]. This change requires both changes to be in the application and afterwards allows enabling the endpoint and an engineer to configure scraping of the data. [1]: FlowFuse/flowfuse#2889 [2]: FlowFuse/flowfuse#2893
ZJvandeWeg
force-pushed
the
zj-prom-config
branch
from
f78d305
to
52185d1
Compare
hardillb
approved these changes
Oct 5, 2023
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.
The application now features a /metrics endpoint for Prometheus to scrape. Since merging, the configuration file structure has been updated since through another PR.
This change requires both changes to be in the application and afterwards allows enabling the endpoint and an engineer to configure scraping of the data.