mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 15:51:26 +00:00
refactor(db): port metrics storage + service domains to sqlc (#75)
First tranche of the ~300-site raw SQL port. Metrics: node/service/ instance rows via generated queries; aggregation moved off TimescaleDB's time_bucket onto portable date_bin (PG14+); interval uptime returns epoch seconds; per-container writes dropped (container_metrics FKs a different model — collector shape never matched). Domains: all reads/writes through sqlcdb including the create transaction via WithTx; default-domain and services.domain invariants unchanged. Both paths covered by live Postgres tests gated on METRICS_TEST_DSN. Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Tomáš DvořákandDevin authored and GitHub committed
1 parent
ca8eab4a65
commit
302c595380
12 files changed
+1825
-385
No files matched your search
@@ -0,0 +1,46 @@
|
||||
-- name: ListServiceDomains :many
|
||||
SELECT id, service_id, domain, is_default, cert_type, cert_status, last_checked_at, created_at
|
||||
FROM service_domains
|
||||
WHERE service_id = $1
|
||||
ORDER BY is_default DESC, created_at ASC;
|
||||
|
||||
-- name: CountServiceDomains :one
|
||||
SELECT COUNT(*) FROM service_domains WHERE service_id = $1;
|
||||
|
||||
-- name: ClearServiceDomainDefault :exec
|
||||
UPDATE service_domains SET is_default = false WHERE service_id = $1;
|
||||
|
||||
-- name: CreateServiceDomain :one
|
||||
INSERT INTO service_domains (service_id, domain, is_default)
|
||||
VALUES ($1, $2, $3)
|
||||
RETURNING id, service_id, domain, is_default, cert_type, cert_status, created_at;
|
||||
|
||||
-- name: DeleteServiceDomain :execrows
|
||||
DELETE FROM service_domains WHERE id = $1 AND service_id = $2;
|
||||
|
||||
-- name: SetServiceDomainDefault :execrows
|
||||
UPDATE service_domains SET is_default = (id = $1) WHERE service_id = $2;
|
||||
|
||||
-- name: TouchServiceDomainChecked :exec
|
||||
UPDATE service_domains SET last_checked_at = NOW() WHERE id = $1;
|
||||
|
||||
-- name: GetServiceDomainDefault :one
|
||||
SELECT domain FROM service_domains WHERE service_id = $1 AND is_default;
|
||||
|
||||
-- name: GetServiceDomainFirst :one
|
||||
SELECT domain FROM service_domains WHERE service_id = $1 ORDER BY created_at ASC LIMIT 1;
|
||||
|
||||
-- name: SetServiceLegacyDomain :exec
|
||||
UPDATE services SET domain = $1 WHERE id = $2;
|
||||
|
||||
-- name: GetServicePlacementBrief :one
|
||||
SELECT name, node_id, COALESCE(spread, false) AS spread FROM services WHERE id = $1;
|
||||
|
||||
-- name: GetServiceAccess :one
|
||||
SELECT maintenance_mode, basic_auth_users FROM services WHERE id = $1;
|
||||
|
||||
-- name: ServiceWriteAccess :one
|
||||
SELECT EXISTS(
|
||||
SELECT 1 FROM services s JOIN projects p ON s.project_id = p.id
|
||||
WHERE s.id = $1 AND (p.owner_id = $2 OR $3::bool)
|
||||
) AS allowed;
|
||||
@@ -0,0 +1,147 @@
|
||||
-- name: UpsertNodeMetrics :exec
|
||||
INSERT INTO node_metrics (
|
||||
node_id, timestamp, cpu_usage, cpu_cores, load_avg_1, load_avg_5, load_avg_15,
|
||||
memory_total, memory_used, memory_available, memory_usage_percent,
|
||||
storage_total, storage_used, storage_available, storage_usage_percent,
|
||||
network_bytes_in, network_bytes_out, network_packets_in, network_packets_out,
|
||||
network_connections_in, network_connections_out, network_errors_in, network_errors_out,
|
||||
uptime, processes, os, kernel, architecture
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
|
||||
$16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28
|
||||
)
|
||||
ON CONFLICT (node_id, timestamp) DO UPDATE SET
|
||||
cpu_usage = EXCLUDED.cpu_usage,
|
||||
cpu_cores = EXCLUDED.cpu_cores,
|
||||
load_avg_1 = EXCLUDED.load_avg_1,
|
||||
load_avg_5 = EXCLUDED.load_avg_5,
|
||||
load_avg_15 = EXCLUDED.load_avg_15,
|
||||
memory_total = EXCLUDED.memory_total,
|
||||
memory_used = EXCLUDED.memory_used,
|
||||
memory_available = EXCLUDED.memory_available,
|
||||
memory_usage_percent = EXCLUDED.memory_usage_percent,
|
||||
storage_total = EXCLUDED.storage_total,
|
||||
storage_used = EXCLUDED.storage_used,
|
||||
storage_available = EXCLUDED.storage_available,
|
||||
storage_usage_percent = EXCLUDED.storage_usage_percent,
|
||||
network_bytes_in = EXCLUDED.network_bytes_in,
|
||||
network_bytes_out = EXCLUDED.network_bytes_out,
|
||||
network_packets_in = EXCLUDED.network_packets_in,
|
||||
network_packets_out = EXCLUDED.network_packets_out,
|
||||
network_connections_in = EXCLUDED.network_connections_in,
|
||||
network_connections_out = EXCLUDED.network_connections_out,
|
||||
network_errors_in = EXCLUDED.network_errors_in,
|
||||
network_errors_out = EXCLUDED.network_errors_out,
|
||||
uptime = EXCLUDED.uptime,
|
||||
processes = EXCLUDED.processes,
|
||||
os = EXCLUDED.os,
|
||||
kernel = EXCLUDED.kernel,
|
||||
architecture = EXCLUDED.architecture;
|
||||
|
||||
-- name: UpsertServiceMetrics :exec
|
||||
INSERT INTO service_metrics (
|
||||
service_id, service_name, project_id, timestamp,
|
||||
requests_total, requests_success, requests_errors, requests_avg_latency,
|
||||
requests_p95_latency, requests_p99_latency, requests_throughput,
|
||||
errors_total, errors_rate, performance_response_time, performance_throughput,
|
||||
performance_concurrency, performance_saturation, performance_utilization,
|
||||
resource_cpu_usage, resource_memory_usage, resource_storage_usage,
|
||||
resource_network_usage, resource_score
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
|
||||
$16, $17, $18, $19, $20, $21, $22, $23
|
||||
)
|
||||
ON CONFLICT (service_id, timestamp) DO UPDATE SET
|
||||
requests_total = EXCLUDED.requests_total,
|
||||
requests_success = EXCLUDED.requests_success,
|
||||
requests_errors = EXCLUDED.requests_errors,
|
||||
requests_avg_latency = EXCLUDED.requests_avg_latency,
|
||||
requests_p95_latency = EXCLUDED.requests_p95_latency,
|
||||
requests_p99_latency = EXCLUDED.requests_p99_latency,
|
||||
requests_throughput = EXCLUDED.requests_throughput,
|
||||
errors_total = EXCLUDED.errors_total,
|
||||
errors_rate = EXCLUDED.errors_rate,
|
||||
performance_response_time = EXCLUDED.performance_response_time,
|
||||
performance_throughput = EXCLUDED.performance_throughput,
|
||||
performance_concurrency = EXCLUDED.performance_concurrency,
|
||||
performance_saturation = EXCLUDED.performance_saturation,
|
||||
performance_utilization = EXCLUDED.performance_utilization,
|
||||
resource_cpu_usage = EXCLUDED.resource_cpu_usage,
|
||||
resource_memory_usage = EXCLUDED.resource_memory_usage,
|
||||
resource_storage_usage = EXCLUDED.resource_storage_usage,
|
||||
resource_network_usage = EXCLUDED.resource_network_usage,
|
||||
resource_score = EXCLUDED.resource_score;
|
||||
|
||||
-- name: UpsertInstanceMetrics :exec
|
||||
INSERT INTO instance_metrics (
|
||||
service_id, timestamp, instance_id, node_id, status, cpu, memory,
|
||||
network_bytes_in, network_bytes_out, network_packets_in, network_packets_out,
|
||||
network_connections_in, network_connections_out, network_errors_in, network_errors_out,
|
||||
start_time, last_seen, health_status, health_last_check, health_check_count, health_failure_count
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
|
||||
$16, $17, $18, $19, $20, $21
|
||||
)
|
||||
ON CONFLICT (service_id, timestamp, instance_id) DO UPDATE SET
|
||||
node_id = EXCLUDED.node_id,
|
||||
status = EXCLUDED.status,
|
||||
cpu = EXCLUDED.cpu,
|
||||
memory = EXCLUDED.memory,
|
||||
network_bytes_in = EXCLUDED.network_bytes_in,
|
||||
network_bytes_out = EXCLUDED.network_bytes_out,
|
||||
network_packets_in = EXCLUDED.network_packets_in,
|
||||
network_packets_out = EXCLUDED.network_packets_out,
|
||||
network_connections_in = EXCLUDED.network_connections_in,
|
||||
network_connections_out = EXCLUDED.network_connections_out,
|
||||
network_errors_in = EXCLUDED.network_errors_in,
|
||||
network_errors_out = EXCLUDED.network_errors_out,
|
||||
start_time = EXCLUDED.start_time,
|
||||
last_seen = EXCLUDED.last_seen,
|
||||
health_status = EXCLUDED.health_status,
|
||||
health_last_check = EXCLUDED.health_last_check,
|
||||
health_check_count = EXCLUDED.health_check_count,
|
||||
health_failure_count = EXCLUDED.health_failure_count;
|
||||
|
||||
-- name: ListNodeMetrics :many
|
||||
SELECT node_id, timestamp, cpu_usage, cpu_cores, load_avg_1, load_avg_5, load_avg_15,
|
||||
memory_total, memory_used, memory_available, memory_usage_percent,
|
||||
storage_total, storage_used, storage_available, storage_usage_percent,
|
||||
network_bytes_in, network_bytes_out, network_packets_in, network_packets_out,
|
||||
network_connections_in, network_connections_out, network_errors_in, network_errors_out,
|
||||
coalesce(extract(epoch from uptime), 0)::bigint AS uptime_seconds,
|
||||
processes, os, kernel, architecture
|
||||
FROM node_metrics
|
||||
WHERE node_id = $1 AND timestamp BETWEEN $2 AND $3
|
||||
ORDER BY timestamp ASC;
|
||||
|
||||
-- name: ListServiceMetrics :many
|
||||
SELECT service_id, service_name, project_id, timestamp,
|
||||
requests_total, requests_success, requests_errors, requests_avg_latency,
|
||||
requests_p95_latency, requests_p99_latency, requests_throughput,
|
||||
errors_total, errors_rate, performance_response_time, performance_throughput,
|
||||
performance_concurrency, performance_saturation, performance_utilization,
|
||||
resource_cpu_usage, resource_memory_usage, resource_storage_usage,
|
||||
resource_network_usage, resource_score
|
||||
FROM service_metrics
|
||||
WHERE service_id = $1 AND timestamp BETWEEN $2 AND $3
|
||||
ORDER BY timestamp ASC;
|
||||
|
||||
-- name: ListInstanceMetrics :many
|
||||
SELECT instance_id, node_id, status, cpu, memory,
|
||||
network_bytes_in, network_bytes_out, network_packets_in, network_packets_out,
|
||||
network_connections_in, network_connections_out, network_errors_in, network_errors_out,
|
||||
start_time, last_seen, health_status, health_last_check, health_check_count, health_failure_count
|
||||
FROM instance_metrics
|
||||
WHERE service_id = $1 AND timestamp = $2;
|
||||
|
||||
-- name: AggregateNodeMetrics :many
|
||||
-- Portable bucket bucketing (no TimescaleDB): floor epoch seconds into
|
||||
-- bucket-sized buckets, then back to timestamptz.
|
||||
SELECT date_bin($1::interval, timestamp, '2000-01-01'::timestamptz) AS bucket,
|
||||
AVG(cpu_usage)::float8 AS avg_cpu,
|
||||
AVG(memory_usage_percent)::float8 AS avg_memory,
|
||||
AVG(storage_usage_percent)::float8 AS avg_storage
|
||||
FROM node_metrics
|
||||
WHERE node_id = $2 AND timestamp BETWEEN $3 AND $4
|
||||
GROUP BY bucket
|
||||
ORDER BY bucket ASC;
|
||||
@@ -346,3 +346,90 @@ CREATE TABLE notification_channels (
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE TABLE node_metrics (
|
||||
node_id VARCHAR(255) NOT NULL,
|
||||
timestamp TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
cpu_usage NUMERIC(5,2),
|
||||
cpu_cores NUMERIC(10,2),
|
||||
load_avg_1 NUMERIC(5,2),
|
||||
load_avg_5 NUMERIC(5,2),
|
||||
load_avg_15 NUMERIC(5,2),
|
||||
memory_total BIGINT,
|
||||
memory_used BIGINT,
|
||||
memory_available BIGINT,
|
||||
memory_usage_percent NUMERIC(5,2),
|
||||
storage_total BIGINT,
|
||||
storage_used BIGINT,
|
||||
storage_available BIGINT,
|
||||
storage_usage_percent NUMERIC(5,2),
|
||||
network_bytes_in BIGINT,
|
||||
network_bytes_out BIGINT,
|
||||
network_packets_in BIGINT,
|
||||
network_packets_out BIGINT,
|
||||
network_connections_in INTEGER,
|
||||
network_connections_out INTEGER,
|
||||
network_errors_in BIGINT,
|
||||
network_errors_out BIGINT,
|
||||
uptime INTERVAL,
|
||||
processes INTEGER,
|
||||
os VARCHAR(50),
|
||||
kernel VARCHAR(50),
|
||||
architecture VARCHAR(20),
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
PRIMARY KEY (node_id, timestamp)
|
||||
);
|
||||
|
||||
CREATE TABLE service_metrics (
|
||||
service_id VARCHAR(255) NOT NULL,
|
||||
service_name VARCHAR(255) NOT NULL,
|
||||
project_id VARCHAR(255) NOT NULL,
|
||||
timestamp TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
requests_total BIGINT DEFAULT 0,
|
||||
requests_success BIGINT DEFAULT 0,
|
||||
requests_errors BIGINT DEFAULT 0,
|
||||
requests_avg_latency NUMERIC(10,3),
|
||||
requests_p95_latency NUMERIC(10,3),
|
||||
requests_p99_latency NUMERIC(10,3),
|
||||
requests_throughput NUMERIC(10,3),
|
||||
errors_total BIGINT DEFAULT 0,
|
||||
errors_rate NUMERIC(5,4),
|
||||
performance_response_time NUMERIC(10,3),
|
||||
performance_throughput NUMERIC(10,3),
|
||||
performance_concurrency BIGINT,
|
||||
performance_saturation NUMERIC(5,2),
|
||||
performance_utilization NUMERIC(5,2),
|
||||
resource_cpu_usage NUMERIC(5,2),
|
||||
resource_memory_usage BIGINT,
|
||||
resource_storage_usage BIGINT,
|
||||
resource_network_usage BIGINT,
|
||||
resource_score NUMERIC(5,2),
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
PRIMARY KEY (service_id, timestamp)
|
||||
);
|
||||
|
||||
CREATE TABLE instance_metrics (
|
||||
service_id VARCHAR(255) NOT NULL,
|
||||
timestamp TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
instance_id VARCHAR(255) NOT NULL,
|
||||
node_id VARCHAR(255),
|
||||
status VARCHAR(50),
|
||||
cpu NUMERIC(5,2),
|
||||
memory BIGINT,
|
||||
network_bytes_in BIGINT,
|
||||
network_bytes_out BIGINT,
|
||||
network_packets_in BIGINT,
|
||||
network_packets_out BIGINT,
|
||||
network_connections_in INTEGER,
|
||||
network_connections_out INTEGER,
|
||||
network_errors_in BIGINT,
|
||||
network_errors_out BIGINT,
|
||||
start_time TIMESTAMP WITH TIME ZONE,
|
||||
last_seen TIMESTAMP WITH TIME ZONE,
|
||||
health_status VARCHAR(20),
|
||||
health_last_check TIMESTAMP WITH TIME ZONE,
|
||||
health_check_count INTEGER DEFAULT 0,
|
||||
health_failure_count INTEGER DEFAULT 0,
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
PRIMARY KEY (service_id, timestamp, instance_id)
|
||||
);
|
||||
Reference in new issue
Block a user