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 4 Packages Projects Releases Wiki Activity

Merge pull request #16084 from prometheus/targets-api-cleanup

Browse source 
Targets API: Remove superfluous if() and make variable names more intuitive
This commit is contained in:
Julius Volz 2025-02-27 15:08:30 +01:00 committed by GitHub
parent 5efaa84be1 911e305bc9
commit 29d8372a04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
web/api/v1/api.go
View file

@ -1105,15 +1105,15 @@ func (api *API) scrapePools(r *http.Request) apiFuncResult {
} }
func (api *API) targets(r *http.Request) apiFuncResult { func (api *API) targets(r *http.Request) apiFuncResult {
sortKeys := func(targets map[string][]*scrape.Target) ([]string, int) { getSortedPools := func(targets map[string][]*scrape.Target) ([]string, int) {
var n int var n int
keys := make([]string, 0, len(targets)) pools := make([]string, 0, len(targets))
for k := range targets { for p, t := range targets {
keys = append(keys, k) pools = append(pools, p)
n += len(targets[k]) n += len(t)
} }
slices.Sort(keys) slices.Sort(pools)
return keys, n return pools, n
} }
scrapePool := r.URL.Query().Get("scrapePool") scrapePool := r.URL.Query().Get("scrapePool")
@ -1125,14 +1125,14 @@ func (api *API) targets(r *http.Request) apiFuncResult {
if showActive { if showActive {
targetsActive := api.targetRetriever(r.Context()).TargetsActive() targetsActive := api.targetRetriever(r.Context()).TargetsActive()
activeKeys, numTargets := sortKeys(targetsActive) activePools, numTargets := getSortedPools(targetsActive)
res.ActiveTargets = make([]*Target, 0, numTargets) res.ActiveTargets = make([]*Target, 0, numTargets)
for _, key := range activeKeys { for _, pool := range activePools {
if scrapePool != "" && key != scrapePool { if scrapePool != "" && pool != scrapePool {
continue continue
} }
for _, target := range targetsActive[key] { for _, target := range targetsActive[pool] {
lastErrStr := "" lastErrStr := ""
lastErr := target.LastError() lastErr := target.LastError()
if lastErr != nil { if lastErr != nil {
@ -1144,7 +1144,7 @@ func (api *API) targets(r *http.Request) apiFuncResult {
res.ActiveTargets = append(res.ActiveTargets, &Target{ res.ActiveTargets = append(res.ActiveTargets, &Target{
DiscoveredLabels: target.DiscoveredLabels(builder), DiscoveredLabels: target.DiscoveredLabels(builder),
Labels: target.Labels(builder), Labels: target.Labels(builder),
ScrapePool: key, ScrapePool: pool,
ScrapeURL: target.URL().String(), ScrapeURL: target.URL().String(),
GlobalURL: globalURL.String(), GlobalURL: globalURL.String(),
LastError: func() string { LastError: func() string {
@ -1170,16 +1170,15 @@ func (api *API) targets(r *http.Request) apiFuncResult {
} }
if showDropped { if showDropped {
res.DroppedTargetCounts = api.targetRetriever(r.Context()).TargetsDroppedCounts() res.DroppedTargetCounts = api.targetRetriever(r.Context()).TargetsDroppedCounts()
}
if showDropped {
targetsDropped := api.targetRetriever(r.Context()).TargetsDropped() targetsDropped := api.targetRetriever(r.Context()).TargetsDropped()
droppedKeys, numTargets := sortKeys(targetsDropped) droppedPools, numTargets := getSortedPools(targetsDropped)
res.DroppedTargets = make([]*DroppedTarget, 0, numTargets) res.DroppedTargets = make([]*DroppedTarget, 0, numTargets)
for _, key := range droppedKeys { for _, pool := range droppedPools {
if scrapePool != "" && key != scrapePool { if scrapePool != "" && pool != scrapePool {
continue continue
} }
for _, target := range targetsDropped[key] { for _, target := range targetsDropped[pool] {
res.DroppedTargets = append(res.DroppedTargets, &DroppedTarget{ res.DroppedTargets = append(res.DroppedTargets, &DroppedTarget{
DiscoveredLabels: target.DiscoveredLabels(builder), DiscoveredLabels: target.DiscoveredLabels(builder),
}) })