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.

Sign up for GitHub

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

Jump to bottom

Bump mimir-prometheus after merge with upstream #1695

Merged
merged 7 commits into from Apr 22, 2022
Merged

Bump mimir-prometheus after merge with upstream #1695

merged 7 commits into from Apr 22, 2022

Commits on Apr 22, 2022

  1. Bump mimir-prometheus after merge with upstream 

    We've merged prometheus/main into mimir-prometheus/main in
grafana/mimir-prometheus#199.

This commit brings those changes by updating the vendored dependency of
mimir-prometheus.

Also brings the changes from
grafana/mimir-prometheus@db8c550
which fix a memory leak.

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    @jesusvazquez @pracucci
    jesusvazquez authored and pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    eb1c360 View commit details
    Browse the repository at this point in the history

  2. Update RulerManager interface Update() 

    Upstream prometheus rules manager Update() method has an extra argument
to execute a function before each group rule evaluation.

I've extended the interface to include this argument.

Also updated all the callers to pass nil meaning the function won't be
run.

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    @jesusvazquez @pracucci
    jesusvazquez authored and pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    cd86867 View commit details
    Browse the repository at this point in the history

  3. NewRangeQuery and NewInstantQuery now accept opts 

    The constructos for both NewRangeQuery and NewInstantQuery now accept
QueryOps.

So far there is only one opt called EnablePerStepStats which is disabled
by default so I figured for now we could pass nil.

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    @jesusvazquez @pracucci
    jesusvazquez authored and pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    46c949e View commit details
    Browse the repository at this point in the history

  4. NewAPI now receives a StatsRenderer 

    The initialization constructor of v1.NewAPI now accepts a StatsRendered.
I assume we're not using this yet so I'm passing nil.

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    @jesusvazquez @pracucci
    jesusvazquez authored and pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    2ac7604 View commit details
    Browse the repository at this point in the history

  5. Prometheus api uses grafana/regexp now 

    When initializing v1.NewAPI we're passing a compiled Regexp that
unmatches the expected type becuase we were importing "regexp" instead
of "github.com/grafana/regexp".

This commit makes it consistent by replacing "regexp" with
"github.com/grafana/regexp" and updating go mod.

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    @jesusvazquez @pracucci
    jesusvazquez authored and pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    ba05b85 View commit details
    Browse the repository at this point in the history

  6. Added Alertmanager Telegram support and blocked new OpsGenie api_key_… 

    …file config option

Signed-off-by: Marco Pracucci <marco@pracucci.com>
    @pracucci
    pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    cf49e37 View commit details
    Browse the repository at this point in the history

  7. Do not allow to set OAuth2 proxy_url 

    Signed-off-by: Marco Pracucci <marco@pracucci.com>
    @pracucci
    pracucci committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    c2d0ca6 View commit details
    Browse the repository at this point in the history