feat: Implement comprehensive database schema with new models, CRUD operations, and documentation for host metrics, Docker management, and terminal sessions, while removing old test files.
Tests / Backend Tests (Python) (3.10) (push) Has been cancelled
Tests / Backend Tests (Python) (3.11) (push) Has been cancelled
Tests / Backend Tests (Python) (3.12) (push) Has been cancelled
Tests / Frontend Tests (JS) (push) Has been cancelled
Tests / Integration Tests (push) Has been cancelled
Tests / All Tests Passed (push) Has been cancelled
Tests / Backend Tests (Python) (3.10) (push) Has been cancelled
Tests / Backend Tests (Python) (3.11) (push) Has been cancelled
Tests / Backend Tests (Python) (3.12) (push) Has been cancelled
Tests / Frontend Tests (JS) (push) Has been cancelled
Tests / Integration Tests (push) Has been cancelled
Tests / All Tests Passed (push) Has been cancelled
This commit is contained in:
+5
-1
@@ -5,7 +5,8 @@ from logging.config import fileConfig
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
from sqlalchemy import pool
|
||||
from sqlalchemy import pool, text
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.engine import Connection
|
||||
from sqlalchemy.ext.asyncio import async_engine_from_config
|
||||
|
||||
@@ -50,6 +51,7 @@ def run_migrations_offline() -> None:
|
||||
literal_binds=True,
|
||||
dialect_opts={"paramstyle": "named"},
|
||||
compare_type=True,
|
||||
version_table_col_args={'type_': sa.String(255)},
|
||||
)
|
||||
|
||||
with context.begin_transaction():
|
||||
@@ -57,10 +59,12 @@ def run_migrations_offline() -> None:
|
||||
|
||||
|
||||
def do_run_migrations(connection: Connection) -> None:
|
||||
print(f"[Alembic] Configuring context for connection {connection}")
|
||||
context.configure(
|
||||
connection=connection,
|
||||
target_metadata=target_metadata,
|
||||
compare_type=True,
|
||||
version_table_col_args={'type_': sa.String(255)},
|
||||
)
|
||||
|
||||
with context.begin_transaction():
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
"""${message}
|
||||
|
||||
Revision ID: ${up_revision}
|
||||
Revises: ${down_revision | comma,n}
|
||||
Create Date: ${create_date}
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
${imports if imports else ""}
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = ${repr(up_revision)}
|
||||
down_revision: Union[str, None] = ${repr(down_revision)}
|
||||
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
${upgrades if upgrades else "pass"}
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
${downgrades if downgrades else "pass"}
|
||||
@@ -20,11 +20,11 @@ depends_on = None
|
||||
def upgrade() -> None:
|
||||
op.create_table(
|
||||
"hosts",
|
||||
sa.Column("id", sa.String(), primary_key=True),
|
||||
sa.Column("name", sa.String(), nullable=False),
|
||||
sa.Column("ip_address", sa.String(), nullable=False, unique=True),
|
||||
sa.Column("status", sa.String(), nullable=False, server_default=sa.text("'unknown'")),
|
||||
sa.Column("ansible_group", sa.String(), nullable=True),
|
||||
sa.Column("id", sa.String(255), primary_key=True),
|
||||
sa.Column("name", sa.String(255), nullable=False),
|
||||
sa.Column("ip_address", sa.String(255), nullable=False, unique=True),
|
||||
sa.Column("status", sa.String(255), nullable=False, server_default=sa.text("'unknown'")),
|
||||
sa.Column("ansible_group", sa.String(255), nullable=True),
|
||||
sa.Column("last_seen", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("reachable", sa.Boolean(), nullable=False, server_default=sa.text("0")),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
@@ -35,9 +35,9 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
"bootstrap_status",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
||||
sa.Column("host_id", sa.String(), sa.ForeignKey("hosts.id", ondelete="CASCADE"), nullable=False),
|
||||
sa.Column("status", sa.String(), nullable=False),
|
||||
sa.Column("automation_user", sa.String(), nullable=True),
|
||||
sa.Column("host_id", sa.String(255), sa.ForeignKey("hosts.id", ondelete="CASCADE"), nullable=False),
|
||||
sa.Column("status", sa.String(255), nullable=False),
|
||||
sa.Column("automation_user", sa.String(255), nullable=True),
|
||||
sa.Column("last_attempt", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("error_message", sa.Text(), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
@@ -45,11 +45,11 @@ def upgrade() -> None:
|
||||
|
||||
op.create_table(
|
||||
"tasks",
|
||||
sa.Column("id", sa.String(), primary_key=True),
|
||||
sa.Column("action", sa.String(), nullable=False),
|
||||
sa.Column("target", sa.String(), nullable=False),
|
||||
sa.Column("status", sa.String(), nullable=False, server_default=sa.text("'pending'")),
|
||||
sa.Column("playbook", sa.String(), nullable=True),
|
||||
sa.Column("id", sa.String(255), primary_key=True),
|
||||
sa.Column("action", sa.String(255), nullable=False),
|
||||
sa.Column("target", sa.String(255), nullable=False),
|
||||
sa.Column("status", sa.String(255), nullable=False, server_default=sa.text("'pending'")),
|
||||
sa.Column("playbook", sa.String(255), nullable=True),
|
||||
sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("error_message", sa.Text(), nullable=True),
|
||||
@@ -59,16 +59,16 @@ def upgrade() -> None:
|
||||
|
||||
op.create_table(
|
||||
"schedules",
|
||||
sa.Column("id", sa.String(), primary_key=True),
|
||||
sa.Column("name", sa.String(), nullable=False),
|
||||
sa.Column("playbook", sa.String(), nullable=False),
|
||||
sa.Column("target", sa.String(), nullable=False),
|
||||
sa.Column("schedule_type", sa.String(), nullable=False),
|
||||
sa.Column("id", sa.String(255), primary_key=True),
|
||||
sa.Column("name", sa.String(255), nullable=False),
|
||||
sa.Column("playbook", sa.String(255), nullable=False),
|
||||
sa.Column("target", sa.String(255), nullable=False),
|
||||
sa.Column("schedule_type", sa.String(255), nullable=False),
|
||||
sa.Column("schedule_time", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("recurrence_type", sa.String(), nullable=True),
|
||||
sa.Column("recurrence_time", sa.String(), nullable=True),
|
||||
sa.Column("recurrence_type", sa.String(255), nullable=True),
|
||||
sa.Column("recurrence_time", sa.String(255), nullable=True),
|
||||
sa.Column("recurrence_days", sa.Text(), nullable=True),
|
||||
sa.Column("cron_expression", sa.String(), nullable=True),
|
||||
sa.Column("cron_expression", sa.String(255), nullable=True),
|
||||
sa.Column("enabled", sa.Boolean(), nullable=False, server_default=sa.text("1")),
|
||||
sa.Column("tags", sa.Text(), nullable=True),
|
||||
sa.Column("next_run", sa.DateTime(timezone=True), nullable=True),
|
||||
@@ -81,9 +81,9 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
"schedule_runs",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
||||
sa.Column("schedule_id", sa.String(), sa.ForeignKey("schedules.id", ondelete="CASCADE"), nullable=False),
|
||||
sa.Column("task_id", sa.String(), sa.ForeignKey("tasks.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("status", sa.String(), nullable=False),
|
||||
sa.Column("schedule_id", sa.String(255), sa.ForeignKey("schedules.id", ondelete="CASCADE"), nullable=False),
|
||||
sa.Column("task_id", sa.String(255), sa.ForeignKey("tasks.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("status", sa.String(255), nullable=False),
|
||||
sa.Column("started_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
|
||||
sa.Column("duration", sa.Float(), nullable=True),
|
||||
@@ -95,13 +95,13 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
"logs",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
||||
sa.Column("level", sa.String(), nullable=False),
|
||||
sa.Column("source", sa.String(), nullable=True),
|
||||
sa.Column("level", sa.String(255), nullable=False),
|
||||
sa.Column("source", sa.String(255), nullable=True),
|
||||
sa.Column("message", sa.Text(), nullable=False),
|
||||
sa.Column("details", sa.JSON(), nullable=True),
|
||||
sa.Column("host_id", sa.String(), sa.ForeignKey("hosts.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("task_id", sa.String(), sa.ForeignKey("tasks.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("schedule_id", sa.String(), sa.ForeignKey("schedules.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("host_id", sa.String(255), sa.ForeignKey("hosts.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("task_id", sa.String(255), sa.ForeignKey("tasks.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("schedule_id", sa.String(255), sa.ForeignKey("schedules.id", ondelete="SET NULL"), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
)
|
||||
|
||||
|
||||
@@ -20,12 +20,12 @@ depends_on = None
|
||||
def upgrade() -> None:
|
||||
# Ajouter les colonnes manquantes à la table schedules
|
||||
op.add_column("schedules", sa.Column("description", sa.Text(), nullable=True))
|
||||
op.add_column("schedules", sa.Column("target_type", sa.String(), nullable=True, server_default="group"))
|
||||
op.add_column("schedules", sa.Column("target_type", sa.String(255), nullable=True, server_default="group"))
|
||||
op.add_column("schedules", sa.Column("extra_vars", sa.JSON(), nullable=True))
|
||||
op.add_column("schedules", sa.Column("timezone", sa.String(), nullable=True, server_default="America/Montreal"))
|
||||
op.add_column("schedules", sa.Column("timezone", sa.String(255), nullable=True, server_default="America/Montreal"))
|
||||
op.add_column("schedules", sa.Column("start_at", sa.DateTime(timezone=True), nullable=True))
|
||||
op.add_column("schedules", sa.Column("end_at", sa.DateTime(timezone=True), nullable=True))
|
||||
op.add_column("schedules", sa.Column("last_status", sa.String(), nullable=True, server_default="never"))
|
||||
op.add_column("schedules", sa.Column("last_status", sa.String(255), nullable=True, server_default="never"))
|
||||
op.add_column("schedules", sa.Column("retry_on_failure", sa.Integer(), nullable=True, server_default="0"))
|
||||
op.add_column("schedules", sa.Column("timeout", sa.Integer(), nullable=True, server_default="3600"))
|
||||
op.add_column("schedules", sa.Column("run_count", sa.Integer(), nullable=True, server_default="0"))
|
||||
|
||||
@@ -22,7 +22,7 @@ def upgrade() -> None:
|
||||
"""Add notification_type column to schedules table."""
|
||||
op.add_column(
|
||||
'schedules',
|
||||
sa.Column('notification_type', sa.String(), nullable=True, server_default='all')
|
||||
sa.Column('notification_type', sa.String(255), nullable=True, server_default='all')
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'host_metrics',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('metric_type', sa.String(50), nullable=False),
|
||||
|
||||
# CPU metrics
|
||||
|
||||
@@ -25,13 +25,13 @@ def upgrade():
|
||||
op.create_table(
|
||||
'logs_new',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('level', sa.String(), nullable=False),
|
||||
sa.Column('source', sa.String(), nullable=True),
|
||||
sa.Column('level', sa.String(255), nullable=False),
|
||||
sa.Column('source', sa.String(255), nullable=True),
|
||||
sa.Column('message', sa.Text(), nullable=False),
|
||||
sa.Column('details', sa.JSON(), nullable=True),
|
||||
sa.Column('host_id', sa.String(), nullable=True),
|
||||
sa.Column('task_id', sa.String(), nullable=True),
|
||||
sa.Column('schedule_id', sa.String(), nullable=True),
|
||||
sa.Column('host_id', sa.String(255), nullable=True),
|
||||
sa.Column('task_id', sa.String(255), nullable=True),
|
||||
sa.Column('schedule_id', sa.String(255), nullable=True),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
|
||||
@@ -29,7 +29,7 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'docker_containers',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('container_id', sa.String(64), nullable=False),
|
||||
sa.Column('name', sa.String(255), nullable=False),
|
||||
sa.Column('image', sa.String(255), nullable=True),
|
||||
@@ -51,7 +51,7 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'docker_images',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('image_id', sa.String(64), nullable=False),
|
||||
sa.Column('repo_tags', sa.JSON(), nullable=True),
|
||||
sa.Column('size', sa.BigInteger(), nullable=True),
|
||||
@@ -66,7 +66,7 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'docker_volumes',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('name', sa.String(255), nullable=False),
|
||||
sa.Column('driver', sa.String(50), nullable=True),
|
||||
sa.Column('mountpoint', sa.Text(), nullable=True),
|
||||
@@ -81,7 +81,7 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'docker_alerts',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('container_name', sa.String(255), nullable=False),
|
||||
sa.Column('severity', sa.String(20), nullable=False, server_default='warning'),
|
||||
sa.Column('state', sa.String(20), nullable=False, server_default='open'),
|
||||
|
||||
@@ -26,8 +26,10 @@ def upgrade() -> None:
|
||||
op.execute("""
|
||||
DELETE FROM docker_containers
|
||||
WHERE id NOT IN (
|
||||
SELECT MAX(id) FROM docker_containers
|
||||
GROUP BY host_id, container_id
|
||||
SELECT id FROM (
|
||||
SELECT MAX(id) AS id FROM docker_containers
|
||||
GROUP BY host_id, container_id
|
||||
) AS tmp
|
||||
)
|
||||
""")
|
||||
|
||||
@@ -35,8 +37,10 @@ def upgrade() -> None:
|
||||
op.execute("""
|
||||
DELETE FROM docker_images
|
||||
WHERE id NOT IN (
|
||||
SELECT MAX(id) FROM docker_images
|
||||
GROUP BY host_id, image_id
|
||||
SELECT id FROM (
|
||||
SELECT MAX(id) AS id FROM docker_images
|
||||
GROUP BY host_id, image_id
|
||||
) AS tmp
|
||||
)
|
||||
""")
|
||||
|
||||
@@ -44,8 +48,10 @@ def upgrade() -> None:
|
||||
op.execute("""
|
||||
DELETE FROM docker_volumes
|
||||
WHERE id NOT IN (
|
||||
SELECT MAX(id) FROM docker_volumes
|
||||
GROUP BY host_id, name
|
||||
SELECT id FROM (
|
||||
SELECT MAX(id) AS id FROM docker_volumes
|
||||
GROUP BY host_id, name
|
||||
) AS tmp
|
||||
)
|
||||
""")
|
||||
|
||||
|
||||
@@ -22,11 +22,11 @@ def upgrade() -> None:
|
||||
op.create_table(
|
||||
'terminal_sessions',
|
||||
sa.Column('id', sa.String(64), primary_key=True),
|
||||
sa.Column('host_id', sa.String(), nullable=False, index=True),
|
||||
sa.Column('host_name', sa.String(), nullable=False),
|
||||
sa.Column('host_ip', sa.String(), nullable=False),
|
||||
sa.Column('user_id', sa.String(), nullable=True),
|
||||
sa.Column('username', sa.String(), nullable=True),
|
||||
sa.Column('host_id', sa.String(255), nullable=False, index=True),
|
||||
sa.Column('host_name', sa.String(255), nullable=False),
|
||||
sa.Column('host_ip', sa.String(255), nullable=False),
|
||||
sa.Column('user_id', sa.Integer(), nullable=True),
|
||||
sa.Column('username', sa.String(255), nullable=True),
|
||||
sa.Column('token_hash', sa.String(128), nullable=False),
|
||||
sa.Column('ttyd_port', sa.Integer(), nullable=False),
|
||||
sa.Column('ttyd_pid', sa.Integer(), nullable=True),
|
||||
|
||||
@@ -43,8 +43,8 @@ def upgrade() -> None:
|
||||
'terminal_command_logs',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('user_id', sa.String(), nullable=True),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('user_id', sa.Integer(), nullable=True),
|
||||
sa.Column('terminal_session_id', sa.String(64), nullable=True),
|
||||
sa.Column('command', sa.Text(), nullable=False),
|
||||
sa.Column('command_hash', sa.String(64), nullable=False),
|
||||
|
||||
@@ -41,7 +41,7 @@ def upgrade() -> None:
|
||||
'container_customizations',
|
||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||
sa.Column('user_id', sa.Integer(), nullable=True),
|
||||
sa.Column('host_id', sa.String(), nullable=False),
|
||||
sa.Column('host_id', sa.String(255), nullable=False),
|
||||
sa.Column('container_id', sa.String(length=64), nullable=False),
|
||||
sa.Column('icon_key', sa.String(length=100), nullable=True),
|
||||
sa.Column('icon_color', sa.String(length=20), nullable=True),
|
||||
|
||||
Reference in New Issue
Block a user