mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 22:49:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
8398 commits 243 branches 444 tags 649 MiB
Commit graph

280 commits

Author SHA1 Message Date
Julien Pivotto 5b4f46a348 Add TLS and basic authentication 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-28 21:33:44 +01:00
beorn7 da1ca868d1 Update dependencies prior to releasing v2.24 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-12-28 17:53:35 +01:00
Ganesh Vernekar 8cc94fac93
Update dependencies for v2.23 (#8203) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-11-19 19:32:19 +05:30
Julien Pivotto 6c56a1faaa
Testify: move to require (#8122) 
* Testify: move to require

Moving testify to require to fail tests early in case of errors.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* More moves

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-10-29 09:43:23 +00:00
Julien Pivotto 4e5b1722b3
Move away from testutil, refactor imports (#8087) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-10-22 11:00:08 +02:00
Bartlomiej Plotka 9981b3f3ee
labels: Reduce allocated memory and latency of Hash method; Added tests. (#8025) 
* labels: Reduce allocated memory by Hash method in edge cases; Added tests.

Old:
/tmp/___BenchmarkLabels_Hash_in_github_com_prometheus_prometheus_pkg_labels -test.v -test.bench ^\QBenchmarkLabels_Hash\E$ -test.run ^$
goos: linux
goarch: amd64
pkg: github.com/prometheus/prometheus/pkg/labels
BenchmarkLabels_Hash
BenchmarkLabels_Hash/typical_labels_under_1KB
BenchmarkLabels_Hash/typical_labels_under_1KB-12         	 5366161	       259 ns/op	       0 B/op	       0 allocs/op
BenchmarkLabels_Hash/bigger_labels_over_1KB
BenchmarkLabels_Hash/bigger_labels_over_1KB-12           	 1700371	       767 ns/op	    2048 B/op	       1 allocs/op
BenchmarkLabels_Hash/extremely_large_label_value_10MB
BenchmarkLabels_Hash/extremely_large_label_value_10MB-12 	     356	   3743115 ns/op	10523442 B/op	       1 allocs/op
PASS

New:
/tmp/___BenchmarkLabels_Hash_in_github_com_prometheus_prometheus_pkg_labels -test.v -test.bench ^\QBenchmarkLabels_Hash\E$ -test.run ^$
goos: linux
goarch: amd64
pkg: github.com/prometheus/prometheus/pkg/labels
BenchmarkLabels_Hash
BenchmarkLabels_Hash/typical_labels_under_1KB
BenchmarkLabels_Hash/typical_labels_under_1KB-12         	 4758883	       259 ns/op	       0 B/op	       0 allocs/op
BenchmarkLabels_Hash/bigger_labels_over_1KB
BenchmarkLabels_Hash/bigger_labels_over_1KB-12           	 3324492	       357 ns/op	      80 B/op	       1 allocs/op
BenchmarkLabels_Hash/extremely_large_label_value_10MB
BenchmarkLabels_Hash/extremely_large_label_value_10MB-12 	    1087	   1083949 ns/op	    9734 B/op	       1 allocs/op
PASS

Process finished with exit code 0

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Addressed Kemal's comment.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Moved to v2 xxhash for improvements.

New:

/tmp/___BenchmarkLabels_Hash_in_github_com_prometheus_prometheus_pkg_labels -test.v -test.bench ^\QBenchmarkLabels_Hash\E$ -test.run ^$ -test.benchtime 10s
goos: linux
goarch: amd64
pkg: github.com/prometheus/prometheus/pkg/labels
BenchmarkLabels_Hash
BenchmarkLabels_Hash/typical_labels_under_1KB
BenchmarkLabels_Hash/typical_labels_under_1KB-12         	53447894	       221 ns/op	       0 B/op	       0 allocs/op
BenchmarkLabels_Hash/bigger_labels_over_1KB
BenchmarkLabels_Hash/bigger_labels_over_1KB-12           	42341754	       326 ns/op	       0 B/op	       0 allocs/op
BenchmarkLabels_Hash/extremely_large_label_value_10MB
BenchmarkLabels_Hash/extremely_large_label_value_10MB-12 	   10000	   1248546 ns/op	       0 B/op	       0 allocs/op
PASS

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Removed old xxhash package.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Pined minor version.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2020-10-15 11:31:28 +01:00
Frederic Branczyk a58489857d
*: Update go dependencies 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2020-10-08 09:29:12 +02:00
Simon Pasquier 9bb3555fe4 cmd/prometheus: support k8s.io/klog/v2 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-10-06 14:56:14 +02:00
Simon Pasquier 52c4da161f Bump Kubernetes dependencies 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2020-10-06 14:55:14 +02:00
Daniil Rutskiy 63457ef239
Vendor prometheus/common v0.14.0 
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
 2020-09-23 16:01:40 +03:00
Julien Pivotto e208afcc95
web: Remove APIv2 (#7935) 
* web: Remove APIv2

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-09-15 09:30:55 +02:00
Julien Pivotto d668a7efe3
Update go dependencies (#7837) 
Update dependencies before 2.21 release

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-08-24 14:03:47 +02:00
Lukas Kämmerling b6955bf1ca
Add hetzner service discovery (#7822) 
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
 2020-08-21 15:49:19 +02:00
Andy Bursavich 4e6a94a27d
Invert service discovery dependencies (#7701) 
This also fixes a bug in query_log_file, which now is relative to the config file like all other paths.

Signed-off-by: Andy Bursavich <abursavich@gmail.com>
 2020-08-20 13:48:26 +01:00
Julien Pivotto d867491364
Human-friendly durations in PromQL (#7713) 
* Add support for user-friendly durations

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-08-04 21:12:41 +02:00
Julien Pivotto 6f296594a8
Update go deps + use exclude directive (#7624) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-27 11:08:38 +02:00
beorn7 ddefee52dc Update dependencies 
Note that by just running `make update-go-deps`, the K8s Go client was
set to `k8s.io/client-go v11.0.0+incompatible`. However, that doesn't
play well with `k8s.io/apimachinery v0.18.5`. I the manually changed
the Go client line to `k8s.io/client-go v0.18.5`, which made
everything work. I guess Go Modules got confused by the ginormous
v11.0.0 version tag. Or it is a problem that pulling k8s.io/client-go
with git results in a rather old repo without the v0.18.5
tag. github.com/kubernetes/client-go has all the right tags. I
actually don't understand how Go Modules still correctly figures out
the source from the `k8s.io/client-go v0.18.5` line.

If one of the reviewers could enlighten me, I'd much appreciate it.

Signed-off-by: beorn7 <beorn@grafana.com>
 2020-07-11 00:42:05 +02:00
Julien Pivotto 57aac73e47
Downgrade docker dependency to the stable branch (#7524) 
This PR downgrades the docker dependency to the stable 19.03 branch.

It means that we will negociate 1.40 by default and not the uncomplete
1.41 API.

It was not possible to use the stable branch before because a patch
was pending to build on netbsd and dragonfly:

a40b877fbb

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-07 11:37:46 +02:00
yeya24 797e48c1a3 support time range in promtool query labels 
Updated prometheus/client_golang and json-iterator/go

Signed-off-by: yeya24 <yb532204897@gmail.com>
 2020-07-03 11:29:39 -04:00
Julien Pivotto 59de58d380
Docker Swarm service discovery (#7420) 
* Docker Swarm service discovery

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-26 12:25:58 +02:00
Julien Pivotto c61141ce51
Add DigitalOcean service discovery (#7407) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-18 17:04:41 +02:00
Ganesh Vernekar c729df3d0f
Update dependencies (#7331) 
* Update dependencies

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

* Update protos

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-06-04 11:25:56 +05:30
Tariq Ibrahim 06a6621b6c
update kubernetes to v1.18.x and update ingress apiVersion 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2020-06-01 08:26:50 -07:00
Julien Pivotto 000ba35277
Update prometheus/common to v0.10.0 (#7258) 
Enable HTTP/2.
Fixes #5938
Fixes #7237

Add support for "0" duration.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-05-14 10:58:14 +02:00
Hongcai Ren 1c48005911
bump client golang to v1.6.0 (#7191) 
* bump github.com/prometheus/client_golang to v1.6.0

Signed-off-by: RainbowMango <renhongcai@huawei.com>
 2020-04-30 12:24:47 +01:00
Bartlomiej Plotka 94baacdd93 Moved down all k8s.io deps to old version. 
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2020-04-23 17:07:29 +01:00
Bartlomiej Plotka 86ff4a1717 Updated all deps. 
Pinned github.com/googleapis/gnostic as they introduced braking change.


Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2020-04-23 13:43:59 +01:00
Vasily Sliouniaev 0393b188c9
Add Jaeger (#7148) 
* Trace remote read

Signed-off-by: vas <vasily.sliouniaev@jet.com>

* Use jaeger

Signed-off-by: vas <vasily.sliouniaev@jet.com>
 2020-04-23 02:05:55 +02:00
Bartlomiej Plotka 104a1313d4
testutil: Enriched Equals with diff on error. (#7053) 
## Example:

```

            exp: []chunks.Meta{chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e160), MinTime:1, MaxTime:2}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e180), MinTime:3, MaxTime:3}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e1a0), MinTime:5, MaxTime:5}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e1c0), MinTime:24, MaxTime:6}}

            got: []chunks.Meta{chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e280), MinTime:1, MaxTime:2}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e2a0), MinTime:3, MaxTime:3}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e220), MinTime:5, MaxTime:5}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e240), MinTime:6, MaxTime:6}}

```

Now:

```

            exp: []chunks.Meta{chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e740), MinTime:1, MaxTime:2}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e760), MinTime:3, MaxTime:3}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e780), MinTime:5, MaxTime:5}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e7a0), MinTime:24, MaxTime:6}}

            got: []chunks.Meta{chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e800), MinTime:1, MaxTime:2}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e820), MinTime:3, MaxTime:3}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e860), MinTime:5, MaxTime:5}, chunks.Meta{Ref:0x0, Chunk:(*chunkenc.XORChunk)(0xc00000e880), MinTime:6, MaxTime:6}}

            Diff:
            --- Expected
            +++ Actual
            @@ -50,3 +50,3 @@
               }),
            -  MinTime: (int64) 24,
            +  MinTime: (int64) 6,
               MaxTime: (int64) 6


```
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2020-03-26 11:48:23 +02:00
Julien Pivotto ef138a11c8
Update client_golang to fix promhttp error handling (#6986) 
Fixes #6139

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-03-15 00:42:14 +01:00
Julien Pivotto a17ddcf0f9
update vendor (#6936) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-03-09 15:27:19 +01:00
Julien Pivotto ef63d8d16d Update vendors 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-02-25 10:33:41 +01:00
Julien Pivotto 29086533fd web: use chained WithInstrumentation (#6661) 
* web: use chained WithInstrumentation

Requires an update of github.com/prometheus/common
* Update yaml.v2

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-19 00:07:10 +00:00
Mitsuhiro Tanda 466cc36ba0 upgrade aws-sdk-go (#6429) 
Signed-off-by: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
 2019-12-09 23:16:18 +00:00
Tariq Ibrahim 83e6d56393 clean up indirects in go.mod manifest (#6249) 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-10-30 08:50:55 +00:00
Krasi Georgiev 5b8ff9b8a4
Merge the 2.13 release branch (#6169) 
* Include tsdb tool in builds (#6085) (#6089)

Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>

* web/ui: fix for CVE-2019-10215 (#6098)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* cut 2.13 release (#6099)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>

* Fix panic in ARM builds of Prometheus (#6110)

An extra sync.Pool was added during a refactor which caused some 64 bit,
atomically accessed variables to no longer be 64 bit aligned. By moving
all atomically accessed variables to the beginning of the struct they
are guaranteed to be 64 bit aligned.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>

* promql: fix potential panic in the query logger (#6094)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Cut release 2.13.1 (#6145)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
 2019-10-18 02:21:58 +03:00
Goutham Veeramachaneni 4c648eddf4
vendor: Update json-iterator (#6030) 
Also add explicit support for NaN/Inf

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-09-17 19:22:26 +05:30
Simon Pasquier ca424695a6 *: bump Go version to 1.13 (#6020) 
* *: bump Go version to 1.13
* Fix go.mod for k8s.io/client-go

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-09-13 13:55:18 +01:00
Micah Hausler 5774d790a5 Updated AWS SDK to v1.23.12 (#5973) 
Signed-off-by: Micah Hausler <mhausler@amazon.com>
 2019-09-06 14:00:19 -06:00
Julius Volz b5c833ca21
Update go.mod dependencies before release (#5883) 
* Update go.mod dependencies before release

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Add issue for showing query warnings in promtool

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Revert json-iterator back to 1.1.6

It produced errors when marshaling Point values with special float
values.

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Fix expected step values in promtool tests after client_golang update

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Update generated protobuf code after proto dep updates

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-08-14 11:00:39 +02:00
Ganesh Vernekar 5ecef3542d
Cleanup after merging tsdb into prometheus 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-08-13 14:04:14 +05:30
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
Advait Bhatwadekar 5d401f1e1b Added query logging for prometheus. Issue #1315 (#5794) 
* Added query logging for prometheus.
Options added:
1) active.queries.filepath: Filename where queries will be recorded
2) active.queries.filesize: Size of the file where queries will be recorded.

Functionality added:
All active queries are now logged in a file. If prometheus crashes unexpectedly, these queries are also printed out on stdout in the rerun.

Queries are written concurrently to an mmaped file, and removed once they are done. Their positions in the file are reused. They are written in json format. However, due to dynamic nature of application, the json has an extra comma after the last query, and is missing an ending ']'. There may also null bytes in the tail of file.

Signed-off-by: Advait Bhatwadekar <advait123@ymail.com>
 2019-07-31 16:12:43 +01:00
Ganesh Vernekar c782d29310
Vendor tsdb 0.10.0 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-07-24 15:09:12 +05:30
Simon Pasquier fb2b3c2b0b
Bump github.com/influxdata/influxdb (#5784) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-22 13:39:13 +02:00
Tariq Ibrahim aacacd635c
Add k8s 1.15.1 as a vendor dependency. 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-07-18 15:08:13 -07:00
Tariq Ibrahim 9fe9e66cfd
remove the dependency on cockroachdb in prometheus 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-07-09 01:27:17 -07:00
Chris Marchbanks 475ca2ecd0
Update to tsdb 0.9.1 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-07-03 07:51:11 -06:00
Max Leonard Inden 41c22effbe
config&notifier: Add option to use Alertmanager API v2 
With v0.16.0 Alertmanager introduced a new API (v2). This patch adds a
configuration option for Prometheus to send alerts to the v2 endpoint
instead of the defautl v1 endpoint.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
 2019-06-21 16:33:53 +02:00
Björn Rabenstein 372b3438e5 Update prometheus/client_golang to v1.0.0 (#5682) 
Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-17 19:14:36 +01:00