mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 21:54:10 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7973 commits 243 branches 444 tags 649 MiB
Commit graph

7973 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julien Pivotto 9b8cc663f7
Merge pull request #7623 from prometheus/release-2.20 
Release 2.20
 2020-07-20 19:16:06 +02:00
Björn Rabenstein 113d1672dc
Merge pull request #7622 from prometheus/beorn7/release 
Cut 2.20.0-rc.1
 2020-07-20 19:07:16 +02:00
beorn7 9c9248aeb4 Cut 2.20.0-rc.1 
Note that all new lines in the CHANGELOG except the last will
disappear in the final release because they only deal with issues
introduced in 2.20.0-rc.0.

This commit also adds an explanation for the WAL compression becoming
default.

Furthermore, this commit reverts the upgrade to grpc 1.30.0. It was
just a routine upgrade, but because grpc 1.30.0 contains two very
Go-module unfriendly breaking changes that in combination wreak havoc
for anyone importing from the prometheus/prometheus repo while still
depending on 1.29.1, we decided to revert as Prometheus itself doesn't
need the upgrade right now.

Signed-off-by: beorn7 <beorn@grafana.com>
 2020-07-20 18:51:35 +02:00
Björn Rabenstein f762a9ec77
Merge pull request #7621 from codesome/downgrade-grpc 
Downgrade grpc to v1.29.1
 2020-07-20 18:25:58 +02:00
Ganesh Vernekar 26044045b9
Downgrade grpc to v1.29.1 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-20 21:37:29 +05:30
Björn Rabenstein d6763acd60
Merge pull request #7550 from krasi-georgiev/panic-head-chunk 
no panic the head memseries has chunks in it
 2020-07-20 17:37:27 +02:00
Krasi Georgiev d30492cbb0 Avoid panic when the headChunk is nil during isolation. 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
 2020-07-20 18:23:18 +03:00
Björn Rabenstein eaa522867e
Merge pull request #7608 from roidelapluie/exemple 
Improve docker swarm configuration exemple
 2020-07-20 15:34:58 +02:00
Julien Pivotto 48140e5189 Improve docker swarm configuration exemple 
Improve to use the unix socket as this is what is enabled by default.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-20 13:42:57 +02:00
Björn Rabenstein 79620c78db
Merge pull request #7604 from roidelapluie/swarmsocket 
Docker swarm: enable unix socket
 2020-07-20 13:11:06 +02:00
Björn Rabenstein e0c0f996b3
Merge pull request #7615 from johncming/swarmsd_config 
discovery/config: add swarmsd config validation.
 2020-07-20 11:56:00 +02:00
johncming 6da680c7e4 discovery/config: add swarmsd config validation. 
Signed-off-by: johncming <johncming@yahoo.com>
 2020-07-19 22:50:22 +02:00
johncming 490f9c664e
scrape: remove two blank lines. (#7610) 
Signed-off-by: johncming <johncming@yahoo.com>
 2020-07-19 07:34:04 +02:00
Julien Pivotto 49f48d8f65 Fix comment 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-17 17:48:05 +02:00
Julien Pivotto 968c86d642 Fix comment 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-17 17:41:02 +02:00
Julien Pivotto 45644c82f6 Docker swarm: enable unix socket 
Fixes #7603

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-17 17:38:49 +02:00
Guangwen Feng b30654211c
Fix incorrect arguments order in TestExprString (#7602) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2020-07-17 13:38:04 +01:00
Julien Pivotto 22aa21e508
scrape tests: Make appenders more realistic (#7594) 
With this, the storage tests inside the scrape package are more
realistic.

Discovered with #7593, but fixed independently as #7593 will probably
take some time.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-17 12:30:22 +02:00
johncming a69a8b931f
rules: fix bug for unknown alert state. (#7599) 
Signed-off-by: johncming <johncming@yahoo.com>
 2020-07-17 08:39:15 +01:00
Zhou Hao ddedf454d0
add os.RemoveAll err verification (#7540) 
* add os.RemoveAll err verification for watcher_test

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>

* add os.RemoveAll err verification for db_test

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>

* add os.RemoveAll err verification for write_test

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>

* add os.RemoveAll err verification for queue_manager_test

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>

* tsdb/wal/watcher_test: add close operation before delete

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>
 2020-07-17 11:47:32 +05:30
Ben Ye e6ea798c32
promtool range query should exit when fail to parse time (#7505) 
Signed-off-by: yeya24 <yb532204897@gmail.com>
 2020-07-16 23:53:04 +01:00
Björn Rabenstein b489f78f68
Merge pull request #7590 from prometheus/release-2.20 
Merge release-2.20 branch into master
 2020-07-16 17:58:07 +02:00
Björn Rabenstein d17d20ac27
Merge pull request #7583 from prometheus/beorn7/release 
Cut 2.20.0-rc.0
 2020-07-16 17:54:41 +02:00
beorn7 68ac4418ef Cut 2.20.0-rc.0 
Signed-off-by: beorn7 <beorn@grafana.com>
 2020-07-16 15:26:51 +02:00
Ganesh Vernekar 1760c7474c
Replay m-map chunks irrespective of WAL (#7589) 
* Replay m-map chunks irrespective of WAL

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

* More logs

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-16 18:34:08 +05:30
Julien Pivotto 754461b74f
Reuse the same appender for report and scrape (#7562) 
Additionally, implement isolation in collectResultAppender.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-16 13:53:39 +02:00
Björn Rabenstein e0067a7bd8
Merge pull request #7573 from codesome/mmap-empty-files 
Avoid empty mmap files by using .tmp files to write headers
 2020-07-16 12:13:34 +02:00
Ganesh Vernekar b8a7e80f9b
Fix review comments 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-16 12:43:27 +05:30
Julien Pivotto 9c599f1ee2
Add new SD's to alertmanager config (#7584) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-15 20:51:14 +02:00
Ganesh Vernekar ea013343ca
Log when starting to create a checkpoint (#7581) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-15 19:15:37 +05:30
Ganesh Vernekar 7a763ff61e
Avoid empty mmap files by using .tmp files to write headers 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-14 14:59:28 +05:30
Julien Pivotto dc10763027
Next release shepherds (#7570) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-14 10:58:03 +02:00
Bartlomiej Plotka 823b218e1b
Fixed race between compact (gc, populate) and head append causing unknown symbol error. (#7560) 
* Fixed race between compact (gc, populate) and head append causing unknown symbol error.

Fixes https://github.com/prometheus/prometheus/issues/7373

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

* Addressed comments.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2020-07-14 09:36:22 +01:00
Julien Pivotto d77b56e88e
Fix avg_over_time for nan and float64 overflows (#7346) 
* Fix avg_over_time with Inf and NaN values

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-13 17:30:50 +02:00
Björn Rabenstein 65d805a642
Merge pull request #7551 from prometheus/beorn7/modules 
Update dependencies
 2020-07-13 13:55:31 +02:00
Bartlomiej Plotka 492061b24c
Revert "Fix unknown symbol error during head compaction (#7526)" (#7556) 
This reverts commit 30505a202a.
 2020-07-11 22:37:16 +05:30
Julien Pivotto 190addffd8
Change Scrape Loop mtx to Mutex (#7553) 
It was still RWLock but we never use the read lock..

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-11 15:37:13 +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
Sylvain Rabot 6a00626ee9
Display dates as well as timestamps in status page (#7544) 
* Display dates as well as timestamps in the status page

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>

* Trim trailing whitespaces

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
 2020-07-10 00:08:43 +02:00
Julien Pivotto be96951c56
Add Docker Swarm configuration example (#7542) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-09 20:05:21 +02:00
Ben Kochie d017777985
Merge pull request #7244 from ArthurSens/master 
Update docker example in migration guide
 2020-07-09 14:59:09 +02:00
Julien Pivotto 93ecf0e14c
Refactor dockerswarm refresh for testing (#7541) 
We were missing testing on the behaviour of the configuration
unmarshalling.

This PR adds a refresh command that can be used to test that we
use the correct refresh function.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-09 13:01:08 +02:00
Guangwen Feng 663016ee0c
Add unit test case to improve test coverage for template.go (#7537) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2020-07-09 09:43:32 +01:00
Callum Styan 0f76024eeb
Clarify error messaging, group names must be provided. (#7529) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2020-07-08 15:00:06 -07:00
Tobias Guggenmos 1f73073d73
Make without a valid metric identifier (#7533) 
Discussion see #7532.

cc @juliusv

Signed-off-by: Tobias Guggenmos <tobias.guggenmos@uni-ulm.de>
 2020-07-08 12:58:12 +02:00
Ganesh Vernekar 30505a202a
Fix unknown symbol error during head compaction (#7526) 
* Fix race during head compaction

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

* Comment out the test

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

* Skip test instead of commenting it out

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-07-07 17:29:09 +05:30
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
Marco Pracucci 2f6bf7de4c
Optimise labels regex matchers containing a literal within the pattern (#7503) 
* Added labels matchers regex fast path for literals within the regex

Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2020-07-07 09:38:04 +01:00
Julien Pivotto 9875afc491
Fix the type of the alert name (#7523) 
The alert name should be a valid label value, not a metric name.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-06 23:00:16 +02:00
Björn Rabenstein 933aa367b4
Merge pull request #7522 from prometheus/beorn7/doc 
Add an explanation for φ-quantile to the operators section
 2020-07-06 22:15:52 +02:00