public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prometheus: Fix recording rules expansion (#24977)

Browse Source 
* First pass solution

* Refactor solution

* Add test coverage, update tests

* Fix behaviour for multiple labels, add test for this

* Add recordin rules to devenv prometheus

* Update devenv/prometheus2 instead of devenv/prometheus

* Add newlines

* Fix label matching if labels include comma, add test coverage

* Refactor

* Refactor, simplify
This commit is contained in:
Ivana Huckova
2020-05-22 15:16:01 +02:00
committed by GitHub
parent 4f1bbdfc0a
commit 4d18bda2e1
7 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devenv/docker/blocks/prometheus2/Dockerfile
+2 -1
View File
@@ -1,3 +1,4 @@
FROM prom/prometheus:v2.7.2
ADD prometheus.yml /etc/prometheus/
ADD alert.rules /etc/prometheus/
ADD recording.yml /etc/prometheus/
ADD alert.yml /etc/prometheus/