diff --git a/ansible/roles/core-mon/monitoring/files/dashboards/vm-cadvisor.json b/ansible/roles/core-mon/monitoring/files/dashboards/vm-cadvisor.json index ad62204..5e121fb 100644 --- a/ansible/roles/core-mon/monitoring/files/dashboards/vm-cadvisor.json +++ b/ansible/roles/core-mon/monitoring/files/dashboards/vm-cadvisor.json @@ -119,10 +119,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_cpu_usage_seconds_total{instance=~\"$host\",name=~\"$container\",name=~\".+\"}[5m])) by (name) *100", + "expr": "sum(rate(container_cpu_usage_seconds_total{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"}[5m])) by (container_label_com_docker_compose_service) *100", "hide": false, "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -233,10 +233,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(container_memory_rss{instance=~\"$host\",name=~\"$container\",name=~\".+\"}) by (name)", + "expr": "sum(container_memory_rss{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"}) by (container_label_com_docker_compose_service)", "hide": false, "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -333,10 +333,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(container_memory_cache{instance=~\"$host\",name=~\"$container\",name=~\".+\"}) by (name)", + "expr": "sum(container_memory_cache{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"}) by (container_label_com_docker_compose_service)", "hide": false, "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -450,10 +450,10 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_network_receive_bytes_total{instance=~\"$host\",name=~\"$container\",name=~\".+\"}[5m])) by (name)", + "expr": "sum(rate(container_network_receive_bytes_total{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"}[5m])) by (container_label_com_docker_compose_service)", "hide": false, "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -550,9 +550,9 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_network_transmit_bytes_total{instance=~\"$host\",name=~\"$container\",name=~\".+\"}[5m])) by (name)", + "expr": "sum(rate(container_network_transmit_bytes_total{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"}[5m])) by (container_label_com_docker_compose_service)", "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -692,11 +692,11 @@ "pluginVersion": "7.4.5", "targets": [ { - "expr": "(time() - container_start_time_seconds{instance=~\"$host\",name=~\"$container\",name=~\".+\"})/86400", + "expr": "(time() - container_start_time_seconds{instance=~\"$host\",container_label_com_docker_compose_service=~\"$container\",container_label_com_docker_compose_service=~\".+\"})/86400", "format": "table", "instant": true, "interval": "", - "legendFormat": "{{name}}", + "legendFormat": "{{container_label_com_docker_compose_service}}", "refId": "A" } ], @@ -779,7 +779,7 @@ "allValue": ".*", "current": {}, "datasource": "victoriametrics", - "definition": "label_values({__name__=~\"container.*\", instance=~\"$host\"},name)", + "definition": "label_values(container_cpu_usage_seconds_total{instance=~\"$host\",container_label_com_docker_compose_service=~\".+\"}, container_label_com_docker_compose_service)", "description": null, "error": null, "hide": 0, @@ -789,7 +789,7 @@ "name": "container", "options": [], "query": { - "query": "label_values({__name__=~\"container.*\", instance=~\"$host\"},name)", + "query": "label_values(container_cpu_usage_seconds_total{instance=~\"$host\",container_label_com_docker_compose_service=~\".+\"}, container_label_com_docker_compose_service)", "refId": "Prometheus-container-Variable-Query" }, "refresh": 1,