selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: use bigint instead of integer in stats migration (#6380) 

This broke dogfood!
This commit is contained in:
Kyle Carberry 2023-02-28 13:55:37 -06:00 committed by GitHub
parent 05e449943d
commit 8850ce0d9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coderd/database/dump.sql generated
View File

@ -470,11 +470,11 @@ CREATE TABLE workspace_agent_stats (
workspace_id uuid NOT NULL,
template_id uuid NOT NULL,
connections_by_proto jsonb DEFAULT '{}'::jsonb NOT NULL,
connection_count integer DEFAULT 0 NOT NULL,
rx_packets integer DEFAULT 0 NOT NULL,
rx_bytes integer DEFAULT 0 NOT NULL,
tx_packets integer DEFAULT 0 NOT NULL,
tx_bytes integer DEFAULT 0 NOT NULL
connection_count bigint DEFAULT 0 NOT NULL,
rx_packets bigint DEFAULT 0 NOT NULL,
rx_bytes bigint DEFAULT 0 NOT NULL,
tx_packets bigint DEFAULT 0 NOT NULL,
tx_bytes bigint DEFAULT 0 NOT NULL
);
CREATE TABLE workspace_agents (

20
coderd/database/migrations/000101_workspace_agent_stats_tableify.up.sql
View File

@ -1,18 +1,18 @@
ALTER TABLE agent_stats RENAME TO workspace_agent_stats;
ALTER TABLE workspace_agent_stats ADD COLUMN connections_by_proto jsonb NOT NULL DEFAULT '{}'::jsonb;
ALTER TABLE workspace_agent_stats ADD COLUMN connection_count integer DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN rx_packets integer DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN rx_bytes integer DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN tx_packets integer DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN tx_bytes integer DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN connection_count bigint DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN rx_packets bigint DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN rx_bytes bigint DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN tx_packets bigint DEFAULT 0 NOT NULL;
ALTER TABLE workspace_agent_stats ADD COLUMN tx_bytes bigint DEFAULT 0 NOT NULL;
UPDATE workspace_agent_stats SET
connections_by_proto = coalesce((payload ->> 'conns_by_proto')::jsonb, '{}'::jsonb),
connection_count = coalesce((payload ->> 'num_conns')::integer, 0),
rx_packets = coalesce((payload ->> 'rx_packets')::integer, 0),
rx_bytes = coalesce((payload ->> 'rx_bytes')::integer, 0),
tx_packets = coalesce((payload ->> 'tx_packets')::integer, 0),
tx_bytes = coalesce((payload ->> 'tx_bytes')::integer, 0);
connection_count = coalesce((payload ->> 'num_conns')::bigint, 0),
rx_packets = coalesce((payload ->> 'rx_packets')::bigint, 0),
rx_bytes = coalesce((payload ->> 'rx_bytes')::bigint, 0),
tx_packets = coalesce((payload ->> 'tx_packets')::bigint, 0),
tx_bytes = coalesce((payload ->> 'tx_bytes')::bigint, 0);
ALTER TABLE workspace_agent_stats DROP COLUMN payload;

10
coderd/database/models.go
View File

@ -1556,11 +1556,11 @@ type WorkspaceAgentStat struct {
WorkspaceID uuid.UUID `db:"workspace_id" json:"workspace_id"`
TemplateID uuid.UUID `db:"template_id" json:"template_id"`
ConnectionsByProto json.RawMessage `db:"connections_by_proto" json:"connections_by_proto"`
ConnectionCount int32 `db:"connection_count" json:"connection_count"`
RxPackets int32 `db:"rx_packets" json:"rx_packets"`
RxBytes int32 `db:"rx_bytes" json:"rx_bytes"`
TxPackets int32 `db:"tx_packets" json:"tx_packets"`
TxBytes int32 `db:"tx_bytes" json:"tx_bytes"`
ConnectionCount int64 `db:"connection_count" json:"connection_count"`
RxPackets int64 `db:"rx_packets" json:"rx_packets"`
RxBytes int64 `db:"rx_bytes" json:"rx_bytes"`
TxPackets int64 `db:"tx_packets" json:"tx_packets"`
TxBytes int64 `db:"tx_bytes" json:"tx_bytes"`
}
type WorkspaceApp struct {

10
coderd/database/queries.sql.go
View File

@ -5430,11 +5430,11 @@ type InsertWorkspaceAgentStatParams struct {
TemplateID uuid.UUID `db:"template_id" json:"template_id"`
AgentID uuid.UUID `db:"agent_id" json:"agent_id"`
ConnectionsByProto json.RawMessage `db:"connections_by_proto" json:"connections_by_proto"`
ConnectionCount int32 `db:"connection_count" json:"connection_count"`
RxPackets int32 `db:"rx_packets" json:"rx_packets"`
RxBytes int32 `db:"rx_bytes" json:"rx_bytes"`
TxPackets int32 `db:"tx_packets" json:"tx_packets"`
TxBytes int32 `db:"tx_bytes" json:"tx_bytes"`
ConnectionCount int64 `db:"connection_count" json:"connection_count"`
RxPackets int64 `db:"rx_packets" json:"rx_packets"`
RxBytes int64 `db:"rx_bytes" json:"rx_bytes"`
TxPackets int64 `db:"tx_packets" json:"tx_packets"`
TxBytes int64 `db:"tx_bytes" json:"tx_bytes"`
}
func (q *sqlQuerier) InsertWorkspaceAgentStat(ctx context.Context, arg InsertWorkspaceAgentStatParams) (WorkspaceAgentStat, error) {

10
coderd/workspaceagents.go
View File

@ -948,11 +948,11 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
UserID: workspace.OwnerID,
TemplateID: workspace.TemplateID,
ConnectionsByProto: payload,
ConnectionCount: int32(req.ConnectionCount),
RxPackets: int32(req.RxPackets),
RxBytes: int32(req.RxBytes),
TxPackets: int32(req.TxPackets),
TxBytes: int32(req.TxBytes),
ConnectionCount: req.ConnectionCount,
RxPackets: req.RxPackets,
RxBytes: req.RxBytes,
TxPackets: req.TxPackets,
TxBytes: req.TxBytes,
})
if err != nil {
httpapi.InternalServerError(rw, err)