updating appcat services to use new query

appuio · May 9, 2023 · 4f51fe8 · 4f51fe8
1 parent 9c88303
commit 4f51fe8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/db/seeds.go b/pkg/db/seeds.go
@@ -85,22 +85,22 @@ var DefaultQueries = []Query{
 var renderedQueries = []RenderedQuery{
 	{
 		Query: Query{
-			Name:        "appcat_postgresql_vshn_standalone",
-			Description: "Number of VSHN managed standalone postgres instances",
+			Name:        "appcat_postgresql_managed_by_vshn",
+			Description: "Number of VSHN managed postgres instances",
 			Unit:        "Instances",
 		},
 		ProductName: "postgres",
-		ServiceName: "postgresql-standalone",
+		ServiceName: "appcat-postgresql",
 		Template:    appcatVSHNTemplate,
 	},
 	{
 		Query: Query{
 			Name:        "appcat_redis_vshn_standalone",
-			Description: "Number of VSHN managed standalone redis instances",
+			Description: "Number of VSHN managed redis instances",
 			Unit:        "Instances",
 		},
 		ProductName: "redis",
-		ServiceName: "redis-standalone",
+		ServiceName: "appcat-redis",
 		Template:    appcatVSHNTemplate,
 	},
 }

diff --git a/pkg/db/seeds/appcat_vshn.promql.tmpl b/pkg/db/seeds/appcat_vshn.promql.tmpl
@@ -16,8 +16,8 @@ sum_over_time(
               label_replace(
                 # Copy label appuio.io/organization to label tenant_id
                 label_replace(
-                  # Fetch all namespaces with label appcat.vshn.io/servicename="{{.ServiceName}}"
-                  kube_namespace_labels{label_appuio_io_organization=~".+", label_appcat_vshn_io_servicename="{{.ServiceName}}"},
+                  # Fetch all namespaces with label appcat.vshn.io/billing-name="{{.ServiceName}}"
+                  kube_namespace_labels{label_appuio_io_organization=~".+", label_appcat_vshn_io_billing_name="{{.ServiceName}}"},
                   "tenant_id",
                   "$1",
                   "label_appuio_io_organization",