Commit Graph

7020 Commits

Author SHA1 Message Date
beorn7
adfc5aaa64 Update instructions for the release shepherd
This codifies how 2.10 was released. It removes the inconsistency of
freezing master for pre-releases but handling post-release bug fixes
in a separate branch.

The previous instructions came from a time where master was often in
bad shape. However, that's a problem of its own, which should be
avoided at all times and not only when a release is imminent. On other
words, freezing master can still happen if it is in bad shape and we
need a break from feature development and just fix the bugs for a
while. However, it should not happen as a formal step during the
release of a release candidate. On the contrary, a release candidate
is not really a release candidate if we already know it is in such a
bad shape that we need bug fixes. On the other hand, if we truly
believe the RC could be identical to the final release, there is no
need to freeze master.

I can explain more of the concept if there is still a need for
clarification.

Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-05 17:58:55 +02:00
Björn Rabenstein
1a26dd6c9a
Merge pull request #5632 from prometheus/juliusv-release-shepherd
Add next three release shepherds
2019-06-05 15:24:52 +02:00
beorn7
ac8d10f6e2 Replace Ganesh with Frederic for 2.11
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-05 15:22:49 +02:00
Julius Volz
1299a73781 Add next three release shepherds
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2019-06-05 14:18:42 +02:00
Frederic Branczyk
731ed22ac8
Merge pull request #622 from prometheus/live-reader-metric-suffix
wal: Add `_total` suffix as metric is a counter
2019-06-05 10:02:23 +02:00
Frederic Branczyk
e708ba1d14
wal: Add _total suffix as metric is a counter
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
2019-06-05 09:24:25 +02:00
mrasu
3db36f021b Fix make bench (#610)
Remove  flag -log.level
Signed-off-by: mrasu <m.rasu.hitsuji@gmail.com>
2019-06-03 22:37:24 +02:00
Frederic Branczyk
b800a89ae3
Merge pull request #619 from prometheus/remove-promauto
wal: Replace promauto with injected registry
2019-06-03 20:07:15 +02:00
Frederic Branczyk
abd15845e2
wal: Replace promauto with injected registry
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
2019-06-03 12:29:52 +02:00
Krasi Georgiev
882162d5b9
fix the "failed compaction" metric. (#613)
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
2019-05-30 13:57:28 +02:00
Simon Pasquier
74ff35ccdd cmd/promtool: add $externalLabels for alert unit tests
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-29 16:40:01 +02:00
sh0rez
8ba23fb336
fix(style): container_is_init to container_init
Removes 'is' keyword to comply style guide

Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 16:16:19 +02:00
Carl Bergquist
9ba2f13c5e fix inconsistant example rule (#5605)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
2019-05-29 10:46:00 +01:00
sh0rez
88b79bae64
chore(style): Comply with style guide, order list
Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 11:22:10 +02:00
Simon Pasquier
22824c2e08
Use Circle CI's org context (#5561)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-29 10:02:30 +02:00
Callum Styan
babb8a0572 Update queue config documentation to reflect default value change for capacity.
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-05-28 14:12:57 -07:00
beorn7
31ba9777f8 Merge branch 'release-2.10' 2019-05-28 20:48:28 +02:00
Björn Rabenstein
66e55f1d67
Merge pull request #5602 from roramirez/consoles-bootstrap-update
console_libraries: Update to Bootstrap 4.3.1
2019-05-28 20:47:49 +02:00
Rodrigo Ramírez Norambuena
598bdcc2f5 console_libraries: Update to Bootstrap 4.3.1
PR #5506  update the version for Bootstrap. This change update the
assets for console_libraries on this version of Bootstrap.

Signed-off-by: Rodrigo Ramírez Norambuena <a@rodrigoramirez.com>
2019-05-28 15:58:29 +00:00
sh0rez
1b144e499f
doc(discovery/kubernetes): container_is_init meta label
Signed-off-by: sh0rez <me@shorez.de>
2019-05-28 16:52:13 +02:00
sh0rez
6618f28fd7
test(discovery/kubernetes): TestPodDiscoveryInitContainer
Adds a test to check whether an InitContainer is included in the discovery

Signed-off-by: sh0rez <me@shorez.de>
2019-05-28 16:51:58 +02:00
sh0rez
fbd5c6f310
test(discovery/kubernetes): add container_is_init label to tests
Adds the new container_is_init label to the current tests to make them pass again

Signed-off-by: sh0rez <me@shorez.de>
2019-05-27 19:16:03 +02:00
sh0rez
cfa253ae06
feat(discovery/kubernetes): container_is_init label
Adds a label that shows whether the container is an init container or not

Signed-off-by: sh0rez <me@shorez.de>
2019-05-27 17:48:15 +02:00
naivewong
13c80a5979 Optimize queries using regex matchers for set lookups (#602)
* Original version of the set optimization

Signed-off-by: naivewong <867245430@qq.com>

* simple set matcher

Signed-off-by: naivewong <867245430@qq.com>

* simple set matcher

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* add benchmark

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update benchmark

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update benchmark

Signed-off-by: naivewong <867245430@qq.com>

* update benchmark

Signed-off-by: naivewong <867245430@qq.com>

* update benchmark

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>

* use genSeries from #467

Signed-off-by: naivewong <867245430@qq.com>

* update

Signed-off-by: naivewong <867245430@qq.com>
2019-05-27 16:54:46 +05:30
sh0rez
bea07fe866
feat(discovery/kubernetes): include InitContainers
Includes InitContainers in the ServiceDiscovery

Signed-off-by: sh0rez <me@shorez.de>
2019-05-26 22:53:14 +02:00
beorn7
212ff4b659 Merge branch 'release-2.10' 2019-05-25 14:25:35 +02:00
Björn Rabenstein
d20e84d0fb
Merge pull request #5597 from prometheus/beorn7/release
Promote rc.0 to final v2.10.0
2019-05-25 14:23:59 +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
Bevisy
70b2be3907 Exhaust request body before closing it (#5596)
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 13:34:49 +02:00
Bevisy
2548271e0f format markdown code block (#5594)
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 13:34:49 +02:00
Bevisy
bdebb0c890 format markdown code block (#5594)
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 11:28:50 +01:00
Bevisy
b7cdd3e840 Exhaust request body before closing it (#5596)
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 11:27:12 +01:00
Callum Styan
562e93e8e6 Always create a new clean segment when starting the WAL. (#608)
* Always create a new clean segment when starting the WAL.
* Ensure we flush the last page after repairing and before recreating the
new segment in Repair.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-05-24 19:33:27 +01:00
Björn Rabenstein
2de8ba4708
Merge pull request #5584 from prometheus/beorn7/release
Cut v2.10.0-rc.0
2019-05-22 14:18:48 +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
Dmitry Shmulevich
d81df5609d fix nil pointer dereference in azure discovery (#5587)
Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>
2019-05-21 20:03:24 +01:00
Alex Salt
d6a4daa26a web api: handle alert with Infinity/NaN values (#5582)
* web/api/v1: alert value as string in alert/rules endpoints

Signed-off-by: Alexander Saltykov <alexander-s@yandex-team.ru>
2019-05-21 10:41:54 +01:00
Björn Rabenstein
0652b518da
Merge pull request #5583 from tariq1890/update_consul
update consul and dns dependencies
2019-05-21 01:28:07 +02:00
Tariq Ibrahim
1c0df5b7d1
update consul and dns dependencies
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2019-05-20 11:09:08 -07:00
Björn Rabenstein
aeb3af485c
Merge pull request #5573 from tariq1890/fix_html
fix minor issue in the <a> tag of rules.html
2019-05-20 14:04:33 +02:00
Björn Rabenstein
6b956704b4
Merge pull request #5576 from prometheus/beorn7/mod
Update prometheus/client_golang and prometheus/tsdb modules
2019-05-18 00:56:00 +02:00
beorn7
aff4738f33 Adjust TestQueryRange to new Prometheus API client
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-17 18:09:47 +02:00
beorn7
12536f3027 Update prometheus/client_golang and prometheus/tsdb modules
Signed-off-by: beorn7 <bjoern@rabenste.in>
2019-05-17 14:54:49 +02:00
Krasi Georgiev
d48a5e2d5c
Release 0.8.0 (#607)
Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
2019-05-17 13:39:03 +03:00
Chris Marchbanks
840872a6f8 Fix remote storage config not updating correctly (#5555)
* Update remote write and remote read separately
* Add external labels to the remote write conf hash
* Add unit tests for remote storage lifecycle

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-05-17 10:29:49 +01:00
Lee Gaines
f4486815c1 logs filesystem type on startup (#5558)
Signed-off-by: Lee Gaines <leetgaines@gmail.com>
2019-05-17 10:16:16 +01:00
Callum Styan
bce663e1d9 Export the current segment index as a metic. (#601)
* Export the current segment index as a metic.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-05-17 11:47:42 +03:00
Tariq Ibrahim
c4b57ac4e2
fix minor issue in the <a> tag of rules.html
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2019-05-16 13:00:35 -07:00
Frederic Branczyk
04f22700b7
Merge pull request #5571 from simonpasquier/extend-k8s-endpoint-metadata
discovery/kubernetes: add node name and hostname to endpoints
2019-05-16 20:19:29 +02:00
Samuel Alfageme
425b07f3c4 Updated the 'consistency-modes' consul.io/api link to point to its new location (#5572)
Ref: 626392eb62

Signed-off-by: Samuel Alfageme <samuel@alfage.me>
2019-05-16 15:52:35 +01:00