mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7551 commits 243 branches 444 tags 649 MiB
Commit graph

123 commits

Author SHA1 Message Date
Guangwen Feng 87971fff90
Add unit test for func WithoutEmpty in labels.go (#6848) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2020-02-19 11:56:12 +00:00
Guangwen Feng 14182c1420
Fix golint warning in labels.go (#6839) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2020-02-19 07:25:44 +01:00
Björn Rabenstein af04cb22c8
Merge pull request #6821 from prometheus/release-2.16 
Release 2.16
 2020-02-14 13:10:14 +01:00
Julien Pivotto 40b66d29ff
OpenMetrics parse: avoid setting prev token (#6781) 
We can avoid setting a prev token in the OM parser. The previous
coundition that checked for prev was unreacheable.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-02-07 07:33:26 +00:00
Ben Ye 492414542e
fix matcher for regex (#6540) 
Signed-off-by: yeya24 <yb532204897@gmail.com>
 2020-02-05 10:53:12 +00:00
Julien Pivotto 2b2eb79e8b Add windows tests for query logger (#6653) 
* Add windows tests
* Do not rely on time.Time in timer

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-20 13:17:11 +00:00
Julien Pivotto 46d18112a3 tsdb: error on series with duplicate labels (#6664) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-20 11:05:27 +00:00
Harkishen Singh 84e6459c4d Adds support for line-column numbers for invalid rules, promtool (#6533) 
Signed-off-by: Harkishen Singh <harkishensingh@hotmail.com>
 2020-01-15 18:07:54 +00:00
Hu Shuai a7f16749b7 Add unit test for Inverse in pkg/labels/matcher.go (#6586) 
This PR is about adding a unit test for Inverse and updating the other test in pkg/labels/matcher.go.

Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2020-01-13 07:29:14 -07:00
Julien Pivotto 9d9bc524e5 Add query log (#6520) 
* Add query log, make stats logged in JSON like in the API

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-08 13:28:43 +00:00
Josh Soref 91d76c8023 Spelling (#6517) 
* spelling: alertmanager

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: attributes

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: autocomplete

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: bootstrap

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: caught

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: chunkenc

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: compaction

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: corrupted

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: deletable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: expected

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: fine-grained

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: initialized

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: iteration

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: javascript

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: multiple

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: number

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: overlapping

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: possible

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: postings

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: procedure

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: programmatic

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: queuing

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: querier

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: repairing

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: received

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: reproducible

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: retention

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: sample

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: segements

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: semantic

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: software [LICENSE]

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: staging

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: timestamp

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: unfortunately

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: uvarint

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: subsequently

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: ressamples

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2020-01-02 15:54:09 +01:00
Brian Brazil a9ed3b980d
Optimise labels.Compare (#6539) 
strings.Compare isn't meant to be used, and this way we save one
comparison which is thus very slightly cheaper.

benchmark                                     old ns/op     new ns/op delta
BenchmarkPostingsForMatchers/Head/n="1"-4     236305440     233515705 -1.18%

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2020-01-01 15:45:01 +00:00
Julius Volz ae93bae88f Fix: exclude metric name in labels.MatchLabels() (#6523) 
This function is only used in one place to format an error message when
encountering multiple matches on the "one" side of a
one-to-many/many-to-one vector match, which is probably why nobodoy has
noticed this before. The hashing is already done correctly and excludes
the metric name label when using the "ignoring" matching modifier.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-12-27 09:32:19 +00:00
Julien Pivotto 9398b9ac1b OpenMetrics: force input to end with # EOF (#6505) 
Fixes #1169

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2019-12-24 08:48:28 +00:00
shreyassrivatsan e825282dd1 Add exemplar support to the openmetrics parser (#6292) 
* Add exemplar support to the openmetrics parser

Signed-off-by: Shreyas Srivatsan <shreyas@chronosphere.io>
 2019-11-19 09:33:30 +00:00
Tom Wilkie de0a772b8e Port tsdb to use pkg/labels. (#6326) 
* Port tsdb to use pkg/labels.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Get tests passing.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Remove useless cast.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Appease linters.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Fix review comments

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-11-18 11:53:33 -08:00
Callum Styan 54e3fc82f1 Add a README.md to textparse package about how to update lexers. 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-10-23 23:55:42 -07:00
Peter Tribble 90c3615a2c Fix solaris build. (#6149) 
* Fix solaris build.
* Tidy up build constraints on statfs_linux_386.go

Signed-off-by: Peter Tribble <peter.tribble@gmail.com>
 2019-10-17 18:43:29 +01:00
zhulongcheng 970ef41bb6 Fix exported function comments (#6002) 
Signed-off-by: zhulongcheng <zhulongcheng.dev@gmail.com>
 2019-09-10 14:45:09 +01:00
Brian Brazil 94b1af1471
Update to disallow new Go 1.13 float formats. (#5984) 
Don't inadvertantly expand the acceptable ways to specify
a float.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-09-05 15:18:18 +01:00
Simon Pasquier 06066a3619
*: improve error messages when parsing bad rules (#5965) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-08-28 17:36:48 +02:00
Brian Brazil c66bfce8cf
Don't panic on short input. (#5939) 
Fixes #5935

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-08-23 15:44:16 +01:00
Tobias Klauser 02430f88da pkg/runtime: simplify Utsname string conversion (#5625) 
Use Utsname from golang.org/x/sys/unix which contains byte array
instead of int8/uint8 array members. This allows to simplify the string
conversions of these members.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2019-08-21 11:27:21 +02:00
Bartek Plotka f0863a604e Removed extra tsdb/testutil after merge. 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2019-08-14 10:12:32 +01:00
Brian Brazil e62f30d497
Correctly handle empty labels from alert templates. (#5845) 
Fixes https://github.com/prometheus/common/issues/36

Move logic handling this into the labels package,
so all the cases are handled in one place and we're
less likely to have this come up again.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-08-13 11:19:17 +01:00
Chris Marchbanks 529ccff07b
Remove all usages of stretchr/testify 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-08-08 19:49:27 -06:00
Ganesh Vernekar 588eb20018
Efficient iteration and search in HashForLabels and HashWithoutLabels (#5707) 
* Efficient iteration and search in Labels.HashForLabels

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Better names for variables

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* HashWithoutLabels optimizations

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Refactor HashForLabels and HashWithoutLabels to take sorted names

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fix review comments

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-06-28 18:22:51 +05:30
Thomas Jackson a000cec011 Re-use label builder in promql aggregation (#5641) 
For my benchmarks on aggregation this reduces allocations by ~5% (~10%
time improvement):

```
benchmark                                                    old ns/op     new ns/op     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     727692        649626        -10.73%

benchmark                                                    old allocs     new allocs     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     2566           2434           -5.14%

benchmark                                                    old bytes     new bytes     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     162760        148854        -8.54%
```

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
 2019-06-11 09:24:49 +01:00
Lee Gaines f4486815c1 logs filesystem type on startup (#5558) 
Signed-off-by: Lee Gaines <leetgaines@gmail.com>
 2019-05-17 10:16:16 +01:00
Bjoern Rabenstein 38d518c0fe Rework #5009 after comments 
Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
 2019-04-17 01:40:10 +02:00
Sylvain Rabot 335a34486e Add external labels to template expansion 
This affects the expansion of templates in alert labels and
annotations and console templates.

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
 2019-04-17 01:40:10 +02:00
Tariq Ibrahim 8fdfa8abea refine error handling in prometheus (#5388) 
i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors.
ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives.
iii) Does away with the use of fmt package for errors in favour of pkg/errors

Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-26 00:01:12 +01:00
Tom Wilkie c7b3535997 Use pkg/relabelling in remote write. 
- Unmarshall external_labels config as labels.Labels, add tests.
- Convert some more uses of model.LabelSet to labels.Labels.
- Remove old relabel pkg (fixes #3647).
- Validate external label names.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2019-03-18 20:31:12 +00:00
Giedrius Statkevičius 10ec2552af promparse: sort all labels when parsing (#5372) 
* promparse: sort all labels when parsing

Some label names might start with an uppercase letter in which case it
needs to come before __name__. Without this it means that we are not
maintaining the same invariant that all label names should be sorted in
such cases.

Amend the tests to check this problem automatically. Without the change
the tests do not pass.

Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
 2019-03-16 10:10:07 +00:00
Mario Trangoni 5354ffff99 Fix some spelling issues (#5361) 
See,
$ codespell -S './vendor/*,./.git*,./web/ui/static/vendor*' --ignore-words-list="uint,dur,ue,iff,te,wan"

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
 2019-03-14 14:38:54 +00:00
Callum Styan b8106dd459 Review feedback: 
- Add a dropped samples EWMA and use it in calculating desired shards.
- Update metric names and a log messages.
- Limit number of entries in the dedupe logging middleware to prevent potential OOM.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2019-02-28 08:38:39 -08:00
Tom Wilkie d6f911b511 Factor out logging ratelimit & dedupe middleware. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2019-02-28 08:38:39 -08:00
Tariq Ibrahim a2a6e24f9f show list of offending labels in the error message in many-to-many scenarios (#5189) 
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-02-09 10:17:52 +01:00
JoeWrightss e158c53fa9 Fix some typos in comment (#5175) 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-02-01 14:35:32 +00:00
Matt Layher 28eff63eca pkg/runtime: use panic instead of log.Fatal for system call errors 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2019-01-16 17:03:30 -05:00
AixesHunter 9f903fb3f7 github.com/cznic/golex has moved to modernc.org/golex (#5034) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-24 23:59:32 +01:00
AixesHunter 29f21b8d0c import aliases yaml that can be omitted (#5018) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-20 09:45:30 +00:00
Bartek Płotka 62c8337e77 Moved configuration into relabel package. (#4955) 
Adapted top dir relabel to use pkg relabel structs.

Removal of this in a separate tracked here: https://github.com/prometheus/prometheus/issues/3647

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-12-18 11:26:36 +00:00
Ben Kochie c6399296dc
Fix spelling/typos (#4921) 
* Fix spelling/typos

Fix spelling/typos reported by codespell/misspell.
* UK -> US spelling changes.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-11-27 17:44:29 +01:00
Simon Pasquier 5230e2730a
*: check that assets are up-to-date (#4731) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-09 11:31:36 +01:00
Brian Brazil 3fdb92010e Expand OM to OpenMetrics 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 14:16:41 +01:00
Brian Brazil 9c03e11c2c Hook OpenMetrics parser into scraping. 
Extend metadata api to support units.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Brian Brazil c271ef456a Add an OpenMetrics parser. 
This is based on the existing parser, and has slightly better
performance (few %) than it.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Brian Brazil ffe7efb411 Prepare for multiple text formats 
Pass content type down to text parser.

Add layer of indirection in front of text parser,
and rename to avoid future clashes.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Tom Wilkie 4c52400708
Limit concurrent remote reads. (#4656) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-09-25 20:07:34 +01:00