helm/loki-stack: render loki datasource only if grafana is enabled #2086
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
Codecov Report
@@ Coverage Diff @@
## master #2086 +/- ##
==========================================
- Coverage 61.24% 61.22% -0.02%
==========================================
Files 146 146
Lines 11187 11187
==========================================
- Hits 6851 6849 -2
- Misses 3788 3789 +1
- Partials 548 549 +1
|
|
Nice can you bump the patch version of the helm chart ? |
osela
force-pushed
the
grafana-datasource-condition
branch
from
9b27e7d
to
bdcea18
Compare
|
@cyriltovena done |
Codecov Report
@@ Coverage Diff @@
## master #2086 +/- ##
==========================================
+ Coverage 61.43% 61.52% +0.09%
==========================================
Files 149 149
Lines 11935 11935
==========================================
+ Hits 7332 7343 +11
+ Misses 4017 4010 -7
+ Partials 586 582 -4
|
|
This breaks usage of loki-stack when installing grafana using prometheus-operator. Edit: opened issue #2186 |
cyriltovena
added a commit
to cyriltovena/loki
that referenced
this pull request
Jun 8, 2020
I didn't realize but this was a perfect ok use case to generate datasource when using a different grafana deployment. Fixes grafana#2186 Fixes grafana#2195 Now regarding grafana#2086 it seems pretty easy to use `.Values.grafana.sidecar.datasources.enabled` if you don't want any datasources. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
cyriltovena
added a commit
that referenced
this pull request
Jun 22, 2020
I didn't realize but this was a perfect ok use case to generate datasource when using a different grafana deployment. Fixes #2186 Fixes #2195 Now regarding #2086 it seems pretty easy to use `.Values.grafana.sidecar.datasources.enabled` if you don't want any datasources. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
torstenwalter
pushed a commit
to torstenwalter/grafana-helm-charts
that referenced
this pull request
Oct 3, 2020
I didn't realize but this was a perfect ok use case to generate datasource when using a different grafana deployment. Fixes grafana#2186 Fixes grafana#2195 Now regarding grafana/loki#2086 it seems pretty easy to use `.Values.grafana.sidecar.datasources.enabled` if you don't want any datasources. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
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.
What this PR does / why we need it:
Currently, the grafana section in the default
values.yamlof theloki-stackchart containswhich renders the loki datasource although grafana itself is disabled.
This PR changes this behaviour so the datasource is rendered only if grafana is enabled AND the datasources sidecar is enabled.