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.

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

helm/loki-stack: Support Prometheus on a sub-path in Grafana config #2099

Merged
merged 2 commits into from
May 27, 2020
Merged

helm/loki-stack: Support Prometheus on a sub-path in Grafana config #2099

merged 2 commits into from
May 27, 2020

Conversation

allout58
Copy link
Contributor

What this PR does / why we need it:
If Prometheus is set to run on a subpath with prometheus.server.prefixURL set, the DataSource config for Grafana needs to be modified to reflect this.

@CLAassistant
Copy link

CLAassistant commented May 20, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-commenter
Copy link

Codecov Report

Merging #2099 into master will increase coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2099      +/-   ##
==========================================
+ Coverage   61.28%   61.35%   +0.07%     
==========================================
  Files         146      146              
  Lines       11187    11187              
==========================================
+ Hits         6856     6864       +8     
+ Misses       3785     3772      -13     
- Partials      546      551       +5     
Impacted Files Coverage Δ
pkg/promtail/targets/tailer.go 73.86% <0.00%> (-2.28%) ⬇️
pkg/promtail/targets/filetarget.go 68.67% <0.00%> (-1.81%) ⬇️
pkg/logql/evaluator.go 90.69% <0.00%> (-0.59%) ⬇️
pkg/promtail/positions/positions.go 60.71% <0.00%> (+13.39%) ⬆️

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cyriltovena cyriltovena merged commit 10a1f28 into grafana:master May 27, 2020
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
Co-authored-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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants