diff --git a/dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json b/dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json index a7c0d6006cf..d05a6730bc0 100644 --- a/dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json +++ b/dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json @@ -3059,7 +3059,7 @@ "steppedLine": false, "targets": [ { - "expr": "dm_syncer_binlog_file{source_id=~\"$source\", task=~\"$task\", node=\"master\"} - ON( task,source_id) dm_syncer_binlog_file{source_id=~\"$source\", task=~\"$task\", node=\"syncer\"}", + "expr": "dm_syncer_binlog_file{source_id=~\"$source\", task=~\"$task\", node=\"master\"} - ON(task,source_id) dm_syncer_binlog_file{source_id=~\"$source\", task=~\"$task\", node=\"syncer\"}", "format": "time_series", "hide": false, "interval": "$interval", @@ -3716,12 +3716,12 @@ "steppedLine": false, "targets": [ { - "expr": "dm_relay_binlog_file{instance=~\"$instance\", node=\"relay\"} - ON(instance, task) dm_syncer_binlog_file{instance=~\"$instance\", task=~\"$task\", node=\"syncer\"}", + "expr": "dm_relay_binlog_file{instance=~\"$instance\", node=\"relay\"} - ON(instance) group_right dm_syncer_binlog_file{instance=~\"$instance\", task=~\"$task\", node=\"syncer\"}", "format": "time_series", "hide": false, "interval": "$interval", "intervalFactor": 2, - "legendFormat": "{{task}} - {{instance}}", + "legendFormat": "{{instance}} - {{task}}", "refId": "B" } ], @@ -5088,7 +5088,7 @@ "steppedLine": false, "targets": [ { - "expr": "dm_relay_binlog_file{instance=~\"$instance\", node=\"master\"} - ON(instance, job) dm_relay_binlog_file{instance=~\"$instance\", node=\"relay\"}", + "expr": "dm_relay_binlog_file{instance=~\"$instance\", node=\"master\"} - ON(instance) dm_relay_binlog_file{instance=~\"$instance\", node=\"relay\"}", "format": "time_series", "hide": false, "interval": "$interval", diff --git a/dm/dm/dm-ansible/scripts/DM-Monitor-Standard.json b/dm/dm/dm-ansible/scripts/DM-Monitor-Standard.json index 7b8bf19e037..e29a8005e40 100644 --- a/dm/dm/dm-ansible/scripts/DM-Monitor-Standard.json +++ b/dm/dm/dm-ansible/scripts/DM-Monitor-Standard.json @@ -450,7 +450,7 @@ "targets": [ { "exemplar": true, - "expr": "histogram_quantile(0.90, sum(rate(dm_syncer_replication_lag_bucket{instance=~\"$instance\",task=~\"$task\"}[$interval])) by (le,instance,task))", + "expr": "histogram_quantile(0.90, sum(rate(dm_syncer_replication_lag_bucket{source_id=~\"$source\",task=~\"$task\"}[$interval])) by (le,task,source_id))", "hide": false, "interval": "", "legendFormat": "{{task}} - {{source_id}} - 90", @@ -458,7 +458,7 @@ }, { "exemplar": true, - "expr": "histogram_quantile(0.95,\nsum(rate(dm_syncer_replication_lag_bucket{instance=~\"$instance\",task=~\"$task\"}[$interval])) by (le,instance,task))", + "expr": "histogram_quantile(0.95,\nsum(rate(dm_syncer_replication_lag_bucket{source_id=~\"$source\",task=~\"$task\"}[$interval])) by (le,task,source_id))", "hide": false, "interval": "", "legendFormat": "{{task}} - {{source_id}} - 95", @@ -466,7 +466,7 @@ }, { "exemplar": true, - "expr": "histogram_quantile(0.99,\nsum(rate(dm_syncer_replication_lag_bucket{instance=~\"$instance\",task=~\"$task\"}[$interval])) by (le,instance,task))", + "expr": "histogram_quantile(0.99,\nsum(rate(dm_syncer_replication_lag_bucket{source_id=~\"$source\",task=~\"$task\"}[$interval])) by (le,task,source_id))", "hide": false, "interval": "", "legendFormat": "{{task}} - {{source_id}} - 99",