diff --git a/ansible/roles/core-mon/monitoring/files/dashboards/vm-remnawave-dashboard.json b/ansible/roles/core-mon/monitoring/files/dashboards/vm-remnawave-dashboard.json index ea000aa..dfc917d 100644 --- a/ansible/roles/core-mon/monitoring/files/dashboards/vm-remnawave-dashboard.json +++ b/ansible/roles/core-mon/monitoring/files/dashboards/vm-remnawave-dashboard.json @@ -370,11 +370,11 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "avg(remnawave_nodejs_cpu_usage_percent)", + "expr": "avg(100 * remnawave_node_cpu_load_avg_1m / remnawave_node_cpu_count)", "refId": "A" } ], - "title": "💻 CPU загрузка", + "title": "💻 CPU ноды", "type": "stat" }, { @@ -441,7 +441,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "avg(remnawave_nodejs_heap_usage_percent)", + "expr": "avg(100 * remnawave_process_heap_used_bytes / remnawave_process_heap_total_bytes)", "refId": "A" } ], @@ -468,15 +468,15 @@ }, { "color": "#EAB839", - "value": 500 + "value": 10 }, { "color": "red", - "value": 1000 + "value": 50 } ] }, - "unit": "reqpm" + "unit": "ms" }, "overrides": [] }, @@ -512,11 +512,11 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "avg(remnawave_nodejs_http_req_rate)", + "expr": "avg(remnawave_process_event_loop_delay_ms)", "refId": "A" } ], - "title": "📊 Запросов/мин", + "title": "⏱️ Event loop", "type": "stat" }, { @@ -1879,21 +1879,12 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_cpu_usage_percent{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - CPU", + "expr": "100 * remnawave_process_heap_used_bytes{instance_name=~\"$instance\"} / remnawave_process_heap_total_bytes{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - Heap %", "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "remnawave_nodejs_heap_usage_percent{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Heap", - "refId": "B" } ], - "title": "💻 CPU и Heap использование", + "title": "💻 Heap процессов", "type": "timeseries" }, { @@ -2048,8 +2039,8 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_http_req_latency_p95{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - HTTP p95", + "expr": "remnawave_process_event_loop_p99_ms{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - Event Loop p99", "refId": "A" }, { @@ -2057,30 +2048,12 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_http_req_latency_p50{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - HTTP p50", + "expr": "remnawave_process_event_loop_delay_ms{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - Event Loop delay", "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "remnawave_nodejs_event_loop_latency_p95{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Event Loop p95", - "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "remnawave_nodejs_event_loop_latency_p50{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Event Loop p50", - "refId": "D" } ], - "title": "⏱️ Latency метрики", + "title": "⏱️ Event loop", "type": "timeseries" }, { @@ -2216,7 +2189,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_heap_used_bytes{instance_name=~\"$instance\"}", + "expr": "remnawave_process_heap_used_bytes{instance_name=~\"$instance\"}", "legendFormat": "{{instance_name}} - Used Heap", "refId": "A" }, @@ -2225,7 +2198,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_heap_total_bytes{instance_name=~\"$instance\"}", + "expr": "remnawave_process_heap_total_bytes{instance_name=~\"$instance\"}", "legendFormat": "{{instance_name}} - Total Heap", "refId": "B" }, @@ -2234,9 +2207,27 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_memory_usage_bytes{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Memory", + "expr": "remnawave_process_rss_bytes{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - RSS", "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "expr": "remnawave_process_external_bytes{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - External", + "refId": "D" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "expr": "remnawave_process_array_buffers_bytes{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - ArrayBuffers", + "refId": "E" } ], "title": "🧠 Использование памяти", @@ -2391,30 +2382,12 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "remnawave_nodejs_http_req_rate{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Requests/min", + "expr": "remnawave_process_active_handles{instance_name=~\"$instance\"}", + "legendFormat": "{{instance_name}} - Handles", "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "remnawave_nodejs_active_handlers{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Handlers", - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "remnawave_nodejs_active_requests{instance_name=~\"$instance\"}", - "legendFormat": "{{instance_name}} - Requests", - "refId": "C" } ], - "title": "📊 Активность приложения", + "title": "📊 Хэндлы процессов", "type": "timeseries" } ], @@ -2448,7 +2421,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(remnawave_nodejs_cpu_usage_percent, instance_name)", + "definition": "label_values(remnawave_process_heap_used_bytes, instance_name)", "includeAll": true, "label": "Node.js Instance", "multi": true, @@ -2456,7 +2429,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(remnawave_nodejs_cpu_usage_percent, instance_name)", + "query": "label_values(remnawave_process_heap_used_bytes, instance_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1,