diff --git a/monitoring/grafana/dashboards/pholid-render-farm.json b/monitoring/grafana/dashboards/pholid-render-farm.json index e2977c8..2bad290 100644 --- a/monitoring/grafana/dashboards/pholid-render-farm.json +++ b/monitoring/grafana/dashboards/pholid-render-farm.json @@ -810,7 +810,7 @@ "targets": [ { "editorMode": "code", - "expr": "label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n sum by (name)(container_memory_working_set_bytes{name=~\"pholid.*\",image!=\"\"}), \r\n \"display_name\", \"Pholid GPU Exporter\", \"name\", \".*pholid-gpu-exporter.*\"\r\n ), \r\n \"display_name\", \"Pholid Backend\", \"name\", \".*pholid-backend.*\"\r\n ), \r\n \"display_name\", \"Grafana\", \"name\", \".*pholid-grafana.*\"\r\n ), \r\n \"display_name\", \"cAdvisor\", \"name\", \".*pholid-cadvisor.*\"\r\n ), \r\n \"display_name\", \"Flamenco Manager\", \"name\", \".*pholid-flamenco-manager.*\"\r\n ), \r\n \"display_name\", \"Flamenco Exporter\", \"name\", \".*pholid-flamenco-exporter.*\"\r\n ), \r\n \"display_name\", \"Prometheus\", \"name\", \".*pholid-prometheus.*\"\r\n)", + "expr": "label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n sum by (name)(container_memory_working_set_bytes{name=~\"pholid.*\",image!=\"\"}),\r\n \"display_name\", \"Pholid Worker 1\", \"name\", \".*pholid.*flamenco-worker-1([^0-9].*|$)\"\r\n ),\r\n \"display_name\", \"Pholid Worker 2\", \"name\", \".*pholid.*flamenco-worker-2([^0-9].*|$)\"\r\n ),\r\n \"display_name\", \"Pholid GPU Exporter\", \"name\", \".*pholid-gpu-exporter.*\"\r\n ),\r\n \"display_name\", \"Pholid Backend\", \"name\", \".*pholid-backend.*\"\r\n ),\r\n \"display_name\", \"Grafana\", \"name\", \".*pholid-grafana.*\"\r\n ),\r\n \"display_name\", \"cAdvisor\", \"name\", \".*pholid-cadvisor.*\"\r\n ),\r\n \"display_name\", \"Flamenco Manager\", \"name\", \".*pholid-flamenco-manager.*\"\r\n ),\r\n \"display_name\", \"Flamenco Exporter\", \"name\", \".*pholid-flamenco-exporter.*\"\r\n ),\r\n \"display_name\", \"Prometheus\", \"name\", \".*pholid-prometheus.*\"\r\n)", "legendFormat": "{{display_name}}", "range": true, "refId": "A" @@ -907,7 +907,7 @@ "targets": [ { "editorMode": "code", - "expr": "label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n sum by (name)(rate(container_cpu_usage_seconds_total{name=~\"pholid.*\",image!=\"\"}[5m])) * 100, \r\n \"display_name\", \"Pholid GPU Exporter\", \"name\", \".*pholid-gpu-exporter.*\"\r\n ), \r\n \"display_name\", \"Pholid Backend\", \"name\", \".*pholid-backend.*\"\r\n ), \r\n \"display_name\", \"Grafana\", \"name\", \".*pholid-grafana.*\"\r\n ), \r\n \"display_name\", \"cAdvisor\", \"name\", \".*pholid-cadvisor.*\"\r\n ), \r\n \"display_name\", \"Flamenco Manager\", \"name\", \".*pholid-flamenco-manager.*\"\r\n ), \r\n \"display_name\", \"Flamenco Exporter\", \"name\", \".*pholid-flamenco-exporter.*\"\r\n ), \r\n \"display_name\", \"Prometheus\", \"name\", \".*pholid-prometheus.*\"\r\n)", + "expr": "label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n label_replace(\r\n sum by (name)(rate(container_cpu_usage_seconds_total{name=~\"pholid.*\",image!=\"\"}[5m])) * 100,\r\n \"display_name\", \"Pholid Worker 1\", \"name\", \".*pholid.*flamenco-worker-1($|[^0-9].*)\"\r\n ),\r\n \"display_name\", \"Pholid Worker 2\", \"name\", \".*pholid.*flamenco-worker-2($|[^0-9].*)\"\r\n ),\r\n \"display_name\", \"Pholid GPU Exporter\", \"name\", \".*pholid-gpu-exporter.*\"\r\n ),\r\n \"display_name\", \"Pholid Backend\", \"name\", \".*pholid-backend.*\"\r\n ),\r\n \"display_name\", \"Grafana\", \"name\", \".*pholid-grafana.*\"\r\n ),\r\n \"display_name\", \"cAdvisor\", \"name\", \".*pholid-cadvisor.*\"\r\n ),\r\n \"display_name\", \"Flamenco Manager\", \"name\", \".*pholid-flamenco-manager.*\"\r\n ),\r\n \"display_name\", \"Flamenco Exporter\", \"name\", \".*pholid-flamenco-exporter.*\"\r\n ),\r\n \"display_name\", \"Prometheus\", \"name\", \".*pholid-prometheus.*\"\r\n)", "legendFormat": "{{display_name}}", "range": true, "refId": "A" @@ -2042,4 +2042,4 @@ "title": "Pholid Render Farm", "uid": "pholid-render-farm", "version": 2 -} \ No newline at end of file +}