Skip to content

api: Serialize discovered and target labels into JSON directly #13469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bboreham merged 16 commits into from
Jan 29, 2024
Merged

api: Serialize discovered and target labels into JSON directly #13469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
73a42f2
Convert maps into labels.Labels in discovered and target labels
Leegin-darknight Jan 25, 2024
b4bd0d0
Convert maps into labels.Labels in discovered and target labels
Leegin-darknight Jan 25, 2024
cbb66e0
Convert maps into labels.Labels in discovered and target labels
Leegin-darknight Jan 26, 2024
9a75a40
Updated the test case
Leegin-darknight Jan 26, 2024
b5abe8e
Updated the test cases to test labels.Labels in dropped targets
Leegin-darknight Jan 26, 2024
39510a1
Updated the test cases to test labels.Labels in dropped targets
Leegin-darknight Jan 26, 2024
cad1a28
Updated the test cases to fix the linting issue
Leegin-darknight Jan 26, 2024
10a0434
Fixing the test case
Leegin-darknight Jan 26, 2024
cc171d3
Fixed the typo
Leegin-darknight Jan 26, 2024
90c8f91
Fixed the test case
Leegin-darknight Jan 26, 2024
27c61b8
Update api_test.go
Leegin-darknight Jan 26, 2024
e758dee
Update api_test.go
Leegin-darknight Jan 26, 2024
739bc08
Reverted the changes done in DroppedTarget
Leegin-darknight Jan 26, 2024
dc5d92f
Reverted the test case for dropped targets
Leegin-darknight Jan 26, 2024
6b522d7
Changed the values of the job label in the test case
Leegin-darknight Jan 26, 2024
9ab56b9
Fixed the labels in the test case for discovered labels in dropped ta…
Leegin-darknight Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions web/api/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,9 +879,9 @@ func (api *API) dropSeries(_ *http.Request) apiFuncResult {
// Target has the information for one target.
type Target struct {
// Labels before any processing.
DiscoveredLabels map[string]string `json:"discoveredLabels"`
DiscoveredLabels labels.Labels `json:"discoveredLabels"`
// Any labels that are added to this target and its metrics.
Labels map[string]string `json:"labels"`
Labels labels.Labels `json:"labels"`

ScrapePool string `json:"scrapePool"`
ScrapeURL string `json:"scrapeUrl"`
Expand Down Expand Up @@ -1024,8 +1024,8 @@ func (api *API) targets(r *http.Request) apiFuncResult {
globalURL, err := getGlobalURL(target.URL(), api.globalURLOptions)

res.ActiveTargets = append(res.ActiveTargets, &Target{
DiscoveredLabels: target.DiscoveredLabels().Map(),
Labels: target.Labels().Map(),
DiscoveredLabels: target.DiscoveredLabels(),
Labels: target.Labels(),
ScrapePool: key,
ScrapeURL: target.URL().String(),
GlobalURL: globalURL.String(),
Expand Down
36 changes: 12 additions & 24 deletions web/api/v1/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,10 +1411,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
response: &TargetDiscovery{
ActiveTargets: []*Target{
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "blackbox",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "blackbox"),
ScrapePool: "blackbox",
ScrapeURL: "http://localhost:9115/probe?target=example.com",
GlobalURL: "http://localhost:9115/probe?target=example.com",
Expand All @@ -1426,10 +1424,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
ScrapeTimeout: "10s",
},
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "test",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "test"),
ScrapePool: "test",
ScrapeURL: "http://example.com:8080/metrics",
GlobalURL: "http://example.com:8080/metrics",
Expand Down Expand Up @@ -1464,10 +1460,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
response: &TargetDiscovery{
ActiveTargets: []*Target{
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "blackbox",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "blackbox"),
ScrapePool: "blackbox",
ScrapeURL: "http://localhost:9115/probe?target=example.com",
GlobalURL: "http://localhost:9115/probe?target=example.com",
Expand All @@ -1479,10 +1473,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
ScrapeTimeout: "10s",
},
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "test",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "test"),
ScrapePool: "test",
ScrapeURL: "http://example.com:8080/metrics",
GlobalURL: "http://example.com:8080/metrics",
Expand Down Expand Up @@ -1517,10 +1509,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
response: &TargetDiscovery{
ActiveTargets: []*Target{
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "blackbox",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "blackbox"),
ScrapePool: "blackbox",
ScrapeURL: "http://localhost:9115/probe?target=example.com",
GlobalURL: "http://localhost:9115/probe?target=example.com",
Expand All @@ -1532,10 +1522,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
ScrapeTimeout: "10s",
},
{
DiscoveredLabels: map[string]string{},
Labels: map[string]string{
"job": "test",
},
DiscoveredLabels: labels.FromStrings(),
Labels: labels.FromStrings("job", "test"),
ScrapePool: "test",
ScrapeURL: "http://example.com:8080/metrics",
GlobalURL: "http://example.com:8080/metrics",
Expand Down