Skip to content

Commit f157eba

Browse files
aa-joshiaa-joshi
committed
cli(tsdump): update metric prefix for Datadog upload
Previously, we were uploading historical metrics to Datadog with `crdb.tsdump` prefix. This was inadequate because we have to maintain multiple upload flows with different prefix as well as dashboard associated with each flow. We want to unify metrics visualisation across all CRDB offerings. Datadog recently supported historical metrics ingestion with `cockroachdb` prefix. This patch updates the metrics prefix to `cockroachdb` for Datadog upload of tsdump with historical metrics. Epic: None Part of: CRDB-53585 Release note: None
1 parent 1f85128 commit f157eba

File tree

8 files changed

+43
-44
lines changed

8 files changed

+43
-44
lines changed

‎pkg/cli/testdata/tsdump/json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,52 +46,52 @@ cr.store.storage.wal.failover.write_and_sync.latency-sum 1 1.000000 1711130710
4646
----
4747
POST: /api/v2/series
4848
DD-API-KEY: api-key
49-
Body: {"series":[{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","points":[{"timestamp":1731542400,"value":0}],"tags":["node_id:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0}]}
49+
Body: {"series":[{"metric":"cockroachdb.admission.admitted.elastic.cpu","points":[{"timestamp":1731542400,"value":0}],"tags":["node_id:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0}]}
5050
POST: /api/v2/series
5151
DD-API-KEY: api-key
52-
Body: {"series":[{"metric":"crdb.tsdump.admission.admitted.elastic.cpu","points":[{"timestamp":1731542400,"value":0}],"tags":["node_id:2","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0}]}
52+
Body: {"series":[{"metric":"cockroachdb.admission.admitted.elastic.cpu","points":[{"timestamp":1731542400,"value":0}],"tags":["node_id:2","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":0}]}
5353
POST: /api/v2/series
5454
DD-API-KEY: api-key
55-
Body: {"series":[{"metric":"crdb.tsdump.storage.sstable.remote.bytes","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
55+
Body: {"series":[{"metric":"cockroachdb.storage.sstable.remote.bytes","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
5656
POST: /api/v2/series
5757
DD-API-KEY: api-key
58-
Body: {"series":[{"metric":"crdb.tsdump.storage.sstable.remote.count","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
58+
Body: {"series":[{"metric":"cockroachdb.storage.sstable.remote.count","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
5959
POST: /api/v2/series
6060
DD-API-KEY: api-key
61-
Body: {"series":[{"metric":"crdb.tsdump.storage.sstable.zombie.bytes","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
61+
Body: {"series":[{"metric":"cockroachdb.storage.sstable.zombie.bytes","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
6262
POST: /api/v2/series
6363
DD-API-KEY: api-key
64-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.bytes_in","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":1}]}
64+
Body: {"series":[{"metric":"cockroachdb.storage.wal.bytes_in","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":1}]}
6565
POST: /api/v2/series
6666
DD-API-KEY: api-key
67-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-avg","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
67+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-avg","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
6868
POST: /api/v2/series
6969
DD-API-KEY: api-key
70-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-count","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":1}]}
70+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-count","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":1}]}
7171
POST: /api/v2/series
7272
DD-API-KEY: api-key
73-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-max","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
73+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-max","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
7474
POST: /api/v2/series
7575
DD-API-KEY: api-key
76-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p50","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
76+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p50","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
7777
POST: /api/v2/series
7878
DD-API-KEY: api-key
79-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p75","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
79+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p75","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
8080
POST: /api/v2/series
8181
DD-API-KEY: api-key
82-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p90","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
82+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p90","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
8383
POST: /api/v2/series
8484
DD-API-KEY: api-key
85-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p99","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
85+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p99","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
8686
POST: /api/v2/series
8787
DD-API-KEY: api-key
88-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p99.9","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
88+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p99.9","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
8989
POST: /api/v2/series
9090
DD-API-KEY: api-key
91-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p99.99","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
91+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p99.99","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
9292
POST: /api/v2/series
9393
DD-API-KEY: api-key
94-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-p99.999","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
94+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-p99.999","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
9595
POST: /api/v2/series
9696
DD-API-KEY: api-key
97-
Body: {"series":[{"metric":"crdb.tsdump.storage.wal.failover.write_and_sync.latency-sum","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}
97+
Body: {"series":[{"metric":"cockroachdb.storage.wal.failover.write_and_sync.latency-sum","points":[{"timestamp":1731542400,"value":0}],"tags":["store:1","cluster_type:SELF_HOSTED","cluster_label:test-cluster","cluster_id:test-cluster-id","zendesk_ticket:zd-test","org_name:test-org","user_name:test-user","upload_id:test-cluster-20241114000000","upload_timestamp:2024-11-14 00:00:00","upload_year:2024","upload_month:11","upload_day:14"],"type":3}]}

0 commit comments

Comments
 (0)