Skip to content

fix(grafana): use account email in Work Logs "Code commits" panel to fix 0-commit count for users with multiple accounts #8925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bujjibabukatta wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix(grafana): use account email in Work Logs "Code commits" panel to fix 0-commit count for users with multiple accounts #8925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grafana/dashboards/mysql/work-logs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@
"editorMode": "code",
"format": "table",
"rawQuery": true,
"rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name, u.email\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n)\n\nSELECT count(distinct c.sha)\nFROM commits c\njoin _accounts a on c.author_id = a.email\nwhere $__timeFilter(authored_date)\n",
"rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name, a.email\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n)\n\nSELECT count(distinct c.sha)\nFROM commits c\njoin _accounts a on c.author_id = a.email\nwhere $__timeFilter(authored_date)\n",
"refId": "A",
"sql": {
"columns": [
Expand Down
2 changes: 1 addition & 1 deletion grafana/dashboards/postgresql/work-logs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@
"editorMode": "code",
"format": "table",
"rawQuery": true,
"rawSql": "WITH _accounts AS (SELECT ua.account_id, ua.user_id, u.name, u.email FROM accounts AS a JOIN user_accounts AS ua ON a.id = ua.account_id JOIN users AS u ON ua.user_id = u.id WHERE ('${users:csv}' = '' OR ua.user_id::text = ANY(ARRAY[${users:singlequote}]::text[]))) SELECT COUNT(DISTINCT c.sha) FROM commits AS c JOIN _accounts AS a ON c.author_id = a.email WHERE $__timeFilter(authored_date)",
"rawSql": "WITH _accounts AS (SELECT ua.account_id, ua.user_id, u.name, a.email FROM accounts AS a JOIN user_accounts AS ua ON a.id = ua.account_id JOIN users AS u ON ua.user_id = u.id WHERE ('${users:csv}' = '' OR ua.user_id::text = ANY(ARRAY[${users:singlequote}]::text[]))) SELECT COUNT(DISTINCT c.sha) FROM commits AS c JOIN _accounts AS a ON c.author_id = a.email WHERE $__timeFilter(authored_date)",
"refId": "A",
"sql": {
"columns": [
Expand Down