diff --git a/src/pkg/exporter/project_collector.go b/src/pkg/exporter/project_collector.go index 21fdfef930..eaf85e2881 100644 --- a/src/pkg/exporter/project_collector.go +++ b/src/pkg/exporter/project_collector.go @@ -41,7 +41,7 @@ var ( valueType: prometheus.GaugeValue, } projectUsage = typedDesc{ - desc: newDescWithLables("", "project_usage_byte", "The used resource of a project", "project_name"), + desc: newDescWithLables("", "project_quota_usage_byte", "The used resource of a project", "project_name"), valueType: prometheus.GaugeValue, } projectQuote = typedDesc{ diff --git a/tests/apitests/python/test_verify_metrics_enabled.py b/tests/apitests/python/test_verify_metrics_enabled.py index b5f1589285..b976cbf37b 100644 --- a/tests/apitests/python/test_verify_metrics_enabled.py +++ b/tests/apitests/python/test_verify_metrics_enabled.py @@ -9,14 +9,13 @@ import testutils class TestMetricsExist(unittest.TestCase): golang_basic_metrics = ["go_gc_duration_seconds", "go_goroutines", "go_info", "go_memstats_alloc_bytes"] - eigen_metrics = { + metrics = { 'core': golang_basic_metrics + ["harbor_core_http_request_total", "harbor_core_http_request_duration_seconds", "harbor_core_http_inflight_requests"], 'registry': golang_basic_metrics + ["registry_http_in_flight_requests"], 'exporter': golang_basic_metrics + ["artifact_pulled", "harbor_project_artifact_total", "harbor_project_member_total", "harbor_project_quota_byte", - "harbor_project_repo_total", "harbor_project_total" - ] + "harbor_project_repo_total", "harbor_project_total", "project_quota_usage_byte"] } def get_metrics(self): @@ -28,7 +27,7 @@ class TestMetricsExist(unittest.TestCase): def testMetricsExist(self): for k, metric_text in self.get_metrics(): - for metric_name in self.eigen_metrics[k]: + for metric_name in self.metrics[k]: print("Metric {} should exist in {} ".format(metric_name, k)) self.assertTrue(metric_name in metric_text)