RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-28 01:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,894 Commits 243 Branches 444 Tags 653 MiB
8928094b56
Commit Graph

5894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ganesh Vernekar
5888066ffa
Merge pull request #5649 from cstyan/remove-queue-retries 
Remove max_retries from queue_config
 2019-06-17 12:47:16 +05:30
Jens Erat
3e2781287e Markdown syntax fix in CONTRIBUTING.md (#5671) 
Signed-off-by: Jens Erat <email@jenserat.de>
 2019-06-16 19:47:55 +01:00
Jens Erat
375aeb9158 Added humanizePercentage formatting to templates (#5670) 
Lots of alerts are based on ratios (eg. disk usage), and humans are used
to values in percentage in textual descriptions.

Signed-off-by: Jens Erat <email@jenserat.de>
 2019-06-15 08:59:57 +01:00
Dmitry Shmulevich
0c0638b080 resolve race condition in maxGauge (#5647) 
* resolve race condition in maxGauge

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@sysdig.com>
 2019-06-13 20:55:08 +01:00
Matthias Rampke
61f1723c4a
Merge pull request #5658 from prometheus/mr/workaround-golangci-lint-575 
Work around golangci-lint issues
 2019-06-13 15:07:19 +02:00
Matthias Rampke
ec7db0d541
Work around golangci-lint issues 
The version on goreleaser is broken and different from the one in
Github: golangci/golangci-lint#575 – use the direct Github URL as a
workaround.

Additionally, the installer script attempts to `install -d /go/bin` on
CircleCI, which doesn't work due to permissions. Patch that line out –
we don't need it because we make sure the directory exists anyway.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
 2019-06-13 11:36:54 +00:00
Keenan Romain
55f3a9fe4a Allows globs for rules when unit testing (#5595) 
* Includes glob support when unit testing rule_files. 

Signed-off-by: Keenan Romain <Keenan.Romain@mailchimp.com>
 2019-06-12 11:31:07 +01:00
Björn Rabenstein
a0e8d0d98d
Merge pull request #5653 from prometheus/beorn7/client_golang 
Add objectives to Summaries
 2019-06-12 11:46:47 +02:00
beorn7
dd81912554 Add objectives to Summaries 
With the next release of client_golang, Summaries will not have
objectives by default. To not lose the objectives we have right now,
explicitly state the current default objectives.

Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-12 02:03:13 +02:00
Thomas Jackson
a000cec011 Re-use label builder in promql aggregation (#5641) 
For my benchmarks on aggregation this reduces allocations by ~5% (~10%
time improvement):

```
benchmark                                                    old ns/op     new ns/op     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     727692        649626        -10.73%

benchmark                                                    old allocs     new allocs     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     2566           2434           -5.14%

benchmark                                                    old bytes     new bytes     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     162760        148854        -8.54%
```

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
 2019-06-11 09:24:49 +01:00
Callum Styan
e9129abeff Remove max_retries from queue_config since it's not used in remote write 
anymore.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-06-10 12:43:08 -07:00
mkenigs
e23fa22233 Change snapshot description to be consistent with rest of the doc (#5642) 
Signed-off-by: mkenigs <matthewkenigsberg@gmail.com>
 2019-06-07 10:21:47 +01:00
Hrishikesh Barman
819205ed03 DOCKERFILE_PATH added to Makefile.common (#5635) 
* added dockerfile path to Makefile.common

Signed-off-by: Hrishikesh Barman <hrishikeshbman@gmail.com>
 2019-06-06 14:36:57 +02:00
Björn Rabenstein
6097d27f11
Merge pull request #5634 from prometheus/beorn7/release 
Update instructions for the release shepherd
 2019-06-06 11:16:29 +02:00
beorn7
2e77b32fb5 Further clarification 
Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-05 19:51:17 +02:00
beorn7
1329faca14 Clarify when changes in master can be merged into the release branch 
Signed-off-by: beorn7 <beorn@grafana.com>
 2019-06-05 18:59:06 +02:00
Frederic Branczyk
9fc3c61e2c
Merge pull request #5598 from sh0rez/master 
include InitContainers in Kubernetes Service Discovery
 2019-06-05 18:47:13 +02:00
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
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
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
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