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

Add filter support to prometheus for /api/v1/labels /api/v1/{label}/values #270

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add filter support to prometheus for /api/v1/labels /api/v1/{label}/values #270

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
16307d1
add label filtering support to /api/v1/label*
Hedius Mar 12, 2024
ed5fd7f
remove comments
Hedius Mar 12, 2024
c3e39c4
add a todo for duplicate code
Hedius Mar 12, 2024
b5d8616
correctly escape __name__
Hedius Mar 12, 2024
a338baf
do not show __name__ in labe name results
Hedius Mar 15, 2024
da934cc
Revert "do not show __name__ in labe name results" actually needed
Hedius Mar 16, 2024
217e11a
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2-pr…
Hedius May 24, 2024
19ab8a8
add new feature flags for adjusting prometheus labeling handling
Hedius May 24, 2024
eaadde6
remove unused function
Hedius May 24, 2024
f5b99fe
Revert "remove unused function"
Hedius May 24, 2024
96c2eed
Merge remote-tracking branch 'upstream/master' into 2-prometheus-labe…
Hedius Aug 24, 2024
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
38 changes: 33 additions & 5 deletions prometheus/querier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ package prometheus
import (
"context"
"fmt"
"github.com/prometheus/prometheus/util/annotations"
"strings"
"time"

"github.com/lomik/graphite-clickhouse/config"
"github.com/lomik/graphite-clickhouse/finder"
"github.com/lomik/graphite-clickhouse/helper/clickhouse"
"github.com/lomik/graphite-clickhouse/pkg/scope"
"github.com/lomik/graphite-clickhouse/pkg/where"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/util/annotations"
)

// Querier provides reading access to time series data.
Expand All @@ -31,9 +32,25 @@ func (q *Querier) Close() error {

// LabelValues returns all potential values for a label name.
func (q *Querier) LabelValues(ctx context.Context, label string, matchers ...*labels.Matcher) ([]string, annotations.Annotations, error) {
// @TODO: support matchers
w := where.New()
w.And(where.HasPrefix("Tag1", label+"="))
terms := []finder.TaggedTerm{
{
Key: strings.ReplaceAll(label, `_`, `\_`),
Op: finder.TaggedTermEq,
Value: "*",
HasWildcard: true,
},
}

matcherTerms, err := makeTaggedFromPromQL(matchers)
if err != nil {
return nil, nil, err
}
terms = append(terms, matcherTerms...)

w, _, err := finder.TaggedWhere(terms, q.config.FeatureFlags.UseCarbonBehavior, q.config.FeatureFlags.DontMatchMissingTags)
if err != nil {
return nil, nil, err
}

fromDate := timeNow().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays)
w.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
Expand Down Expand Up @@ -68,8 +85,19 @@ func (q *Querier) LabelValues(ctx context.Context, label string, matchers ...*la

// LabelNames returns all the unique label names present in the block in sorted order.
func (q *Querier) LabelNames(ctx context.Context, matchers ...*labels.Matcher) ([]string, annotations.Annotations, error) {
// @TODO support matchers
terms, err := makeTaggedFromPromQL(matchers)
if err != nil {
return nil, nil, err
}
w := where.New()
// @TODO: this is duplicate to the for in finder.TaggedWhere. (different start...)
for i := 0; i < len(terms); i++ {
and, err := finder.TaggedTermWhereN(&terms[i], q.config.FeatureFlags.UseCarbonBehavior, q.config.FeatureFlags.DontMatchMissingTags)
if err != nil {
return nil, nil, err
}
w.And(and)
}
fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays).UTC()
w.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))

Expand Down
Loading