diff --git a/api/prometheus/v1/api.go b/api/prometheus/v1/api.go index 44309df..b89c23e 100644 --- a/api/prometheus/v1/api.go +++ b/api/prometheus/v1/api.go @@ -380,12 +380,15 @@ type TargetsResult struct { // ActiveTarget models an active Prometheus scrape target. type ActiveTarget struct { - DiscoveredLabels map[string]string `json:"discoveredLabels"` - Labels model.LabelSet `json:"labels"` - ScrapeURL string `json:"scrapeUrl"` - LastError string `json:"lastError"` - LastScrape time.Time `json:"lastScrape"` - Health HealthStatus `json:"health"` + DiscoveredLabels map[string]string `json:"discoveredLabels"` + Labels model.LabelSet `json:"labels"` + ScrapePool string `json:"scrapePool"` + ScrapeURL string `json:"scrapeUrl"` + GlobalURL string `json:"globalUrl"` + LastError string `json:"lastError"` + LastScrape time.Time `json:"lastScrape"` + LastScrapeDuration float64 `json:"lastScrapeDuration"` + Health HealthStatus `json:"health"` } // DroppedTarget models a dropped Prometheus scrape target. diff --git a/api/prometheus/v1/api_test.go b/api/prometheus/v1/api_test.go index a1f0515..f69cf61 100644 --- a/api/prometheus/v1/api_test.go +++ b/api/prometheus/v1/api_test.go @@ -871,10 +871,13 @@ func TestAPIs(t *testing.T) { "instance": "127.0.0.1:9090", "job": "prometheus", }, - "scrapeUrl": "http://127.0.0.1:9090", - "lastError": "error while scraping target", - "lastScrape": testTime.UTC().Format(time.RFC3339Nano), - "health": "up", + "scrapePool": "prometheus", + "scrapeUrl": "http://127.0.0.1:9090", + "globalUrl": "http://127.0.0.1:9090", + "lastError": "error while scraping target", + "lastScrape": testTime.UTC().Format(time.RFC3339Nano), + "lastScrapeDuration": 0.001146115, + "health": "up", }, }, "droppedTargets": []map[string]interface{}{ @@ -901,10 +904,13 @@ func TestAPIs(t *testing.T) { "instance": "127.0.0.1:9090", "job": "prometheus", }, - ScrapeURL: "http://127.0.0.1:9090", - LastError: "error while scraping target", - LastScrape: testTime.UTC(), - Health: HealthGood, + ScrapePool: "prometheus", + ScrapeURL: "http://127.0.0.1:9090", + GlobalURL: "http://127.0.0.1:9090", + LastError: "error while scraping target", + LastScrape: testTime.UTC(), + LastScrapeDuration: 0.001146115, + Health: HealthGood, }, }, Dropped: []DroppedTarget{