Skip to content

Add matcher based tenancy to api/v1/rules #204

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

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Add matcher based tenancy to api/v1/rules #204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions api/metrics/v1/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const (
labelNamesRoute = "/api/v1/labels"
labelValuesRoute = "/api/v1/label/{label_name}/values"
receiveRoute = "/api/v1/receive"
rulesRoute = "/api/v1/rules/raw"
rulesRoute = "/api/v1/rules"
rulesRawRoute = "/api/v1/rules/raw"
)

type handlerConfiguration struct {
Expand Down Expand Up @@ -214,6 +215,12 @@ func NewHandler(read, write, rulesEndpoint *url.URL, upstreamCA []byte, opts ...
prometheus.Labels{"group": "metricsv1", "handler": "label_values"},
otelhttp.WithRouteTag(c.spanRoutePrefix+labelValuesRoute, proxyRead),
))
// Thanos Query Rules API supports matchers from v0.25 so the WithEnforceTenancyOnMatchers
// middleware will not work here if prior versions are used.
r.Handle(rulesRoute, c.instrument.NewHandler(
prometheus.Labels{"group": "metricsv1", "handler": "rules"},
otelhttp.WithRouteTag(c.spanRoutePrefix+rulesRoute, proxyRead),
))
})

var uiProxy http.Handler
Expand Down Expand Up @@ -296,12 +303,12 @@ func NewHandler(read, write, rulesEndpoint *url.URL, upstreamCA []byte, opts ...

r.Group(func(r chi.Router) {
r.Use(c.uiMiddlewares...)
r.Get(rulesRoute, rh.get)
r.Get(rulesRawRoute, rh.get)
})

r.Group(func(r chi.Router) {
r.Use(c.writeMiddlewares...)
r.Put(rulesRoute, rh.put)
r.Put(rulesRawRoute, rh.put)
})
}

Expand Down