Merge pull request #5597 from prometheus/beorn7/release

Promote rc.0 to final v2.10.0

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.10.0-rc.0 / 2019-05-22
+## 2.10.0 / 2019-05-25
 
 * [CHANGE/BUGFIX] API: Encode alert values as string to correctly represent Inf/NaN. #5582
 * [FEATURE] Template expansion: Make external labels available as `$externalLabels` in alert and console template expansion. #5463
@@ -18,6 +18,7 @@
 * [BUGFIX] PromQL: Correctly display `{__name__="a"}`. #5552
 * [BUGFIX] Discovery/kubernetes: Use `service` rather than `ingress` as the name for the service workqueue. #5520
 * [BUGFIX] Discovery/azure: Don't panic on a VM with a public IP. #5587
+* [BUGFIX] Discovery/triton: Always read HTTP body to completion. #5596
 * [BUGFIX] Web: Fixed Content-Type for js and css instead of using `/etc/mime.types`. #5551
 
 ## 2.9.2 / 2019-04-24

VERSION

@@ -1 +1 @@
-2.10.0-rc.0
+2.10.0

discovery/triton/triton.go

@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -157,7 +158,10 @@ func (d *Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error) {
 		return nil, errors.Wrap(err, "an error occurred when requesting targets from the discovery endpoint")
 	}
 
-	defer resp.Body.Close()
+	defer func() {
+		io.Copy(ioutil.Discard, resp.Body)
+		resp.Body.Close()
+	}()
 
 	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {

docs/configuration/template_examples.md

@@ -60,7 +60,7 @@ formatting of results, and linking to the [expression browser](https://prometheu
 
 ```go
 {{ with printf "node_memory_MemTotal{job='node',instance='%s'}" .Params.instance | query }}
-  {{ . | first | value | humanize1024}}B
+  {{ . | first | value | humanize1024 }}B
 {{ end }}
 ```
 
@@ -80,7 +80,7 @@ If accessed as `console.html?instance=hostname`, `.Params.instance` will evaluat
     <td>Transmitted</td>
     <td>{{ with printf "rate(node_network_transmit_bytes{job='node',instance='%s',device='%s'}[5m])" .Labels.instance .Labels.device | query }}{{ . | first | value | humanize }}B/s{{end}}</td>
   </tr>{{ end }}
-<table>
+</table>
 ```
 
 Here we iterate over all network devices and display the network traffic for each.