31e623485c
Cut Prometheus 0.16.0.
2015-10-09 19:19:35 +02:00
288964eeaf
Merge pull request #1151 from prometheus/fix-sd-source-handling
...
Fix SD mechanism source prefix handling.
2015-10-09 18:21:51 +02:00
d88aea7e6f
Fix SD mechanism source prefix handling.
...
The prefixed target provider changed a pointerized target group that was
reused in the wrapped target provider, causing an ever-increasing chain
of source prefixes in target groups from the Consul target provider.
We now make this bug generally impossible by switching the target group
channel from pointer to value type and thus ensuring that target groups
are copied before being passed on to other parts of the system.
I tried to not let the depointerization leak too far outside of the
channel handling (both upstream and downstream) because I tried that
initially and caused some nasty bugs, which I want to minimize.
Fixes https://github.com/prometheus/prometheus/issues/1083
2015-10-09 14:08:22 +02:00
0088aa4d45
Merge pull request #1132 from prometheus/fix-quoting-and-escaping
...
Support escape sequences in strings and add raw strings
2015-10-08 20:51:18 +02:00
dec9fc9c32
Merge pull request #1148 from prometheus/fix-serverset-multiple-paths
...
Fix watching multiple Zookeeper paths in serverset SD.
2015-10-08 19:27:06 +02:00
46c5260761
Support escape sequences in strings and add raw strings.
...
This adapts some functionality from the Go standard library for string
literal lexing and unquoting/unescaping.
The following string types are now supported:
Double- or single-quoted strings:
These support all escape sequences that Go supports in double-quoted
string literals. The difference is that Prometheus also has
single-quoted strings (instead of single-quoted runes in Go). Raw
newlines are not allowed.
Backtick-quoted raw strings:
Strings quoted in backticks are treated as raw strings just like in Go
and may contain raw newlines and other special characters directly.
Fixes https://github.com/prometheus/prometheus/issues/1122
Fixes https://github.com/prometheus/prometheus/issues/1121
2015-10-08 19:17:21 +02:00
9cba38c6da
Merge pull request #1150 from prometheus/kerckhoff-principle
...
config: Don't hide username, it's not secret.
2015-10-08 16:50:34 +02:00
1ddf75240d
config: Don't hide username, it's not secret.
...
Usernames are not generally considered to be secrets,
and treating them as secrets may lead to confusion
as to how secure they are. Obscuring them also makes
debugging harder.
2015-10-08 15:13:21 +01:00
be8b83f48f
Merge pull request #1085 from mjibson/elb
...
Add SD for Amazon EC2 instances
2015-10-08 10:12:43 +02:00
5ba5a31e12
vendor EC2 dependencies
2015-10-06 18:36:19 -04:00
dcb4856d72
Add SD for Amazon EC2 instances
2015-10-06 18:36:17 -04:00
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
5ebef5c025
Merge pull request #1144 from roymiloh/master
...
Remove duplicated bootstrap js on the graph template
2015-10-06 00:10:33 +02:00
3e48226e7b
Merge pull request #1145 from prometheus/feder
...
consoles: Remove federation example.
2015-10-06 00:09:14 +02:00
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
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
b0aa877868
Merge pull request #1141 from prometheus/log
...
Switch to common/log
2015-10-03 14:10:57 +02:00
e3b6ec9784
Switch to common/log
2015-10-03 10:21:43 +02:00
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
94f4430ff3
Fix example prometheus.yml to use "external_labels" instead of "labels".
2015-10-02 23:00:10 +02:00
5caa70ee28
Merge pull request #1138 from prometheus/brian-brazil-patch-1
...
Mention hactoberfest
2015-10-02 17:09:09 +01:00
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
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
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
7e86cd1ef4
Add Unquote() strutil function.
2015-09-30 21:56:25 +02:00
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
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
e1b9146c38
Add missing 'g'
2015-09-30 16:40:29 +02:00
24ff06b145
CHANGELOG.md formatting fixes for 0.16.0rc2 entry
2015-09-30 16:39:06 +02:00
e7c60c2b1d
Merge pull request #1130 from prometheus/rc
...
Cut release 0.16.0rc2
2015-09-30 16:33:24 +02:00
85ac8d0e5d
Cut release 0.16.0rc2
2015-09-30 16:28:25 +02:00
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
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
dac26cef71
Rename global "labels" config option to "external_labels".
2015-09-29 20:54:20 +02:00
1976dfe634
Add Kubernetes namespace & name labels to example config
2015-09-29 12:55:15 +01:00
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
0d61605526
Kubernetes SD example: separate out cluster level components & services
2015-09-29 11:22:18 +01:00
e26fc5e73c
Kubernetes SD config tidy & add labelmap action example
2015-09-29 08:59:35 +01:00
a88ed8c2ff
Merge pull request #1123 from keegancsmith/k8s-example
...
Move InCluster auth in kubernetes example config
2015-09-29 08:23:39 +01:00
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
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
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
097d810f37
Merge pull request #1120 from prometheus/flaky-test
...
retrieval: Reduce flakiness of TestTargetRunScraperScrapes
2015-09-28 09:57:16 +02:00
ba6688bfce
retrieval: Reduce flakiness of TestTargetRunScraperScrapes
2015-09-28 08:34:54 +01:00
19d9e3609b
Merge pull request #1118 from prometheus/params-lost
...
retrieval: Add URL parameters to fullLabels too
2015-09-26 17:29:11 +01:00
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
656b2e2109
Merge pull request #1113 from prometheus/router
...
Switch to common/route package
2015-09-24 17:15:40 +02:00
398bbf906b
Switch to common/route package
2015-09-24 17:08:47 +02:00
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
0179bbfe03
Fix / -> /graph redirect when using a path prefix.
2015-09-23 12:36:18 +02:00
Julius Volz
Fabian Reinartz
Brian Brazil
Matt Jibson
Roy Miloh
Brian Brazil
Thach MAI
Jimmi Dyson
Keegan Carruthers-Smith