Commit Graph

115 Commits

Author SHA1 Message Date
Brian Brazil
ebe107b71b Release 2.3.2
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2018-07-12 14:44:46 +01:00
Brian Brazil
141799da6e Release 2.3.1
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
2018-06-19 13:12:11 +01:00
Fabian Reinartz
04b12703f2 Update changelog
Signed-off-by: Fabian Reinartz <freinartz@google.com>
2018-06-07 11:23:12 -04:00
Fabian Reinartz
290d71791a *: cut v2.3.0
Signed-off-by: Fabian Reinartz <freinartz@google.com>
2018-06-05 07:35:48 -04:00
Karsten Weiss
d79d573f71 Fix spelling mistakes found by codespell (#4065)
Signed-off-by: Karsten Weiss <knweiss@gmail.com>
2018-04-27 13:04:02 +01:00
beorn7
94ff07b81d Merge branch 'release-2.2'
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-04-10 16:50:35 +02:00
Philippe Laflamme
2aba238f31 Use common HTTPClientConfig for marathon_sd configuration (#4009)
This adds support for basic authentication which closes #3090

The support for specifying the client timeout was removed as discussed in https://github.com/prometheus/common/pull/123. Marathon was the only sd mechanism doing this and configuring the timeout is done through `Context`.

DC/OS uses a custom `Authorization` header for authenticating. This adds 2 new configuration properties to reflect this.

Existing configuration files that use the bearer token will no longer work. More work is required to make this backwards compatible.
2018-04-05 09:08:18 +01:00
Fabian Reinartz
f22e5dce1a *: cut 2.2.1 2018-03-14 10:02:06 -04:00
Fabian Reinartz
6b9cbacf52 *: cut v2.2.0 2018-03-08 15:37:46 +01:00
Fabian Reinartz
3669c1e476 *: cut 2.2.0-rc.1 2018-02-21 16:40:29 +01:00
Frederic Branczyk
7e820ce92d
Add v2.2.0-rc.0 changelog entry 2018-02-13 11:42:12 +01:00
Goutham Veeramachaneni
14eb15fe45 *: release 2.1.0
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2018-01-19 16:57:18 +05:30
Brian Brazil
0a74f98628 Release 2.0.0 2017-11-08 08:06:15 +01:00
beorn7
36a6ed4fe1 Cut v2.0.0-rc.3 2017-11-04 19:31:20 +01:00
beorn7
348ea482ea Merge branch 'beorn7/release' 2017-11-04 12:32:49 +01:00
beorn7
d7e9cca287 Cut 1.8.2 2017-11-04 11:49:35 +01:00
Tobias Schmidt
c4a68f29bf Merge branch 'release-1.8' 2017-10-27 16:38:54 +02:00
Fabian Reinartz
013f368449 *: cut v2.0.0-rc.2 2017-10-25 17:02:59 +02:00
Brian Brazil
3a7c51ab70 Remote read endpoint should handle matchers for external labels. (#3325)
If the other Prometheus has an external label that matches that of
the Prometheus being read from, then we need to remove that matcher
from the request as it's not actually stored in the database - it's
only added for alerts, federation and on the output of the remote read
endpoint.
Instead we check for that label being empty, in case there is a time
series with a different label value for that external label.
2017-10-23 15:12:22 +01:00
Brian Brazil
ced935e2d2 Release 1.8.1 (#3318) 2017-10-19 15:05:25 +01:00
Goutham Veeramachaneni
469629ef08 *: release v2.0.0-rc.1
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-10-17 13:51:07 +02:00
Fabian Reinartz
abf7c975c9 Merge branch 'master' into dev-2.0 2017-10-07 13:37:21 +02:00
beorn7
5829e4880d Cut v1.8.0 2017-10-06 22:13:36 +02:00
Goutham Veeramachaneni
7779d34877
*: release v2.0.0-rc.0
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
2017-10-05 19:45:21 +05:30
Fabian Reinartz
2d0b8e8b94 Merge branch 'master' into dev-2.0 2017-10-05 13:09:18 +02:00
beorn7
f51c97c7d4 Cut v1.7.2 2017-09-26 15:31:34 +02:00
Fabian Reinartz
c2166d48bb *: cut v2.0.0-beta.5 2017-09-21 16:18:49 +02:00
Fabian Reinartz
a31e6522e4 *: cut 2.0.0-beta.4 2017-09-14 12:46:49 +02:00
Fabian Reinartz
7f300f27cb *: cut 2.0.0-beta.3 2017-09-12 12:13:31 +02:00
Fabian Reinartz
a52f082939 *: cut v2.0.0-beta.2 2017-08-18 10:12:25 +02:00
Fabian Reinartz
2797fb4e73 *: cut 2.0.0-beta.1 2017-08-11 13:47:24 +02:00
Frederic Branczyk
aef7104791
cut 1.7.1 2017-06-12 11:44:04 +02:00
Frederic Branczyk
6d29f0c19f
cut 1.7.0 2017-06-07 10:00:48 +02:00
Tobias Schmidt
2a426bfead Revert "Use tag names consistently (#2743)"
Apparently, a decision was made at some point to only use the v prefix
in tags and similar contexts where other things can appear. There was a
vote to stick to that decision. For more information, read
https://github.com/prometheus/prometheus/pull/2743.

This reverts commit 5405a4724f.
2017-05-25 08:57:01 +02:00
Tobias Schmidt
5405a4724f Use tag names consistently (#2743) 2017-05-23 14:14:15 +02:00
Frederic Branczyk
53a2bd71b9
*: cut 1.6.3 2017-05-18 16:51:46 +02:00
Fabian Reinartz
b51cf7efcb *: cut 1.6.2 2017-05-11 14:50:39 +02:00
Fabian Reinartz
ddbbd2b712 Merge branch 'release-1.5' into cut162 2017-05-11 14:29:49 +02:00
Fabian Reinartz
fc3214c7bf *: cut 1.5.3 2017-05-11 13:58:18 +02:00
Brian Brazil
8097a3c523 Cut v1.6.1 (#2640) 2017-04-19 14:23:56 +01:00
beorn7
10f6453829 Cut v1.6.0 2017-04-14 19:53:58 +02:00
beorn7
6c17d30688 Cut v1.5.2 2017-02-10 13:57:11 +01:00
beorn7
eb6b95ac2e Cut release 1.5.1
Sadly, this is urgently required.
2017-02-07 10:55:01 +01:00
Frederic Branczyk
fb17493f66
*: cut 1.5.0 2017-01-23 12:59:01 +01:00
Fabian Reinartz
6be1e98278 *: cut 1.4.1 2016-11-28 09:29:23 +01:00
Fabian Reinartz
80455950ee *: cut 1.4.0 2016-11-25 13:28:29 +01:00
beorn7
be476954e8 Cut v1.3.1 2016-11-04 21:08:26 +01:00
beorn7
92c0ef1a92 Merge branch 'release-1.2' into beorn7/release 2016-11-03 22:48:39 +01:00
beorn7
cd8d3822f4 Cut v1.2.3 2016-11-03 20:24:45 +01:00
Fabian Reinartz
6fc9cf3a96 Cut release 1.3.0 2016-11-01 17:08:09 +01:00