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

210 commits

Author SHA1 Message Date
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
beorn7 2f6899cbb8 Add missing line to CHANGELOG.md 
This got dropped in the cherrypicking.
 2016-11-01 14:21:22 +01:00
beorn7 5b16d6bd6e Merge branch 'release-1.2' 2016-10-31 00:06:23 +01:00
beorn7 e3d7c39529 Update date of v1.2.2 2016-10-30 23:48:15 +01:00
beorn7 fefe55d11e Cut 1.2.2 2016-10-28 15:15:29 +02:00
Frederic Branczyk 26a0fa9f98
Cut v1.3.0-beta.0 2016-10-20 10:10:26 +02:00
beorn7 ddcd92b76c Cut v1.2.1 2016-10-10 17:03:51 +02:00
beorn7 d8cbac1225 Abbreviate CHANGELOG.md entry for 1.2.0 
It now follows the policy of only documenting user-relevant changes.
 2016-10-07 13:39:46 +02:00
beorn7 836c61e1da Cut v1.2.0 2016-10-06 21:28:51 +02:00
beorn7 f4656acd1f Cut v1.1.3 2016-09-16 13:08:16 +02:00
beorn7 03831e0e1e Cut 1.1.2 2016-09-08 14:17:49 +02:00
Fabian Reinartz 333e2ed92d *: cut v1.1.1 2016-09-07 11:18:06 +02:00
beorn7 a60378c777 Fix release date v1.1.0 2016-09-03 21:01:04 +02:00
beorn7 a49f3f6c08 Cut 1.1.0 2016-09-03 20:54:16 +02:00
beorn7 acd8937bab Cut v1.0.2 2016-08-24 12:04:10 +02:00
beorn7 7e75bb2101 Cut v1.0.1 2016-07-21 14:08:31 +02:00
Fabian Reinartz e867944172 *: cut 1.0.0 2016-07-18 22:38:51 +09:00
Fabian Reinartz 1c4b3ab0e2 *: update changelog for version 1.0.0-rc.0 2016-07-14 10:04:40 +09:00
Fabian Reinartz 3a9b739f30 *: cut 0.20.0 2016-06-15 17:31:26 +02:00
Fabian Reinartz a5b35498a8 *: bump version to 0.19.3 2016-06-14 14:19:31 +02:00
beorn7 592f02925e Cut 0.19.2 
Note that this will be merged into the release-0.19 branch and only
includes bug fixes, not other recent commits.

This is low-risk and contains critical bug fixes and should therefore
be released ASAP.
 2016-05-29 18:44:40 +02:00
Fabian Reinartz 500a494c9c *: add 0.19.1 changelog 2016-05-25 17:33:01 -07:00
Fabian Reinartz 810e0e254b Fix typo 2016-05-25 17:33:00 -07:00
Fabian Reinartz ec3aa12163 Fix indentation 2016-05-25 17:31:22 -07:00
Fabian Reinartz b26f4c0537 *: add 0.19.0 changelog 2016-05-25 17:31:22 -07:00
Fabian Reinartz f12ebd6635 Update changelog for 0.18.0 2016-04-18 09:45:18 +02:00
Fabian Reinartz b9853cacba Add CHANGE on alerting rule syntax 2016-04-09 12:55:49 +02:00
Fabian Reinartz 6d1a756613 Add 0.18.0rc1 changelog 2016-04-07 16:42:33 +02:00
Fabian Reinartz 7a0c0c3ca2 Remove noise from CHANGELOG 2016-03-02 17:59:23 +01:00
Fabian Reinartz 2bfb86d77c Update changelog for 0.17.0 release 2016-03-02 17:58:55 +01:00
Tobias Schmidt b7e6651e06 Improve 0.17.0 changelog 
* remove wrong release date until 0.17.0 gets actually released
* fix wrong alertmanager version number
* add example for regex anchor change
 2016-02-22 19:49:33 -05:00
Fabian Reinartz d96dc7a4db Changelog language fixes 2016-01-28 11:16:57 +01:00
Fabian Reinartz 6583928a04 Fix typos 2016-01-27 17:37:40 +01:00
Fabian Reinartz b040827945 Add changelog for 0.17.0 2016-01-27 17:03:44 +01:00
Rainer Eli f99ef14d7b Update CHANGELOG.md 
Small typo fix
 2015-10-20 23:25:24 -06:00
Fabian Reinartz b0da6e2d3e Add changelog for 0.16.1 2015-10-16 13:40:12 +02:00
Julius Volz dcb8ba4c68 Correct date of 0.16.0 release in CHANGELOG.md 2015-10-09 22:49:17 +02:00
Julius Volz 31e623485c Cut Prometheus 0.16.0. 2015-10-09 19:19:35 +02:00
Fabian Reinartz e1b9146c38 Add missing 'g' 2015-09-30 16:40:29 +02:00
Julius Volz 24ff06b145 CHANGELOG.md formatting fixes for 0.16.0rc2 entry 2015-09-30 16:39:06 +02:00
Fabian Reinartz 85ac8d0e5d Cut release 0.16.0rc2 2015-09-30 16:28:25 +02:00
Julius Volz 7ea867b4c9 Add vector() function to CHANGELOG.md. 2015-09-18 13:10:02 +02:00
Julius Volz 4c7c367a4b Fix date of 0.16.0rc1 release in CHANGELOG.md. 2015-09-18 12:26:56 +02:00
Julius Volz 7f29ee36dd Cut Prometheus 0.16.0rc1. 2015-09-18 12:03:57 +02:00
Julius Volz 89bfe616d0 Cut Prometheus version 0.15.1. 2015-07-27 17:51:34 +02:00
beorn7 b54315c30c Cut release 0.15.0 
No changes to 0.15.0rc3.

Only consolidated the CHANGELOG.md.
 2015-07-22 19:09:58 +02:00
beorn7 54be7cabd7 Cut 0.15.0rc3 2015-07-20 14:04:40 +02:00
beorn7 b590c748ce Cut release 0.15.0rc2 2015-07-16 16:23:43 +02:00
Julius Volz 5176a480e6 Merge pull request #855 from prometheus/cut-0.15.0 
Cut Prometheus 0.15.0rc1.
 2015-06-25 19:22:32 +02:00
Julius Volz 9ad71e5bbe Cut Prometheus 0.15.0rc1. 2015-06-25 19:14:42 +02:00
Fabian Reinartz 6dde527ee0 Cut 0.14.0. 2015-06-01 18:44:21 +02:00
beorn7 43b41c56ce Cut 0.13.3. 2015-05-11 18:05:31 +02:00
Johannes 'fish' Ziemke 36023ed213 Cut 0.13.2 2015-05-06 11:08:58 +02:00
beorn7 54fc50e58c Cut 0.13.1. 2015-04-09 16:36:04 +02:00
beorn7 cb1650b5a9 Cut v0.13.0. 2015-04-08 18:44:58 +02:00
beorn7 34396f75ea Cut 0.12.0. 2015-03-04 13:50:58 +01:00
beorn7 e9b90c4ebd Cut release 0.11.1. 2015-02-27 11:49:52 +01:00
beorn7 5f8d7a9dbd Cut release 0.11.0. 2015-02-23 20:21:00 +01:00
Bjoern Rabenstein 5ef1385ce2 Cut release 0.10.0. 2015-01-26 15:35:57 +01:00
Bjoern Rabenstein 6b03b8bc56 Prometheus version 0.9.0. 2015-01-23 16:13:01 +01:00
Bjoern Rabenstein de337e6404 Cut v0.8.0. 
Change-Id: Ie8d49793e78f10bdeb7ebe19cc2dc729ff7ef590
 2014-09-04 15:41:13 +02:00
Julius Volz f739980dfe Format changelog properly. 
Change-Id: I62c5bf8c5b880272d207da564a3fc45490c5db5e
 2014-08-25 15:14:25 +02:00
Julius Volz 0ca5be127f Prometheus version 0.7.0. 
Change-Id: I73468f72b43654f4bf57627c2f49fe802b18f637
 2014-08-06 14:13:17 +02:00
Julius Volz 6b325bfbde Prometheus version 0.6.0. 
Change-Id: I50f6b69cca952eedf9a62b9a8f58e0fb633a83ed
 2014-06-30 17:24:16 +02:00
Julius Volz 16ca35c07e Prometheus version 0.5.0. 
Change-Id: Ibf4d07c2878a9c22d6ade639b776dcfe3b533b34
 2014-05-28 16:05:14 +02:00
Julius Volz d2421a6916 Prometheus version 0.4.0. 
Change-Id: I752044a69f86aacc5a7e6da62a6f4a187cf67d27
 2014-04-17 15:10:13 +02:00