mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #5597 from prometheus/beorn7/release

Browse source 
Promote rc.0 to final v2.10.0
This commit is contained in:
Björn Rabenstein 2019-05-25 14:23:59 +02:00 committed by GitHub
parent 2de8ba4708 2a5b7f9156
commit d20e84d0fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -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 * [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 * [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] PromQL: Correctly display `{__name__="a"}`. #5552
* [BUGFIX] Discovery/kubernetes: Use `service` rather than `ingress` as the name for the service workqueue. #5520 * [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/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 * [BUGFIX] Web: Fixed Content-Type for js and css instead of using `/etc/mime.types`. #5551
## 2.9.2 / 2019-04-24 ## 2.9.2 / 2019-04-24

2
VERSION
View file

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

6
discovery/triton/triton.go
View file

@ -17,6 +17,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "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") 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) data, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {

2
docs/configuration/template_examples.md
View file

@ -80,7 +80,7 @@ If accessed as `console.html?instance=hostname`, `.Params.instance` will evaluat
<td>Transmitted</td> <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> <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 }} </tr>{{ end }}
<table> </table>
``` ```
Here we iterate over all network devices and display the network traffic for each. Here we iterate over all network devices and display the network traffic for each.