This is an automated cherry-pick of pingcap#50086

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Jan 11, 2024 · 4a2a474 · 4a2a474
1 parent 4a8c7b2
commit 4a2a474
Show file tree

Hide file tree

Showing 4 changed files with 637 additions and 1 deletion.
diff --git a/pkg/executor/compiler.go b/pkg/executor/compiler.go
@@ -105,9 +105,15 @@ func (c *Compiler) Compile(ctx context.Context, stmtNode ast.StmtNode) (_ *ExecS
 	})
 
 	if preparedObj != nil {
+<<<<<<< HEAD
 		CountStmtNode(preparedObj.PreparedAst.Stmt, sessVars.InRestrictedSQL)
 	} else {
 		CountStmtNode(stmtNode, sessVars.InRestrictedSQL)
+=======
+		CountStmtNode(preparedObj.PreparedAst.Stmt, sessVars.InRestrictedSQL, stmtCtx.ResourceGroupName)
+	} else {
+		CountStmtNode(stmtNode, sessVars.InRestrictedSQL, stmtCtx.ResourceGroupName)
+>>>>>>> 190488d0dbb (metrics: add new row panel for tidb query (#50086))
 	}
 	var lowerPriority bool
 	if c.Ctx.GetSessionVars().StmtCtx.Priority == mysql.NoPriority {

diff --git a/pkg/metrics/grafana/overview.json b/pkg/metrics/grafana/overview.json
@@ -1170,7 +1170,7 @@
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": null,
               "logBase": 1,
               "max": null,