From 63284eb247b520b03631b792fc6f38aacba8b4da Mon Sep 17 00:00:00 2001 From: Wenxuan Date: Mon, 14 Oct 2019 15:23:21 +0800 Subject: [PATCH] Fix overview metrics (#990) Signed-off-by: Breezewish --- roles/prometheus/files/tikv.rules.yml | 4 ++-- scripts/overview.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/prometheus/files/tikv.rules.yml b/roles/prometheus/files/tikv.rules.yml index 586e2deca..0a5ef6a30 100644 --- a/roles/prometheus/files/tikv.rules.yml +++ b/roles/prometheus/files/tikv.rules.yml @@ -110,12 +110,12 @@ groups: summary: TiKV coprocessor request wait seconds more than 10s - alert: TiKV_raftstore_thread_cpu_seconds_total - expr: sum(rate(tikv_thread_cpu_seconds_total{name=~"raftstore_.*"}[1m])) by (instance, name) > 1.6 + expr: sum(rate(tikv_thread_cpu_seconds_total{name=~"raftstore_.*"}[1m])) by (instance) > 1.6 for: 1m labels: env: ENV_LABELS_ENV level: critical - expr: sum(rate(tikv_thread_cpu_seconds_total{name=~"raftstore_.*"}[1m])) by (instance, name) > 1.6 + expr: sum(rate(tikv_thread_cpu_seconds_total{name=~"raftstore_.*"}[1m])) by (instance) > 1.6 annotations: description: 'cluster: ENV_LABELS_ENV, instance: {{ $labels.instance }}, values:{{ $value }}' value: '{{ $value }}' diff --git a/scripts/overview.json b/scripts/overview.json index ac13731da..8b7faad67 100644 --- a/scripts/overview.json +++ b/scripts/overview.json @@ -4313,7 +4313,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(tikv_thread_cpu_seconds_total{name=~\"raftstore_.*\"}[1m])) by (instance, name)", + "expr": "sum(rate(tikv_thread_cpu_seconds_total{name=~\"raftstore_.*\"}[1m])) by (instance)", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -5299,4 +5299,4 @@ "title": "Test-Cluster-Overview", "uid": "eDbRZpnWk", "version": 11 -} \ No newline at end of file +}