Commit graph

5396 commits

Author SHA1 Message Date
Matt Jibson dcb4856d72 Add SD for Amazon EC2 instances 2015-10-06 18:36:17 -04:00
Julius Volz 60cf4015a4 Fix watching multiple Zookeeper paths in serverset SD.
Fix https://github.com/prometheus/prometheus/issues/1137
2015-10-06 15:54:54 +02:00
Fabian Reinartz 5ebef5c025 Merge pull request #1144 from roymiloh/master
Remove duplicated bootstrap js on the graph template
2015-10-06 00:10:33 +02:00
Fabian Reinartz 3e48226e7b Merge pull request #1145 from prometheus/feder
consoles: Remove federation example.
2015-10-06 00:09:14 +02:00
Brian Brazil c3adc9a393 consoles: Remove federation example.
Now that federation is a 1st class feature, there's
no reason to keep this around.
2015-10-05 21:15:01 +01:00
Roy Miloh 189416cb34 Remove duplicated bootstrap js on the graph template, it's already included on the base template. 2015-10-05 22:50:16 +03:00
Fabian Reinartz b0aa877868 Merge pull request #1141 from prometheus/log
Switch to common/log
2015-10-03 14:10:57 +02:00
Fabian Reinartz e3b6ec9784 Switch to common/log 2015-10-03 10:21:43 +02:00
Brian Brazil 91436b2974 Merge pull request #1140 from thachmai/master
Fix example prometheus.yml to use "external_labels" instead of "labels"
2015-10-02 22:40:58 +01:00
Thach MAI 94f4430ff3 Fix example prometheus.yml to use "external_labels" instead of "labels". 2015-10-02 23:00:10 +02:00
Brian Brazil 5caa70ee28 Merge pull request #1138 from prometheus/brian-brazil-patch-1
Mention hactoberfest
2015-10-02 17:09:09 +01:00
Brian Brazil 4b209aa384 Mention Hacktoberfest
As DigitalOcean is linking to this page, direct users to the project list from here.
2015-10-02 17:08:11 +01:00
Julius Volz d025fcd4e2 Merge pull request #1133 from prometheus/escape-string-values
HTML-escape string return values in web UI.
2015-10-01 15:36:11 +02:00
Julius Volz 3008a35c04 HTML-escape string return values in web UI.
Querying for the string literal "<script>alert(1)</script>" would alert
otherwise.
2015-10-01 13:21:39 +02:00
Julius Volz 7e86cd1ef4 Add Unquote() strutil function. 2015-09-30 21:56:25 +02:00
Julius Volz ea7c077e81 Merge pull request #1131 from prometheus/fix-node-disk-mountpoint
Rename label 'filesystem'->'mountpoint' in node-cpu console.
2015-09-30 17:30:59 +02:00
Julius Volz f4e1f6e3b9 Rename label 'filesystem'->'mountpoint' in node-cpu console.
The label name has been changed in the node exporter.
2015-09-30 17:25:59 +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 e7c60c2b1d Merge pull request #1130 from prometheus/rc
Cut release 0.16.0rc2
2015-09-30 16:33:24 +02:00
Fabian Reinartz 85ac8d0e5d Cut release 0.16.0rc2 2015-09-30 16:28:25 +02:00
Julius Volz db382b4570 Merge pull request #1129 from prometheus/rename-global-labels
Rename global "labels" config option to "external_labels".
2015-09-30 11:53:50 +02:00
Julius Volz 4dbb3abfec Merge pull request #1127 from fabric8io/kubernetes-discovery
Add Kubernetes namespace & name labels to example config
2015-09-29 20:56:51 +02:00
Julius Volz dac26cef71 Rename global "labels" config option to "external_labels". 2015-09-29 20:54:20 +02:00
Jimmi Dyson 1976dfe634 Add Kubernetes namespace & name labels to example config 2015-09-29 12:55:15 +01:00
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