improve compute credits prom query (#703)

neuro-inc · Jul 30, 2024 · c82201a · c82201a
1 parent e60687d
commit c82201a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/platform_reports/metrics_service.py b/src/platform_reports/metrics_service.py
@@ -36,15 +36,8 @@ class PrometheusQueryFactory:
     def create_compute_credits(
         cls, *, org_name: str | None = None, project_name: str | None = None
     ) -> str:
-        label_matchers = []
-        if org_name:
-            label_matchers.append(f'label_platform_neuromation_io_org="{org_name}"')
-        if project_name:
-            label_matchers.append(
-                f'label_platform_neuromation_io_project="{project_name}"'
-            )
         query = [
-            "max by(pod) (kube_pod_credits_total) * on(pod) group_right",
+            "max by(pod) (kube_pod_credits_total) * on(pod) group_right() ",
         ]
         if org_name or project_name:
             jobs_label_matchers = cls._get_jobs_label_matchers(
@@ -54,11 +47,14 @@ def create_compute_credits(
                 org_name=org_name, project_name=project_name
             )
             query.append(
-                f"() (kube_pod_labels{{{jobs_label_matchers}}} or "
+                f"(kube_pod_labels{{{jobs_label_matchers}}} or "
                 f"kube_pod_labels{{{apps_label_matchers}}})"
             )
         else:
-            query.append(" kube_pod_labels")
+            query.append(
+                f'(kube_pod_labels{{{PrometheusLabel.NEURO_PROJECT_KEY}!=""}} or '
+                f'kube_pod_labels{{{PrometheusLabel.APOLO_PROJECT_KEY}!=""}})'
+            )
         return "".join(query)
 
     @classmethod

diff --git a/tests/unit/test_metrics_service.py b/tests/unit/test_metrics_service.py
@@ -15,8 +15,9 @@ def test_create_compute_credits(self) -> None:
         query = PrometheusQueryFactory().create_compute_credits()
 
         assert query == (
-            "max by(pod) (kube_pod_credits_total) * "
-            "on(pod) group_right kube_pod_labels"
+            "max by(pod) (kube_pod_credits_total) * on(pod) group_right() "
+            '(kube_pod_labels{label_platform_neuromation_io_project!=""} or '
+            'kube_pod_labels{label_platform_apolo_us_project!=""})'
         )
 
     def test_create_compute_credits__filter_by_org_project(self) -> None: