From 215754ee114b66bf212dbe05138124e243d0898a Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 19 Aug 2024 12:33:16 +0530 Subject: [PATCH] cli: update cluster tag in tsdump upload Previously, we are uploading tsdump data to datadog with cluster name with tag "cluster". However, it would coincide with metrics emitted with "cluster" as tag. This was resulting in a large drop down list to filter out cluster in datadog dashboard. This change updates tag from "cluster" to "cluster_label" with tsdump datadog upload. This would result in smaller cluster list in datadog dashboard. Epic: None Release note: None --- pkg/cli/testdata/tsdump/json | 2 +- pkg/cli/tsdump.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cli/testdata/tsdump/json b/pkg/cli/testdata/tsdump/json index 15a14a80c4f9..e7a6ee14264d 100644 --- a/pkg/cli/testdata/tsdump/json +++ b/pkg/cli/testdata/tsdump/json @@ -31,4 +31,4 @@ cr.node.admission.admitted.elastic.cpu 2 1.000000 1711130560 ---- POST: https://example.com/data DD-API-KEY: api-key -Body: {"series":[{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","type":0,"points":[{"timestamp":17111304,"value":0},{"timestamp":17111304,"value":1},{"timestamp":17111304,"value":1},{"timestamp":17111305,"value":1}],"resources":null,"tags":["cluster_type:SELF_HOSTED","job:cockroachdb","region:local","cluster:test-cluster","upload_id:test-cluster-1234","node_id:1"]},{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","type":0,"points":[{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1}],"resources":null,"tags":["cluster_type:SELF_HOSTED","job:cockroachdb","region:local","cluster:test-cluster","upload_id:test-cluster-1234","node_id:2"]}]} +Body: {"series":[{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","type":0,"points":[{"timestamp":17111304,"value":0},{"timestamp":17111304,"value":1},{"timestamp":17111304,"value":1},{"timestamp":17111305,"value":1}],"resources":null,"tags":["cluster_type:SELF_HOSTED","job:cockroachdb","region:local","cluster_label:test-cluster","upload_id:test-cluster-1234","node_id:1"]},{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","type":0,"points":[{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1},{"timestamp":17111305,"value":1}],"resources":null,"tags":["cluster_type:SELF_HOSTED","job:cockroachdb","region:local","cluster_label:test-cluster","upload_id:test-cluster-1234","node_id:2"]}]} diff --git a/pkg/cli/tsdump.go b/pkg/cli/tsdump.go index e623f06c3f20..112009308237 100644 --- a/pkg/cli/tsdump.go +++ b/pkg/cli/tsdump.go @@ -449,7 +449,7 @@ func (d *datadogWriter) Emit(data *tspb.TimeSeriesData) error { tags = append(tags, "region:local") if debugTimeSeriesDumpOpts.clusterLabel != "" { - tags = append(tags, makeDDTag("cluster", debugTimeSeriesDumpOpts.clusterLabel)) + tags = append(tags, makeDDTag("cluster_label", debugTimeSeriesDumpOpts.clusterLabel)) } tags = append(tags, makeDDTag(uploadIDTag, d.uploadID))