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

Better rule loading #2576

Merged
merged 1 commit into from
Aug 31, 2020
Merged

Better rule loading #2576

merged 1 commit into from
Aug 31, 2020

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Aug 31, 2020

Fixes an issue where the underlying prometheus rulefmt loader parsed expressions as promql -- now we rip out the bits we need for a logql version.

@codecov-commenter
Copy link

Codecov Report

Merging #2576 into master will increase coverage by 0.08%.
The diff coverage is 80.43%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2576      +/-   ##
==========================================
+ Coverage   62.89%   62.97%   +0.08%     
==========================================
  Files         169      169              
  Lines       14911    15003      +92     
==========================================
+ Hits         9378     9448      +70     
- Misses       4788     4798      +10     
- Partials      745      757      +12     
Impacted Files Coverage Δ
pkg/ruler/manager/compat.go 47.13% <80.43%> (+47.13%) ⬆️
pkg/promtail/targets/file/tailer.go 70.83% <0.00%> (-4.17%) ⬇️
pkg/promtail/targets/file/filetarget.go 66.85% <0.00%> (-2.29%) ⬇️
pkg/logql/evaluator.go 92.88% <0.00%> (+0.40%) ⬆️
pkg/querier/queryrange/downstreamer.go 97.93% <0.00%> (+2.06%) ⬆️

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM

@owen-d owen-d merged commit 7b68293 into grafana:master Aug 31, 2020
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.

None yet

3 participants