Merge remote-tracking branch 'upstream/main'

YuryHrytsuk · Nov 21, 2023 · c596426 · c596426
2 parents 3cecfe8 + e7e47a5
commit c596426
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/services/monitoring/prometheus/prometheus.rules.yml b/services/monitoring/prometheus/prometheus.rules.yml
@@ -22,10 +22,15 @@ groups:
     rules:
       - record: osparc_node_cpu_seconds_total_nonidle_increase_over_nodes_12weeks
         expr: sum(increase(osparc_cpu_seconds_per_node[12w]))
+  - name: osparc_container_instances_s4lcore
+    interval: 60s
+    rules:
+      - record: osparc_container_instances_s4lcore
+        expr: count(container_memory_usage_bytes{image=~"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core.*$",container_label_simcore_user_agent!="puppeteer"}) OR clamp_max(absent(container_memory_usage_bytes{image=~"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core.*$",container_label_simcore_user_agent!="puppeteer"}),0)
   - name: osparc_container_instances_s4lcorelite
     interval: 60s
     rules:
-      - record: osparc_cpu_usage_per_node_percentage
+      - record: osparc_container_instances_s4lcorelite
         expr: count(container_memory_usage_bytes{image=~"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$",container_label_simcore_user_agent!="puppeteer"}) OR clamp_max(absent(container_memory_usage_bytes{image=~"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$",container_label_simcore_user_agent!="puppeteer"}),0)
   - name: osparc_autoscaling_machines_active
     interval: 60s