Skip to content

feat(coderd): add template app usage to insights #9138

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

Merged
merged 11 commits into from
Aug 21, 2023
Merged

feat(coderd): add template app usage to insights #9138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cece437
feat(coderd): report template app usage insights
mafredri Aug 16, 2023
0db240a
use 1 minute granularity instead of 5
mafredri Aug 16, 2023
91dce4f
fix coalesce and cleanup with array remove
mafredri Aug 17, 2023
98a835c
Revert "use 1 minute granularity instead of 5"
mafredri Aug 17, 2023
cacebb9
fix query joins, add basic test for app usage
mafredri Aug 18, 2023
6fd3d93
nolint
mafredri Aug 18, 2023
3bc91b5
test produce another active user via app usage
mafredri Aug 18, 2023
ae20a46
implement fakedb
mafredri Aug 18, 2023
6b8fe1a
strict
mafredri Aug 18, 2023
1904fbe
fix gen
mafredri Aug 18, 2023
ecd1699
Merge branch 'main' into mafredri/feat-add-app-usage-to-template-insi…
mafredri Aug 21, 2023
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
Prev Previous commit
Next Next commit
Revert "use 1 minute granularity instead of 5" 
This reverts commit 77e8382.
  • Loading branch information
@mafredri
mafredri committed Aug 18, 2023
commit 98a835c37e8309ac83e8ea26f4137150e825921a
4 changes: 2 additions & 2 deletions coderd/database/querier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions coderd/database/queries/insights.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ GROUP BY workspace_agent_stats.user_id, users.username, users.avatar_url
ORDER BY user_id ASC;

-- name: GetTemplateInsights :one
-- GetTemplateInsights has a granularity of 1 minute where if a session/app was
-- in use during a minute, we will add 1 minute to the total usage for that
-- GetTemplateInsights has a granularity of 5 minutes where if a session/app was
-- in use during a minute, we will add 5 minutes to the total usage for that
-- session/app (per user).
WITH ts AS (
SELECT
d::timestamptz AS from_,
(d::timestamptz + '1 minute'::interval) AS to_,
EXTRACT(epoch FROM '1 minute'::interval) AS seconds
(d::timestamptz + '5 minute'::interval) AS to_,
EXTRACT(epoch FROM '5 minute'::interval) AS seconds
FROM
-- Subtract 1 second from end_time to avoid including the next interval in the results.
generate_series(@start_time::timestamptz, (@end_time::timestamptz) - '1 second'::interval, '1 minute'::interval) d
generate_series(@start_time::timestamptz, (@end_time::timestamptz) - '1 second'::interval, '5 minute'::interval) d
), agent_stats_by_interval_and_user AS (
SELECT
ts.from_,
Expand Down Expand Up @@ -79,11 +79,11 @@ FROM agent_stats_by_interval_and_user;
WITH ts AS (
SELECT
d::timestamptz AS from_,
(d::timestamptz + '1 minute'::interval) AS to_,
EXTRACT(epoch FROM '1 minute'::interval) AS seconds
(d::timestamptz + '5 minute'::interval) AS to_,
EXTRACT(epoch FROM '5 minute'::interval) AS seconds
FROM
-- Subtract 1 second from end_time to avoid including the next interval in the results.
generate_series(@start_time::timestamptz, (@end_time::timestamptz) - '1 second'::interval, '1 minute'::interval) d
generate_series(@start_time::timestamptz, (@end_time::timestamptz) - '1 second'::interval, '5 minute'::interval) d
), app_stats_by_user_and_agent AS (
SELECT
ts.from_,
Expand Down