grafana(dm): fix grafana expr #4405

Ehco1996 · 2022-01-19T07:16:52Z

What problem does this PR solve?

Issue Number: close #4404

What is changed and how it works?

use right expr

fix standard's lag lable not show
fix binlog file gap between master and syncer
fix binlog file gap between relay and syncer
fix binlog file gap between master and relay

Check List

Tests

Manual test (add detailed scripts or steps below)
No code

Code changes

Side effects

Related changes

Need to cherry-pick to the release branch

Release note

`None`.

ti-chi-bot · 2022-01-19T07:16:53Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

glorv
lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

glorv · 2022-01-19T07:33:49Z

dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json

          "format": "time_series",
          "hide": false,
          "interval": "$interval",
          "intervalFactor": 2,
-          "legendFormat": "{{task}} - {{instance}}",


I think we should remain {{task}} - {{instance}} as each task will produce a different value

this metric: dm_relay_binlog_file don't have label task so this legend looks like this - 127.0.0.1:8621

dm_relay_binlog_file{instance="127.0.0.1:8262", job="dm-worker-1", node="master"} | 1 -- | -- dm_relay_binlog_file{instance="127.0.0.1:8262", job="dm-worker-1", node="relay"}

ping @glorv ptal

maybe you can use group_right

dm_relay_binlog_file{instance="172.16.5.177:8101", node="relay"} - ON(instance) group_right dm_syncer_binlog_file{instance="172.16.5.177:8101", node="syncer"}

please find a good solution from https://prometheus.io/docs/prometheus/latest/querying/operators/#many-to-one-and-one-to-many-vector-matches

due to only syncer_binlog_fie have many to on relationship with relay_binlog_file, only one dashboard need to be adjusted. added in 28f5994 and fa5c966, preview link is here

codecov-commenter · 2022-01-19T07:43:16Z

Codecov Report

Merging #4405 (6509f70) into master (e469fb3) will decrease coverage by 0.0465%.
The diff coverage is 54.6268%.

Flag	Coverage Δ
cdc	`60.1004% <61.4349%> (-0.0871%)`	⬇️
dm	`52.0950% <41.0714%> (-0.0085%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #4405        +/-   ##
================================================
- Coverage   55.8077%   55.7611%   -0.0466%     
================================================
  Files           495        495                
  Lines         61246      61333        +87     
================================================
+ Hits          34180      34200        +20     
- Misses        23614      23714       +100     
+ Partials       3452       3419        -33

Ehco1996 · 2022-01-24T01:24:23Z

could you please take another look for this pr ? thanks 🧡🧡🧡

/cc @lance6716 @glorv

lance6716 · 2022-01-24T02:23:30Z

dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json

          "format": "time_series",
          "hide": false,
          "interval": "$interval",
          "intervalFactor": 2,
-          "legendFormat": "{{task}} - {{instance}}",
+          "legendFormat": "{{{instance}}",


Suggested change

"legendFormat": "{{{instance}}",

"legendFormat": "{{instance}}",

could you provide an environment to let me verify the layout?

thanks! my bad , add preview link in about review comments now

Ehco1996 · 2022-01-24T02:51:17Z

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\"}",


preview link

Ehco1996 · 2022-01-24T03:08:42Z

dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json

@@ -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) dm_syncer_binlog_file{instance=~\"$instance\", task=~\"$task\", node=\"syncer\"}",


preview link

Ehco1996 · 2022-01-24T03:10:09Z

dm/dm/dm-ansible/scripts/DM-Monitor-Professional.json

@@ -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\"}",


preview link

Ehco1996 · 2022-01-24T03:11:06Z

dm/dm/dm-ansible/scripts/DM-Monitor-Standard.json

@@ -450,23 +450,23 @@
      "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))",


preview link

glorv · 2022-01-24T06:32:23Z

/merge

ti-chi-bot · 2022-01-24T06:32:25Z

This pull request has been accepted and is ready to merge.

Commit hash: fa5c966

Ehco1996 · 2022-01-24T07:50:00Z

/run-all-tests

lance6716 · 2022-01-24T11:09:11Z

/run-integration-tests /tidb=pr/30558
/run-kafka-integration-test /tidb=pr/30558

ti-chi-bot · 2022-01-24T15:42:23Z

@Ehco1996: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Ehco1996 · 2022-01-25T01:06:21Z

/run-integration-tests /tidb=pr/30558
/run-kafka-integration-test /tidb=pr/30558

/run-dm-integration-tests
/run-dm-compatibility-test
/run-leak-test

ti-chi-bot · 2022-01-25T02:00:49Z

In response to a cherrypick label: new pull request created: #4462.

ti-chi-bot · 2022-01-25T02:01:26Z

In response to a cherrypick label: new pull request created: #4463.

close #4404

grafana(dm): fix grafana expr

baa476e

ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Jan 19, 2022

Ehco1996 added the area/dm Issues or PRs related to DM. label Jan 19, 2022

ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 19, 2022

Merge branch 'master' into fix-grafana

c34975c

glorv added needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Jan 19, 2022

glorv reviewed Jan 19, 2022

View reviewed changes

Merge branch 'master' into fix-grafana

2d19d10

ti-chi-bot requested review from glorv and lance6716 January 24, 2022 01:24

lance6716 requested changes Jan 24, 2022

View reviewed changes

address commnet

685d047

Ehco1996 commented Jan 24, 2022

View reviewed changes

Ehco1996 added 2 commits January 24, 2022 11:42

add group right for syncer binlog file metrci

28f5994

fix whitespace

fa5c966

lance6716 approved these changes Jan 24, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 24, 2022

glorv approved these changes Jan 24, 2022

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 24, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 24, 2022

ti-chi-bot added 2 commits January 24, 2022 14:32

Merge branch 'master' into fix-grafana

4e8500c

Merge branch 'master' into fix-grafana

25d7456

ti-chi-bot added 2 commits January 24, 2022 19:20

Merge branch 'master' into fix-grafana

1003b2f

Merge branch 'master' into fix-grafana

6509f70

ti-chi-bot merged commit 9d0ec39 into pingcap:master Jan 25, 2022

This was referenced Jan 25, 2022

grafana(dm): fix grafana expr (#4405) #4462

Merged

grafana(dm): fix grafana expr (#4405) #4463

Merged

ti-chi-bot added a commit that referenced this pull request Jan 26, 2022

grafana(dm): fix grafana expr (#4405) (#4462)

6511ab0

close #4404

ti-chi-bot added a commit that referenced this pull request Jan 28, 2022

grafana(dm): fix grafana expr (#4405) (#4463)

ac9cb09

close #4404

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

grafana(dm): fix grafana expr #4405

grafana(dm): fix grafana expr #4405

Ehco1996 commented Jan 19, 2022

ti-chi-bot commented Jan 19, 2022 •

edited

Loading

glorv Jan 19, 2022

Ehco1996 Jan 19, 2022

Ehco1996 Jan 24, 2022

lance6716 Jan 24, 2022

Ehco1996 Jan 24, 2022 •

edited

Loading

codecov-commenter commented Jan 19, 2022 •

edited

Loading

Ehco1996 commented Jan 24, 2022

lance6716 Jan 24, 2022

Ehco1996 Jan 24, 2022

Ehco1996 Jan 24, 2022

Ehco1996 Jan 24, 2022

Ehco1996 Jan 24, 2022

Ehco1996 Jan 24, 2022

glorv commented Jan 24, 2022

ti-chi-bot commented Jan 24, 2022

Ehco1996 commented Jan 24, 2022

lance6716 commented Jan 24, 2022

ti-chi-bot commented Jan 24, 2022

Ehco1996 commented Jan 25, 2022

ti-chi-bot commented Jan 25, 2022

ti-chi-bot commented Jan 25, 2022

	"legendFormat": "{{{instance}}",
	"legendFormat": "{{instance}}",

grafana(dm): fix grafana expr #4405

grafana(dm): fix grafana expr #4405

Conversation

Ehco1996 commented Jan 19, 2022

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Jan 19, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ehco1996 Jan 24, 2022 • edited Loading

Choose a reason for hiding this comment

codecov-commenter commented Jan 19, 2022 • edited Loading

Codecov Report

Ehco1996 commented Jan 24, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

glorv commented Jan 24, 2022

ti-chi-bot commented Jan 24, 2022

Ehco1996 commented Jan 24, 2022

lance6716 commented Jan 24, 2022

ti-chi-bot commented Jan 24, 2022

Ehco1996 commented Jan 25, 2022

ti-chi-bot commented Jan 25, 2022

ti-chi-bot commented Jan 25, 2022

ti-chi-bot commented Jan 19, 2022 •

edited

Loading

Ehco1996 Jan 24, 2022 •

edited

Loading

codecov-commenter commented Jan 19, 2022 •

edited

Loading