From 06b37da2eb4baa5c42875486531dc0f9c339e847 Mon Sep 17 00:00:00 2001 From: Alex Theimer Date: Wed, 18 May 2022 22:46:35 -0700 Subject: [PATCH 1/3] change card metric_ prefix to tenant_ --- .../scala/filodb.coordinator/TenantIngestionMetering.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala index 4a1906303b..04f0917032 100644 --- a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala +++ b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala @@ -72,8 +72,8 @@ case class TenantIngestionMetering(settings: FilodbSettings, // publish a cardinality metric for each namespace val data = RowData.fromRowReader(rr) val prefix = data.group.toString.split(PREFIX_DELIM) - val tags = Map("metric_ws" -> prefix(0), - "metric_ns" -> prefix(1), + val tags = Map("tenant_ws" -> prefix(0), + "tenant_ns" -> prefix(1), "dataset" -> dsRef.dataset, "cluster_type" -> CLUSTER_TYPE) Kamon.gauge(METRIC_ACTIVE).withTags(TagSet.from(tags)).update(data.counts.active.toDouble) From 185a7845c8af60aef54b9e1fde643933ed72be97 Mon Sep 17 00:00:00 2001 From: Alex Theimer Date: Wed, 18 May 2022 22:49:38 -0700 Subject: [PATCH 2/3] add underscores --- .../main/scala/filodb.coordinator/TenantIngestionMetering.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala index 04f0917032..f32590c9d0 100644 --- a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala +++ b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala @@ -72,7 +72,7 @@ case class TenantIngestionMetering(settings: FilodbSettings, // publish a cardinality metric for each namespace val data = RowData.fromRowReader(rr) val prefix = data.group.toString.split(PREFIX_DELIM) - val tags = Map("tenant_ws" -> prefix(0), + val tags = Map("_tenant_ws_" -> prefix(0), "tenant_ns" -> prefix(1), "dataset" -> dsRef.dataset, "cluster_type" -> CLUSTER_TYPE) From 15b4760f4428bf69b2e74d88097b319326a0db4f Mon Sep 17 00:00:00 2001 From: Alex Theimer Date: Mon, 23 May 2022 10:55:35 -0700 Subject: [PATCH 3/3] fix labels --- .../scala/filodb.coordinator/TenantIngestionMetering.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala index f32590c9d0..adb04ae79a 100644 --- a/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala +++ b/coordinator/src/main/scala/filodb.coordinator/TenantIngestionMetering.scala @@ -73,7 +73,8 @@ case class TenantIngestionMetering(settings: FilodbSettings, val data = RowData.fromRowReader(rr) val prefix = data.group.toString.split(PREFIX_DELIM) val tags = Map("_tenant_ws_" -> prefix(0), - "tenant_ns" -> prefix(1), + "_tenant_ns_" -> prefix(1), + "_audience_" -> "tenants", "dataset" -> dsRef.dataset, "cluster_type" -> CLUSTER_TYPE) Kamon.gauge(METRIC_ACTIVE).withTags(TagSet.from(tags)).update(data.counts.active.toDouble)