Merge branch 'next-release'

content/docs/operating/configuration.md

@@ -299,6 +299,7 @@ The following meta labels are available on targets during [relabeling](#relabel_
 
 * `__meta_consul_address`: the address of the target
 * `__meta_consul_dc`: the datacenter name for the target
+* `__meta_consul_metadata_<key>`: each metadata key value of the target
 * `__meta_consul_node`: the node name defined for the target
 * `__meta_consul_service_address`: the service address of the target
 * `__meta_consul_service_id`: the service ID of the target
@@ -397,6 +398,9 @@ region: <string>
 # Named AWS profile used to connect to the API.
 [ profile: <string> ]
 
+# AWS Role ARN, an alternative to using AWS API keys.
+[ role_arn: <string> ]
+
 # Refresh interval to re-read the instance list.
 [ refresh_interval: <duration> | default = 60s ]
 
@@ -658,6 +662,22 @@ Available meta labels:
 * If the endpoints belong to a service, all labels of the `role: service` discovery are attached.
 * For all targets backed by a pod, all labels of the `role: pod` discovery are attached.
 
+#### `ingress`
+
+The `ingress` role discovers a target for each path of each ingress.
+This is generally useful for blackbox monitoring of an ingress.
+The address will be set to the host specified in the ingress spec.
+
+Available meta labels:
+
+* `__meta_kubernetes_namespace`: The namespace of the ingress object.
+* `__meta_kubernetes_ingress_name`: The name of the ingress object.
+* `__meta_kubernetes_ingress_label_<labelname>`: The label of the ingress object.
+* `__meta_kubernetes_ingress_annotation_<annotationname>`: The annotation of the ingress object.
+* `__meta_kubernetes_ingress_scheme`: Protocol scheme of ingress, `https` if TLS
+  config is set. Defaults to `http`.
+* `__meta_kubernetes_ingress_path`: Path from ingress spec. Defaults to `/`.
+
 
 See below for the configuration options for Kubernetes discovery:
 
@@ -723,6 +743,7 @@ The following meta labels are available on targets during [relabeling](#relabel_
 * `__meta_marathon_app_label_<labelname>`: any Marathon labels attached to the app
 * `__meta_marathon_port_definition_label_<labelname>`: the port definition labels
 * `__meta_marathon_port_mapping_label_<labelname>`: the port mapping labels
+* `__meta_marathon_port_index`: the port index number (e.g. `1` for `PORT1`)
 
 See below for the configuration options for Marathon discovery:
 

content/docs/querying/functions.md

@@ -249,6 +249,17 @@ or a function aggregating over time (any function ending in `_over_time`),
 always take a `irate()` first, then aggregate. Otherwise `irate()` cannot detect
 counter resets when your target restarts.
 
+## `label_join()`
+
+For each timeseries in `v`, `label_join(v instant-vector, dst_label string, separator string, src_label_1 string, src_label_2 string, ...)` joins all the values of all the `src_labels` 
+using `separator` and returns the timeseries with the label `dst_label` containing the joined value.
+There can be any number of `src_labels` in this function.
+
+This example will return a vector with each time series having a `foo` label with the value `a,b,c` added to it:
+```
+label_join(up{job="api-server",src1="a",src2="b",src3="c"}, "foo", ",", "src1", "src2", "src3")
+```
+
 ## `label_replace()`
 
 For each timeseries in `v`, `label_replace(v instant-vector, dst_label string, replacement string,

content/docs/visualization/consoles.md

@@ -160,6 +160,7 @@ Parameters to the graph library:
 | yTitle        | Optional. Title of the y-axis. Defaults to empty.
 | yAxisFormatter | Optional. Number formatter for the y-axis. Defaults to `PromConsole.NumberFormatter.humanize`.
 | yHoverFormatter | Optional. Number formatter for the hover detail. Defaults to `PromConsole.NumberFormatter.humanizeExact`.
+| colorScheme   | Optional. Color scheme to be used by the plots. Can be either a list of hex color codes or one of the [color scheme names](https://github.com/shutterstock/rickshaw/blob/master/src/js/Rickshaw.Fixtures.Color.js) supported by Rickshaw. Defaults to `'colorwheel'`.
 
 If both `expr` and `name` are lists, they must be of the same length. The name
 will be applied to the plots for the corresponding expression.