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

Loki stack helm chart can deploy datasources without Grafana #1688

Merged
merged 1 commit into from
Feb 13, 2020

Conversation

fredgate
Copy link
Contributor

What this PR does / why we need it:
Enables loki stack helm chart to install datasources in Grafana even if Grafana is not installed by this chart (but for example with helm-operator chart).

Which issue(s) this PR fixes:
Fixes #1624

Special notes for your reviewer:
It will introduce a small breaking change as by default Grafana is disabled, and sidecar is enabled. With default configuration (helm upgrade --install loki loki/loki-stack), before the datasources are not installed, but after these changes they will be.

Checklist

  • Documentation added
  • Tests updated

@claassistantio
Copy link

claassistantio commented Feb 13, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-io
Copy link

Codecov Report

Merging #1688 into master will decrease coverage by 0.1%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1688      +/-   ##
==========================================
- Coverage   62.56%   62.46%   -0.11%     
==========================================
  Files         112      112              
  Lines        8615     8615              
==========================================
- Hits         5390     5381       -9     
- Misses       2822     2827       +5     
- Partials      403      407       +4
Impacted Files Coverage Δ
pkg/promtail/targets/tailer.go 73.56% <0%> (-4.6%) ⬇️
pkg/promtail/targets/filetarget.go 68.71% <0%> (-1.85%) ⬇️
pkg/logql/evaluator.go 91.63% <0%> (-0.65%) ⬇️

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 250b7d5 into grafana:master Feb 13, 2020
billimek added a commit to billimek/loki that referenced this pull request Feb 13, 2020
* 'extraPorts' of github.com:billimek/loki: (25 commits)
  Ensure status codes are set correctly in the frontend. (grafana#1684)
  --dry-run Promtail. (grafana#1652)
  Fix logcli --quiet parameter parsing issue (grafana#1682)
  This improves the log ouput for statistics in the logcli. (grafana#1644)
  Loki stack helm chart can deploy datasources without Grafana (grafana#1688)
  Automatically prune metrics from the /metrics output of the promtail metrics pipeline stage after an idle period.
  Allow a metric defined as a counter to match all lines, useful for creating line count metrics which include all your labels. Found a bug in the the test runner where it didn't fail if the actual error was nil but the test expected an error Added some tests to the counters to test valid configs
  maintainer links & usernames (grafana#1675)
  Binary operators in LogQL (grafana#1662)
  Pipe data to Promtail (grafana#1649)
  Add Owen to the maintainer team. (grafana#1673)
  Update tanka.md so that promtail.yml is in the correct format (grafana#1671)
  Correcte syntax of rate example (grafana#1641)
  Frontend & Querier query statistics instrumentation. (grafana#1661)
  loki-canary: fix indent of DaemonSet manifest written in .md file (grafana#1648)
  Query frontend service should be headless. (grafana#1665)
  Support custom prefix name in metrics stage (grafana#1664)
  pkg/promtail/positions: handle empty positions file (grafana#1660)
  Convert second(Integer class) to nanosecond precision (grafana#1656)
  Unite docs for fluentd plugin (grafana#1634)
  ...
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
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.

Add Grafana datasource even if Grafana is not installed
4 participants