mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-05 05:04:04 -08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity
7921 commits 263 branches 434 tags 663 MiB
Commit graph

7921 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz bf4e4a8ff0 Merge pull request #1125 from fabric8io/kubernetes-discovery 
Kubernetes SD example: separate out cluster level components & services
 2015-09-29 12:34:48 +02:00
Jimmi Dyson 0d61605526 Kubernetes SD example: separate out cluster level components & services 2015-09-29 11:22:18 +01:00
Jimmi Dyson e26fc5e73c Kubernetes SD config tidy & add labelmap action example 2015-09-29 08:59:35 +01:00
Brian Brazil a88ed8c2ff Merge pull request #1123 from keegancsmith/k8s-example 
Move InCluster auth in kubernetes example config
 2015-09-29 08:23:39 +01:00
Keegan Carruthers-Smith e633b1dc8d Move InCluster auth in kubernetes example config 
CA and Bearer Token are config of `kubernetes_sd_configs`, not the
`scrape_config`. Also updated misleading top-level comment and removed
unnecessary global config.
 2015-09-29 09:05:21 +02:00
Julius Volz e91d85b498 Merge pull request #1116 from prometheus/fix-tm-done 
Fix target manager CPU busyloop caused by bad done-channel handling.
 2015-09-28 12:31:26 +02:00
Julius Volz 99e8fff872 Fix target manager CPU busyloop caused by bad done-channel handling. 
Unfortunately this isn't nicely testable, as it's timing-dependent and
one would have to detect a stray goroutine doing a CPU busyloop...

Fixes https://github.com/prometheus/prometheus/issues/1114
 2015-09-28 11:51:16 +02:00
Fabian Reinartz 097d810f37 Merge pull request #1120 from prometheus/flaky-test 
retrieval: Reduce flakiness of TestTargetRunScraperScrapes
 2015-09-28 09:57:16 +02:00
Brian Brazil ba6688bfce retrieval: Reduce flakiness of TestTargetRunScraperScrapes 2015-09-28 08:34:54 +01:00
Brian Brazil 19d9e3609b Merge pull request #1118 from prometheus/params-lost 
retrieval: Add URL parameters to fullLabels too
 2015-09-26 17:29:11 +01:00
Brian Brazil b03569267e retrieval: Add URL parameters to fullLabels too 
Move all the special cases into one map, rather than
spreading the logic around.
 2015-09-26 16:59:24 +01:00
Fabian Reinartz 656b2e2109 Merge pull request #1113 from prometheus/router 
Switch to common/route package
 2015-09-24 17:15:40 +02:00
Fabian Reinartz 398bbf906b Switch to common/route package 2015-09-24 17:08:47 +02:00
Fabian Reinartz 666eafc23b Merge pull request #1108 from prometheus/fix-prefixed-redirect 
Fix / -> /graph redirect when using a path prefix.
 2015-09-23 13:59:24 +02:00
Julius Volz 0179bbfe03 Fix / -> /graph redirect when using a path prefix. 2015-09-23 12:36:18 +02:00
Brian Brazil 21979c4b95 Merge pull request #1112 from prometheus/flaky-tests 
promql: Reduce flakiness of concurrency test
 2015-09-23 10:25:04 +01:00
Brian Brazil 653ff71f1f promql: Reduce flakiness of concurrency test 2015-09-23 10:07:30 +01:00
Fabian Reinartz 8a40f1b7e3 Merge pull request #1111 from prometheus/flaky-tests 
Retrieval: Show error message for failed test scrape
 2015-09-23 10:57:11 +02:00
Brian Brazil 50258929ac Retrieval: Show error message for failed test scrape 
This is flaky, and I suspect it was due the to I/O timeout that I've
already fixed. In case that wasn't it, display the error should it
happen again.
 2015-09-23 09:24:50 +01:00
Brian Brazil c6b88bc3d3 Merge pull request #1110 from prometheus/flaky-tests 
retrieval: Reduce flakiness of TestTargetManagerChan
 2015-09-23 09:04:22 +01:00
Brian Brazil 4bc39dc60e retrieval: Reduce flakiness of TestTargetManagerChan 
This will increase test time by a few hundred ms,
this is the 2nd most common cause of flakiness.
 2015-09-23 09:00:37 +01:00
Brian Brazil 8af1d7a6d2 Merge pull request #1109 from prometheus/flaky-tests 
retrieval: Reduce flakiness of target tests
 2015-09-23 07:37:39 +01:00
Brian Brazil 93145b960a retrieval: Reduce flakiness of target tests 
Bump timeouts of tests where we don't want I/O timeouts.

Adjust the full channel test to be much more reliable,
by reducing the ingestion timeout from 1ms to 0.
 2015-09-22 19:23:36 +01:00
Fabian Reinartz cac6eea434 Merge pull request #1105 from prometheus/consulnil 
Fix nil panic on consul error
 2015-09-22 14:55:31 +02:00
Fabian Reinartz a8126c9be1 Merge pull request #1107 from prometheus/expfmt 
Update expfmt.NewDecoder usage
 2015-09-22 13:22:00 +02:00
Fabian Reinartz 327152862c Update expfmt.NewDecoder usage 2015-09-22 12:11:28 +02:00
Fabian Reinartz 1ce89a4a0b Fix nil panic on consul error 2015-09-22 09:04:31 +02:00
Julius Volz ef176e5a9b Merge pull request #1102 from mjibson/allow-labelmap 
Allow labelmap action
 2015-09-21 22:11:53 +02:00
Matt Jibson 0e99fa6c46 Allow labelmap action 2015-09-21 15:41:19 -04:00
Björn Rabenstein cf12e890a6 Merge pull request #1098 from prometheus/fix-direct-access-of-protobuf-fields 
Fix creation of protobuf fields
 2015-09-21 13:40:29 +02:00
Fabian Reinartz 7c0a4961ed Merge pull request #1097 from prometheus/makefile 
Add vetting to default make target
 2015-09-19 12:40:40 +02:00
Fabian Reinartz 28c2f9e4ff Fix phony targets and log asset generation 2015-09-19 11:51:40 +02:00
beorn7 ca63c05b4e Fix creation of protobuf fields 2015-09-18 19:00:53 +02:00
Fabian Reinartz 171f50706a Fix unkeyed field errors. 2015-09-18 17:00:08 +02:00
Fabian Reinartz 36ec8ba460 Fix missing return on error 2015-09-18 16:50:13 +02:00
Fabian Reinartz e005f939fd Fix scalar construction in function 2015-09-18 16:49:32 +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 cb02af5747 Fix trailing space in Makefile. 2015-09-18 12:19:27 +02:00
Julius Volz 678c90ea82 Merge pull request #1096 from prometheus/cut-0.16.0 
Cut Prometheus 0.16.0rc1.
 2015-09-18 12:16:17 +02:00
Julius Volz 7f29ee36dd Cut Prometheus 0.16.0rc1. 2015-09-18 12:03:57 +02:00
Fabian Reinartz dbb66d79ab Fix missing go version in build tags 2015-09-18 10:38:26 +02:00
Fabian Reinartz ac9554539c Merge pull request #1092 from prometheus/makefile 
Native go building
 2015-09-18 10:29:57 +02:00
Fabian Reinartz c8a092ebcc Add goenv script and fix Docker 2015-09-18 10:28:15 +02:00
Fabian Reinartz ad64474076 Update Readme for new Makefile 2015-09-17 19:08:05 +02:00
Fabian Reinartz 54147b3ea5 Merge pull request #1094 from prometheus/pkgignore 
Remove .pkgignore file
 2015-09-17 18:46:26 +02:00
Fabian Reinartz 1cc3a0a584 Add newline to vendor.js after upstream fix 2015-09-17 18:31:56 +02:00
Fabian Reinartz 3773ffeed5 Remove .pkgignore file 2015-09-17 18:27:26 +02:00
Fabian Reinartz 92ffeadb7b Move assets generation to top level make file 2015-09-17 17:53:54 +02:00
Fabian Reinartz 5b3a62f88d Merge pull request #1093 from prometheus/vendor 
Upgrade expfmt vendoring
 2015-09-17 17:35:41 +02:00