search

free / prometheus

The Prometheus monitoring system and time series database.
https://prometheus.io/
Apache License 2.0
48 stars 5 forks source link

x-rate patch conflicts on v2.16.0 #11

Closed sylr closed 4 years ago

sylr commented 4 years ago

Hi @free 👋

There has been some changes in promql/engine.go between v2.15.0 & v2.16.0 and since it is not possible to apply your xrate patch.

I was wondering if you plan to rebase your patch on v2.16.0 ?

Regards.

free commented 4 years ago

I'll give it a try, but I have to do it on my home computer. Please ping me if you see me dragging my feet for too long.

sylr commented 4 years ago

Thanks mate! Really appreciate this :+1:

free commented 4 years ago

Here you go: https://github.com/free/prometheus/releases/tag/2.16.0-xrate

I've only done a cursory check (and ran the unit tests), but it seems to be working fine.

I've also tried to merge master into xrate, but there are a handful of other conflicts already (the PromQL parser is being refactored) and while I managed to resolve the merge conflicts per se, the xrate unit tests are failing. )o: