refactor(server): use prometheus record rules to enhance billing perf…

…ormance (#1671)
labring · Nov 10, 2023 · 619988e · 619988e
1 parent 67b3cd6
commit 619988e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/build/charts/laf-server/templates/rumtime-exporter.yaml b/build/charts/laf-server/templates/rumtime-exporter.yaml
@@ -60,7 +60,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    namespace: {{ .Release.Namespace }}
+    {{- include "runtime-exporter.labels" . | nindent 4 }}
     release: prometheus
   name: runtime-exporter
 spec:
@@ -75,3 +75,20 @@ spec:
   selector:
     matchLabels:
       {{- include "runtime-exporter.labels" . | nindent 6 }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    {{- include "runtime-exporter.labels" . | nindent 4 }}
+    release: prometheus
+  name: prometheus-laf-billing.rules
+spec:
+  groups:
+    - name: prometheus-laf-billing.rules
+      interval: 60s
+      rules:
+        - record: laf:billing:cpu
+          expr: max_over_time(sum by (appid) (laf_runtime_cpu_limit{container!=""})[1h:])
+        - record: laf:billing:memory
+          expr: max_over_time(sum by (appid) (laf_runtime_memory_limit{container!=""})[1h:])
diff --git a/server/src/billing/billing.service.ts b/server/src/billing/billing.service.ts
@@ -228,18 +228,12 @@ export class BillingService {
     })
 
     const cpuTask = prom
-      .instantQuery(
-        `sum(max_over_time(laf_runtime_cpu_limit{container!="",appid="${app.appid}"}[1h])) by (appid)`,
-        time,
-      )
+      .instantQuery(`laf:billing:cpu{appid=${app.appid}}`, time)
       .then((res) => res.result[0])
       .then((res) => Number(res.value.value))
 
     const memoryTask = prom
-      .instantQuery(
-        `sum(max_over_time(laf_runtime_memory_limit{container!="",appid="${app.appid}"}[1h])) by (appid)`,
-        time,
-      )
+      .instantQuery(`laf:billing:memory{appid=${app.appid}`, time)
       .then((res) => res.result[0])
       .then((res) => Number(res.value.value))