mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Use a map to describe discovered labels, as they are not validated by the server (#529) 

Signed-off-by: Oleksandr Kushchenko <okushchenko@palantir.com>
This commit is contained in:
Oleksandr Kushchenko 2019-01-23 15:39:45 +00:00 committed by Krasi Georgiev
parent 26e258bb9c
commit d5f63107bf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/prometheus/v1/api.go
View File

@ -231,17 +231,17 @@ type TargetsResult struct {
// ActiveTarget models an active Prometheus scrape target. // ActiveTarget models an active Prometheus scrape target.
type ActiveTarget struct { type ActiveTarget struct {
DiscoveredLabels model.LabelSet `json:"discoveredLabels"` DiscoveredLabels map[string]string `json:"discoveredLabels"`
Labels model.LabelSet `json:"labels"` Labels model.LabelSet `json:"labels"`
ScrapeURL string `json:"scrapeUrl"` ScrapeURL string `json:"scrapeUrl"`
LastError string `json:"lastError"` LastError string `json:"lastError"`
LastScrape time.Time `json:"lastScrape"` LastScrape time.Time `json:"lastScrape"`
Health HealthStatus `json:"health"` Health HealthStatus `json:"health"`
} }
// DroppedTarget models a dropped Prometheus scrape target. // DroppedTarget models a dropped Prometheus scrape target.
type DroppedTarget struct { type DroppedTarget struct {
DiscoveredLabels model.LabelSet `json:"discoveredLabels"` DiscoveredLabels map[string]string `json:"discoveredLabels"`
} }
// queryResult contains result data for a query. // queryResult contains result data for a query.

4
api/prometheus/v1/api_test.go
View File

@ -605,7 +605,7 @@ func TestAPIs(t *testing.T) {
res: TargetsResult{ res: TargetsResult{
Active: []ActiveTarget{ Active: []ActiveTarget{
{ {
DiscoveredLabels: model.LabelSet{ DiscoveredLabels: map[string]string{
"__address__": "127.0.0.1:9090", "__address__": "127.0.0.1:9090",
"__metrics_path__": "/metrics", "__metrics_path__": "/metrics",
"__scheme__": "http", "__scheme__": "http",
@ -623,7 +623,7 @@ func TestAPIs(t *testing.T) {
}, },
Dropped: []DroppedTarget{ Dropped: []DroppedTarget{
{ {
DiscoveredLabels: model.LabelSet{ DiscoveredLabels: map[string]string{
"__address__": "127.0.0.1:9100", "__address__": "127.0.0.1:9100",
"__metrics_path__": "/metrics", "__metrics_path__": "/metrics",
"__scheme__": "http", "__scheme__": "http",