minor fixes

mtojek · mtojek · commit 322f7e8a5bf8 · 2023-04-14T09:57:34.000+02:00
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagentstats.sql b/coderd/database/queries/workspaceagentstats.sql
@@ -133,8 +133,25 @@ WITH agent_stats AS (
 	WHERE a.rn = 1
 	GROUP BY a.user_id, a.agent_id, a.workspace_id
 )
-SELECT users.username, workspace_agents.name AS agent_name, workspaces.name AS workspace_name, workspace_rx_bytes, workspace_tx_bytes, session_count_vscode, session_count_ssh, session_count_jetbrains, session_count_reconnecting_pty, connection_count, connection_median_latency_ms
-FROM agent_stats JOIN latest_agent_stats ON agent_stats.agent_id = latest_agent_stats.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;
+SELECT
+	users.username, workspace_agents.name AS agent_name, workspaces.name AS workspace_name, workspace_rx_bytes, workspace_tx_bytes,
+	session_count_vscode, session_count_ssh, session_count_jetbrains, session_count_reconnecting_pty,
+	connection_count, connection_median_latency_ms
+FROM
+	agent_stats
+JOIN
+	latest_agent_stats
+ON
+	agent_stats.agent_id = latest_agent_stats.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;
diff --git a/coderd/prometheusmetrics/prometheusmetrics.go b/coderd/prometheusmetrics/prometheusmetrics.go
@@ -286,6 +286,8 @@ func Agents(ctx context.Context, logger slog.Logger, registerer prometheus.Regis
 		done:
 			logger.Debug(ctx, "Agent metrics collection is done")
 			metricsCollectorAgents.Observe(timer.ObserveDuration().Seconds())
+
+			ticker.Reset(duration)
 		}
 	}()
 	return cancelFunc, nil
@@ -451,6 +453,7 @@ func AgentStats(ctx context.Context, logger slog.Logger, registerer prometheus.R
 			metricsCollectorAgentStats.Observe(timer.ObserveDuration().Seconds())
 
 			createdAfter = checkpoint
+			ticker.Reset(duration)
 		}
 	}()
 	return cancelFunc, nil
