Skip to content

Commit 97597e2

Browse files
committed
update prometheus to 2.11.1
1 parent 2611ade commit 97597e2

File tree

406 files changed

+49419
-2064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+49419
-2064
lines changed

dep.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd `dirname $0`
44
ROOT=`pwd`
55

6-
PROMETHEUS_VERSION="v2.10.0"
6+
PROMETHEUS_VERSION="v2.11.1"
77

88
rm -rf vendor
99
rm -rf vendor_tmp
@@ -44,4 +44,4 @@ mkdir -p vendor/github.com/go-graphite/carbonapi/pkg
4444
mv vendor_tmp/carbonapi/pkg/parser vendor/github.com/go-graphite/carbonapi/pkg/parser
4545
mv vendor_tmp/carbonapi/LICENSE vendor/github.com/go-graphite/carbonapi/LICENSE
4646

47-
rm -rf vendor_tmp
47+
rm -rf vendor_tmp

prometheus/querier.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (q *Querier) Close() error {
3737
}
3838

3939
// LabelValues returns all potential values for a label name.
40-
func (q *Querier) LabelValues(label string) ([]string, error) {
40+
func (q *Querier) LabelValues(label string) ([]string, storage.Warnings, error) {
4141
w := where.New()
4242
w.And(where.HasPrefix("Tag1", label+"="))
4343

@@ -52,19 +52,19 @@ func (q *Querier) LabelValues(label string) ([]string, error) {
5252
body, err := clickhouse.Query(scope.WithTable(q.ctx, q.config.ClickHouse.TaggedTable), q.config.ClickHouse.Url, sql,
5353
clickhouse.Options{Timeout: q.config.ClickHouse.IndexTimeout.Value(), ConnectTimeout: q.config.ClickHouse.ConnectTimeout.Value()})
5454
if err != nil {
55-
return nil, err
55+
return nil, nil, err
5656
}
5757

5858
rows := strings.Split(string(body), "\n")
5959
if len(rows) > 0 && rows[len(rows)-1] == "" {
6060
rows = rows[:len(rows)-1]
6161
}
6262

63-
return rows, nil
63+
return rows, nil, nil
6464
}
6565

6666
// LabelNames returns all the unique label names present in the block in sorted order.
67-
func (q *Querier) LabelNames() ([]string, error) {
67+
func (q *Querier) LabelNames() ([]string, storage.Warnings, error) {
6868
w := where.New()
6969
fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays)
7070
w.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
@@ -77,13 +77,13 @@ func (q *Querier) LabelNames() ([]string, error) {
7777
body, err := clickhouse.Query(scope.WithTable(q.ctx, q.config.ClickHouse.TaggedTable), q.config.ClickHouse.Url, sql,
7878
clickhouse.Options{Timeout: q.config.ClickHouse.IndexTimeout.Value(), ConnectTimeout: q.config.ClickHouse.ConnectTimeout.Value()})
7979
if err != nil {
80-
return nil, err
80+
return nil, nil, err
8181
}
8282

8383
rows := strings.Split(string(body), "\n")
8484
if len(rows) > 0 && rows[len(rows)-1] == "" {
8585
rows = rows[:len(rows)-1]
8686
}
8787

88-
return rows, nil
88+
return rows, nil, nil
8989
}

vendor/github.com/PuerkitoBio/purell/.gitignore

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/PuerkitoBio/purell/.travis.yml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/PuerkitoBio/purell/LICENSE

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/PuerkitoBio/purell/README.md

Lines changed: 187 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)