mirror of
https://github.com/coder/coder.git
synced 2025-07-18 14:17:22 +00:00
fix: handle new agent stat format correctly (#14576)
--------- Co-authored-by: Ethan Dickson <ethan@coder.com>
This commit is contained in:
Garrett Delfosse
GitHub
@ -17,7 +17,8 @@ INSERT INTO
|
||||
session_count_jetbrains,
|
||||
session_count_reconnecting_pty,
|
||||
session_count_ssh,
|
||||
connection_median_latency_ms
|
||||
connection_median_latency_ms,
|
||||
usage
|
||||
)
|
||||
SELECT
|
||||
unnest(@id :: uuid[]) AS id,
|
||||
@ -36,7 +37,8 @@ SELECT
|
||||
unnest(@session_count_jetbrains :: bigint[]) AS session_count_jetbrains,
|
||||
unnest(@session_count_reconnecting_pty :: bigint[]) AS session_count_reconnecting_pty,
|
||||
unnest(@session_count_ssh :: bigint[]) AS session_count_ssh,
|
||||
unnest(@connection_median_latency_ms :: double precision[]) AS connection_median_latency_ms;
|
||||
unnest(@connection_median_latency_ms :: double precision[]) AS connection_median_latency_ms,
|
||||
unnest(@usage :: boolean[]) AS usage;
|
||||
|
||||
-- name: GetTemplateDAUs :many
|
||||
SELECT
|
||||
@ -119,6 +121,60 @@ WITH agent_stats AS (
|
||||
)
|
||||
SELECT * FROM agent_stats, latest_agent_stats;
|
||||
|
||||
-- name: GetDeploymentWorkspaceAgentUsageStats :one
|
||||
WITH agent_stats AS (
|
||||
SELECT
|
||||
coalesce(SUM(rx_bytes), 0)::bigint AS workspace_rx_bytes,
|
||||
coalesce(SUM(tx_bytes), 0)::bigint AS workspace_tx_bytes,
|
||||
coalesce((PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY connection_median_latency_ms)), -1)::FLOAT AS workspace_connection_latency_50,
|
||||
coalesce((PERCENTILE_CONT(0.95) WITHIN GROUP (ORDER BY connection_median_latency_ms)), -1)::FLOAT AS workspace_connection_latency_95
|
||||
FROM workspace_agent_stats
|
||||
-- The greater than 0 is to support legacy agents that don't report connection_median_latency_ms.
|
||||
WHERE workspace_agent_stats.created_at > $1 AND connection_median_latency_ms > 0
|
||||
),
|
||||
minute_buckets AS (
|
||||
SELECT
|
||||
agent_id,
|
||||
date_trunc('minute', created_at) AS minute_bucket,
|
||||
coalesce(SUM(session_count_vscode), 0)::bigint AS session_count_vscode,
|
||||
coalesce(SUM(session_count_ssh), 0)::bigint AS session_count_ssh,
|
||||
coalesce(SUM(session_count_jetbrains), 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(SUM(session_count_reconnecting_pty), 0)::bigint AS session_count_reconnecting_pty
|
||||
FROM
|
||||
workspace_agent_stats
|
||||
WHERE
|
||||
created_at >= $1
|
||||
AND created_at < date_trunc('minute', now()) -- Exclude current partial minute
|
||||
AND usage = true
|
||||
GROUP BY
|
||||
agent_id,
|
||||
minute_bucket
|
||||
),
|
||||
latest_buckets AS (
|
||||
SELECT DISTINCT ON (agent_id)
|
||||
agent_id,
|
||||
minute_bucket,
|
||||
session_count_vscode,
|
||||
session_count_jetbrains,
|
||||
session_count_reconnecting_pty,
|
||||
session_count_ssh
|
||||
FROM
|
||||
minute_buckets
|
||||
ORDER BY
|
||||
agent_id,
|
||||
minute_bucket DESC
|
||||
),
|
||||
latest_agent_stats AS (
|
||||
SELECT
|
||||
coalesce(SUM(session_count_vscode), 0)::bigint AS session_count_vscode,
|
||||
coalesce(SUM(session_count_ssh), 0)::bigint AS session_count_ssh,
|
||||
coalesce(SUM(session_count_jetbrains), 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(SUM(session_count_reconnecting_pty), 0)::bigint AS session_count_reconnecting_pty
|
||||
FROM
|
||||
latest_buckets
|
||||
)
|
||||
SELECT * FROM agent_stats, latest_agent_stats;
|
||||
|
||||
-- name: GetWorkspaceAgentStats :many
|
||||
WITH agent_stats AS (
|
||||
SELECT
|
||||
@ -148,6 +204,75 @@ WITH agent_stats AS (
|
||||
)
|
||||
SELECT * FROM agent_stats JOIN latest_agent_stats ON agent_stats.agent_id = latest_agent_stats.agent_id;
|
||||
|
||||
-- name: GetWorkspaceAgentUsageStats :many
|
||||
WITH agent_stats AS (
|
||||
SELECT
|
||||
user_id,
|
||||
agent_id,
|
||||
workspace_id,
|
||||
template_id,
|
||||
MIN(created_at)::timestamptz AS aggregated_from,
|
||||
coalesce(SUM(rx_bytes), 0)::bigint AS workspace_rx_bytes,
|
||||
coalesce(SUM(tx_bytes), 0)::bigint AS workspace_tx_bytes,
|
||||
coalesce((PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY connection_median_latency_ms)), -1)::FLOAT AS workspace_connection_latency_50,
|
||||
coalesce((PERCENTILE_CONT(0.95) WITHIN GROUP (ORDER BY connection_median_latency_ms)), -1)::FLOAT AS workspace_connection_latency_95
|
||||
FROM workspace_agent_stats
|
||||
-- The greater than 0 is to support legacy agents that don't report connection_median_latency_ms.
|
||||
WHERE workspace_agent_stats.created_at > $1 AND connection_median_latency_ms > 0
|
||||
GROUP BY user_id, agent_id, workspace_id, template_id
|
||||
),
|
||||
minute_buckets AS (
|
||||
SELECT
|
||||
agent_id,
|
||||
date_trunc('minute', created_at) AS minute_bucket,
|
||||
coalesce(SUM(session_count_vscode), 0)::bigint AS session_count_vscode,
|
||||
coalesce(SUM(session_count_ssh), 0)::bigint AS session_count_ssh,
|
||||
coalesce(SUM(session_count_jetbrains), 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(SUM(session_count_reconnecting_pty), 0)::bigint AS session_count_reconnecting_pty
|
||||
FROM
|
||||
workspace_agent_stats
|
||||
WHERE
|
||||
created_at >= $1
|
||||
AND created_at < date_trunc('minute', now()) -- Exclude current partial minute
|
||||
AND usage = true
|
||||
GROUP BY
|
||||
agent_id,
|
||||
minute_bucket,
|
||||
user_id,
|
||||
agent_id,
|
||||
workspace_id,
|
||||
template_id
|
||||
),
|
||||
latest_buckets AS (
|
||||
SELECT DISTINCT ON (agent_id)
|
||||
agent_id,
|
||||
session_count_vscode,
|
||||
session_count_ssh,
|
||||
session_count_jetbrains,
|
||||
session_count_reconnecting_pty
|
||||
FROM
|
||||
minute_buckets
|
||||
ORDER BY
|
||||
agent_id,
|
||||
minute_bucket DESC
|
||||
)
|
||||
SELECT user_id,
|
||||
agent_stats.agent_id,
|
||||
workspace_id,
|
||||
template_id,
|
||||
aggregated_from,
|
||||
workspace_rx_bytes,
|
||||
workspace_tx_bytes,
|
||||
workspace_connection_latency_50,
|
||||
workspace_connection_latency_95,
|
||||
-- `minute_buckets` could return 0 rows if there are no usage stats since `created_at`.
|
||||
coalesce(latest_buckets.agent_id,agent_stats.agent_id) AS agent_id,
|
||||
coalesce(session_count_vscode, 0)::bigint AS session_count_vscode,
|
||||
coalesce(session_count_ssh, 0)::bigint AS session_count_ssh,
|
||||
coalesce(session_count_jetbrains, 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(session_count_reconnecting_pty, 0)::bigint AS session_count_reconnecting_pty
|
||||
FROM agent_stats LEFT JOIN latest_buckets ON agent_stats.agent_id = latest_buckets.agent_id;
|
||||
|
||||
-- name: GetWorkspaceAgentStatsAndLabels :many
|
||||
WITH agent_stats AS (
|
||||
SELECT
|
||||
@ -199,3 +324,65 @@ JOIN
|
||||
workspaces
|
||||
ON
|
||||
workspaces.id = agent_stats.workspace_id;
|
||||
|
||||
-- name: GetWorkspaceAgentUsageStatsAndLabels :many
|
||||
WITH agent_stats AS (
|
||||
SELECT
|
||||
user_id,
|
||||
agent_id,
|
||||
workspace_id,
|
||||
coalesce(SUM(rx_bytes), 0)::bigint AS rx_bytes,
|
||||
coalesce(SUM(tx_bytes), 0)::bigint AS tx_bytes
|
||||
FROM workspace_agent_stats
|
||||
WHERE workspace_agent_stats.created_at > $1
|
||||
GROUP BY user_id, agent_id, workspace_id
|
||||
), latest_agent_stats AS (
|
||||
SELECT
|
||||
agent_id,
|
||||
coalesce(SUM(session_count_vscode), 0)::bigint AS session_count_vscode,
|
||||
coalesce(SUM(session_count_ssh), 0)::bigint AS session_count_ssh,
|
||||
coalesce(SUM(session_count_jetbrains), 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(SUM(session_count_reconnecting_pty), 0)::bigint AS session_count_reconnecting_pty,
|
||||
coalesce(SUM(connection_count), 0)::bigint AS connection_count
|
||||
FROM workspace_agent_stats
|
||||
-- We only want the latest stats, but those stats might be
|
||||
-- spread across multiple rows.
|
||||
WHERE usage = true AND created_at > now() - '1 minute'::interval
|
||||
GROUP BY user_id, agent_id, workspace_id
|
||||
), latest_agent_latencies AS (
|
||||
SELECT
|
||||
agent_id,
|
||||
coalesce(MAX(connection_median_latency_ms), 0)::float AS connection_median_latency_ms
|
||||
FROM workspace_agent_stats
|
||||
GROUP BY user_id, agent_id, workspace_id
|
||||
)
|
||||
SELECT
|
||||
users.username, workspace_agents.name AS agent_name, workspaces.name AS workspace_name, rx_bytes, tx_bytes,
|
||||
coalesce(session_count_vscode, 0)::bigint AS session_count_vscode,
|
||||
coalesce(session_count_ssh, 0)::bigint AS session_count_ssh,
|
||||
coalesce(session_count_jetbrains, 0)::bigint AS session_count_jetbrains,
|
||||
coalesce(session_count_reconnecting_pty, 0)::bigint AS session_count_reconnecting_pty,
|
||||
coalesce(connection_count, 0)::bigint AS connection_count,
|
||||
connection_median_latency_ms
|
||||
FROM
|
||||
agent_stats
|
||||
LEFT JOIN
|
||||
latest_agent_stats
|
||||
ON
|
||||
agent_stats.agent_id = latest_agent_stats.agent_id
|
||||
JOIN
|
||||
latest_agent_latencies
|
||||
ON
|
||||
agent_stats.agent_id = latest_agent_latencies.agent_id
|
||||
JOIN
|
||||
users
|
||||
ON
|
||||
users.id = agent_stats.user_id
|
||||
JOIN
|
||||
workspace_agents
|
||||
ON
|
||||
workspace_agents.id = agent_stats.agent_id
|
||||
JOIN
|
||||
workspaces
|
||||
ON
|
||||
workspaces.id = agent_stats.workspace_id;
|
||||
|
||||
Reference in New Issue
Block a user