mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
8381 commits 245 branches 436 tags 650 MiB
Commit graph

220 commits

Author SHA1 Message Date
Bartlomiej Plotka 54654340ad Cut release 2.15.1 
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2019-12-25 09:06:37 +01:00
Bartlomiej Plotka fa4658e4de
Pull release-2.15 branch to master. (#6510) 
* Cut 2.15.0-rc.0 release. (#6479)

* Cut 2.15.0-rc.0

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

* Cut 2.15.0 release. (#6509)

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2019-12-23 16:19:22 +01:00
Chris Marchbanks edeb7a44cb
Cut 2.14.0 release (#6298) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-11-11 15:20:12 +01:00
Chris Marchbanks c174a4516f
Cut the 2.14.0-rc.0 release (#6278) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-11-06 14:25:27 -07: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
yuxiaobo 47e51c8b2b Correct spelling mistakes 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
 2019-10-10 18:46:27 +08:00
Krasi Georgiev 81d284f806
Merge the 2.13 release branch to master (#6117) 2019-10-09 17:41:46 +02:00
Krasi Georgiev 08c55c119f
cut 2.13.0-rc.0 pre-release (#6058) 
* cut 2.13.0-rc.0 pre-release

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
 2019-09-25 23:19:01 +03:00
Julius Volz 43acd0e2e9
Cut v2.12.0 (#5913) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-08-18 14:30:50 +02:00
Julius Volz eaf81808d5 Add date to CHANGELOG.md entry to make promu work 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-08-14 19:37:27 +02:00
Julius Volz 51f601ea82
Cut v2.12.0-rc.0 (#5894) 
* Cut v2.12.0-rc.0

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

* Address review comments

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

* Review fixup

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-08-14 16:55:03 +02:00
Frederic Branczyk 079704b6b7
*: cut v2.11.2 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-08-14 10:24:15 +02:00
Frederic Branczyk aea611afed
*: Cut v2.11.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-10 14:13:38 +02:00
Frederic Branczyk 2c1a58ee13
*: cut v2.11.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-09 10:13:22 +02:00
Frederic Branczyk dc37d3d729
Cut v2.11.0-rc.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-04 11:04:41 +02:00
beorn7 2a5b7f9156 Promote rc.0 to final v2.10.0 
Signed-off-by: beorn7 <bjoern@rabenste.in>
 2019-05-25 13:35:41 +02:00
beorn7 2f0a929126 Cut v2.10.0-rc.0 
Signed-off-by: beorn7 <bjoern@rabenste.in>
 2019-05-22 12:46:37 +02:00
Brian Brazil cdc2ad05ef Cut 2.9.2 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-24 13:53:27 +01:00
Brian Brazil a9309a2e1e Prepare 2.9.1 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-16 12:54:34 +01:00
Brian Brazil 1a9cdbd024
Release 2.9.0 (#5458) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-15 10:05:07 +01:00
Julius Volz bc1c7f1809 Fix scalar-vector comparisons (#5454) 
* Fix scalar-vector comparisons

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

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2019-04-11 10:42:16 +01:00
Brian Brazil 46660a0745
Prepare 2.9.0-rc.0 release (#5450) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2019-04-10 18:59:25 +01:00
Ganesh Vernekar 0afd172224
Merge pull request #5416 from prometheus/release-2.8 
Merge 2.8.1 into master
 2019-03-29 15:20:49 +05:30
Tariq Ibrahim 1ef6aaee24
Update CHANGELOG.md 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

Co-Authored-By: codesome <cs15btech11018@iith.ac.in>
 2019-03-29 15:11:53 +05:30
Ganesh Vernekar 031ee49674
*: cut 2.8.1 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-03-28 19:06:32 +05:30
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
Ganesh Vernekar 7c8f0b0864
Update CHANGELOG (#5341) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-03-12 17:14:34 +05:30
Ganesh Vernekar 594626e8b5
Update CHANGELOG 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-03-12 17:06:42 +05:30
Ganesh Vernekar 6043e0e715
*: cut 2.8.0 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-03-12 09:16:26 +05:30
Ganesh Vernekar d390497280
*: cut 2.8.0-rc.0 (#5287) 
* Release 2.8.0-rc.0

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

* Mark tsdb/370 experimental and update flag.

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

* 5290 as BUGFIX

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

* Fix review comments

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-03-06 21:35:44 +05:30
Ganesh Vernekar 25889d6be5
Merge pull request #5298 from prometheus/release-2.7 
Merge 2.7.2 changelog forward
 2019-03-05 19:16:16 +05:30
Goutham Veeramachaneni 535e631621
*: cut 2.7.2 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-03-02 15:19:55 +01:00
Nguyen Hai Truong 5fbda4c9d7 Secure http links (#5244) 
Fix http link to https link for secure, modify http to https
in the links of project. Have some http links doesn't
redirect into https.

Co-Authored-By: Nguyen Van Trung trungnv@vn.fujitsu.com
Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
 2019-02-21 10:48:47 +01:00
Simon Pasquier a60431f3cd Merge v2.7.1 into master (#5170) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-01 09:54:12 +01:00
Goutham Veeramachaneni 62e591f928
*: cut 2.7.1 (#5164) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-31 12:13:25 +01:00
Goutham Veeramachaneni 410ee9e04a
*: cut 2.7.0 (#5141) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-28 15:37:30 +05:30
Goutham Veeramachaneni 7f7b211047
*: cut 2.7.0-rc.2 (#5134) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-24 18:55:04 +05:30
Goutham Veeramachaneni b454ed3ec2
*: cut 2.7.0-rc.1 (#5123) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-21 18:47:37 +05:30
Goutham Veeramachaneni 24f19f03db
*: cut 2.7.0-rc.0 (#5114) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2019-01-18 22:16:02 +05:30
Simon Pasquier b639fe140c
*: cut v2.6.1 (#5098) 
* *: cut v2.6.1

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

* Move container change first.

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

* Update VERSION

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-01-15 17:41:34 +01:00
Simon Pasquier dbd1d58c89
*: cut v2.6.0 (#5008) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-17 16:12:01 +01:00
Simon Pasquier 3fe4f3e700
*: cut v2.6.0-rc.1 (#5000) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-14 13:46:54 +01:00
Simon Pasquier 40f0b4a9f6
*: cut v2.6.0-rc.0 (#4958) 
* *: cut v2.6.0-rc.0

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

* Add #4926

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

* Address Brian's comments

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

* Address Goutham's comments

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-12-05 17:12:34 +01: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
Frederic Branczyk 98e4d8f6e4
*: Cut v2.5.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-11-06 09:20:09 +01:00
Frederic Branczyk b76dd3513b
*: Cut v2.5.0-rc.2 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-31 09:52:34 +01:00
Frederic Branczyk d04148ab86
*: Cut v2.5.0-rc.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-29 16:21:10 +01:00
Frederic Branczyk 4fc98efcde
CHANGELOG.md: Add entry for 2.5.0-rc.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-24 12:36:32 +02:00
Goutham Veeramachaneni 1625c9c6e4
Format changelog properly (#4721) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-10-11 09:10:37 -07:00
Goutham Veeramachaneni 167a4b4e73
*: release 2.4.3 (#4694) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-10-04 14:09:33 +05:30
Goutham Veeramachaneni c305ffaa09
release 2.4.2 (#4636) 
* vendor: Update prometheus/tsdb

This time, properly

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* release 2.4.2

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-21 12:48:39 +05:30
Goutham Veeramachaneni ce6716fe90
release 2.4.1 (#4632) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-19 19:04:43 +05:30
Goutham Veeramachaneni 16532a7111
changelog: /s/backward compatible/forward compatible/ (#4600) 
Fixes #4597

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-12 16:14:48 +05:30
Goutham Veeramachaneni 068eaa5dbf
Release 2.4.0 (#4592) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-11 16:13:52 +05:30
Goutham Veeramachaneni d075d78bfd
release 2.4.0-rc.0 (#4576) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-09-06 19:04:59 +05:30
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