Skip to content
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

Jump to bottom

Fixed display of working time in Grafana management dashboard #8112

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Fixed display of working time in Grafana management dashboard #8112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0116355
Fixed display of working time in Grafana management dashboard
azhavoro Jul 2, 2024
b04a7fc
Add changelog
azhavoro Jul 3, 2024
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
4 changes: 4 additions & 0 deletions changelog.d/20240703_102756_andrey_fix_grafana_dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Fixed display of working time in Grafana management dashboard
(<https://github.com/cvat-ai/cvat/pull/8112>)
2 changes: 1 addition & 1 deletion components/analytics/grafana/dashboards/management.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
}
},
"queryType": "sql",
"rawSql": "SELECT\r\n user_id as User,\r\n project_id as Project,\r\n task_id as Task,\r\n job_id as Job, sum(JSONExtractUInt(payload, 'working_time')) / 1000 / 3600 as \"Working time(h)\",\r\n count() as Activity\r\nFROM events\r\nWHERE JSONHas(payload, 'working_time')\r\n AND $__timeFilter(timestamp)\r\n AND user_id IN (${users})\r\n AND (-1 IN (${projects}) OR project_id IN (${projects}))\r\n AND task_id IN (${tasks})\r\n AND job_id IN (${jobs})\r\n AND source = 'client'\r\nGROUP BY user_id, project_id, task_id, job_id",
"rawSql": "SELECT\r\n user_id as User,\r\n project_id as Project,\r\n task_id as Task,\r\n job_id as Job, sum(JSONExtractUInt(payload, 'working_time')) / 1000 / 3600 as \"Working time(h)\",\r\n count() as Activity\r\nFROM events\r\nWHERE JSONHas(payload, 'working_time')\r\n AND $__timeFilter(timestamp)\r\n AND user_id IN (${users})\r\n AND (-1 IN (${projects}) OR project_id IN (${projects}))\r\n AND task_id IN (${tasks})\r\n AND job_id IN (${jobs})\r\nGROUP BY user_id, project_id, task_id, job_id",
"refId": "A"
}
],
Expand Down
Loading