Merge pull request #144 from prometheus/next-release

Merge next-release into master.

content/docs/introduction/getting_started.md

@@ -76,7 +76,7 @@ Prometheus build directory and run:
 
 ```language-bash
 # Start Prometheus.
-# By default, Prometheus stores its database in /tmp/metrics (flag -storage.local.path).
+# By default, Prometheus stores its database in ./data (flag -storage.local.path).
 ./prometheus -config.file=prometheus.yml
 ```
 

content/docs/operating/configuration.md

@@ -183,9 +183,12 @@ Catalog API.
 
 The following meta labels are available on targets during relabeling:
 
+* `__meta_consul_address`: the address of the target 
 * `__meta_consul_node`: the node name defined for the target
 * `__meta_consul_tags`: the list of tags of the target joined by the tag separator
 * `__meta_consul_service`: the name of the service the target belongs to
+* `__meta_consul_service_address`: the service address of the target 
+* `__meta_consul_service_port`: the service port of the target 
 * `__meta_consul_dc`: the datacenter name for the target
 
 ```
@@ -206,6 +209,12 @@ services:
 [ tag_separator: <string> | default = , ]
 ```
 
+Note that the IP number and port used to scrape the targets is assembled as
+`<__meta_consul_address>:<__meta_consul_service_port`. However, in some
+Consul setups, the relevant address is in `__meta_consul_service_address`.
+In those cases, you can use the [relabel](#target-relabeling-relabel_config)
+feature to replace the special `__address__` label.
+
 ### Zookeeper Serverset SD configurations `<serverset_sd_config>`
 
 Serverset SD configurations allow retrieving scrape targets from [Serversets]

content/docs/querying/operators.md

@@ -169,14 +169,18 @@ vector of fewer elements with aggregated values:
 These operators can either be used to aggregate over **all** label dimensions
 or preserve distinct dimensions by including a `by`-clause.
 
-    <aggr-op>(<vector expression>) [by (<label list>)] [keeping_extra]
+    <aggr-op>(<vector expression>) [by (<label list>)] [keep_common]
 
 By default, labels that are not listed in the `by` clause will be dropped from
 the result vector, even if their label values are identical between all
-elements of the vector. The `keeping_extra` clause allows to keep those extra
+elements of the vector. The `keep_common` clause allows to keep those extra
 labels (labels that are identical between elements, but not in the `by`
 clause).
 
+Until Prometheus 0.14.0, the `keep_common` keyword was called `keeping_extra`.
+The latter is still supported, but is deprecated and will be removed at some
+point.
+
 Example:
 
 If the metric `http_requests_total` had time series that fan out by