diff --git a/controllers/org_info_metric.go b/controllers/org_info_metric.go index dad7f3be..bc459c57 100644 --- a/controllers/org_info_metric.go +++ b/controllers/org_info_metric.go @@ -15,7 +15,7 @@ import ( var orgInfoMetricDesc = prometheus.NewDesc( "appuio_control_organization_info", "Information about APPUiO Cloud organizations", - []string{"organization", "billing_entity", "sales_order"}, + []string{"organization", "sales_order"}, nil, ) @@ -47,7 +47,6 @@ func (o *OrgInfoMetric) Collect(ch chan<- prometheus.Metric) { prometheus.GaugeValue, 1, org.Name, - org.Spec.BillingEntityRef, org.Status.SaleOrderName, ) } diff --git a/controllers/org_info_metric_test.go b/controllers/org_info_metric_test.go index 02789e58..21a2546b 100644 --- a/controllers/org_info_metric_test.go +++ b/controllers/org_info_metric_test.go @@ -43,9 +43,9 @@ func TestOrgInfoMetric(t *testing.T) { testutil.CollectAndCompare(&controllers.OrgInfoMetric{c}, strings.NewReader(` # HELP appuio_control_organization_info Information about APPUiO Cloud organizations # TYPE appuio_control_organization_info gauge -appuio_control_organization_info{billing_entity="be-1734",organization="blub-org",sales_order=""} 1 -appuio_control_organization_info{billing_entity="be-234",organization="foo-org",sales_order="SO9999"} 1 -appuio_control_organization_info{billing_entity="test-billing-entity",organization="test-org",sales_order=""} 1 +appuio_control_organization_info{organization="blub-org",sales_order=""} 1 +appuio_control_organization_info{organization="foo-org",sales_order="SO9999"} 1 +appuio_control_organization_info{organization="test-org",sales_order=""} 1 `), "appuio_control_organization_info"), )