Compare commits
1 Commits
fix/deploy
...
fix/dashbo
| Author | SHA1 | Date | |
|---|---|---|---|
| a8930317ce |
@@ -337,44 +337,3 @@ steps:
|
|||||||
- security-trivy-api
|
- security-trivy-api
|
||||||
- security-trivy-orchestrator
|
- security-trivy-orchestrator
|
||||||
- security-trivy-web
|
- security-trivy-web
|
||||||
|
|
||||||
# ─── Deploy to Docker Swarm (main only) ─────────────────────
|
|
||||||
|
|
||||||
# ─── Deploy to Docker Swarm via Portainer (main only) ─────────────────────
|
|
||||||
|
|
||||||
deploy-swarm:
|
|
||||||
image: alpine:3
|
|
||||||
environment:
|
|
||||||
SSH_PRIVATE_KEY:
|
|
||||||
from_secret: ssh_private_key
|
|
||||||
SSH_KNOWN_HOSTS:
|
|
||||||
from_secret: ssh_known_hosts
|
|
||||||
PORTAINER_URL:
|
|
||||||
from_secret: portainer_url
|
|
||||||
PORTAINER_API_KEY:
|
|
||||||
from_secret: portainer_api_key
|
|
||||||
commands:
|
|
||||||
- apk add --no-cache curl openssh-client
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
echo "🚀 Deploying to Docker Swarm..."
|
|
||||||
|
|
||||||
# Setup SSH for fallback
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
|
|
||||||
chmod 600 ~/.ssh/known_hosts
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519
|
|
||||||
chmod 600 ~/.ssh/id_ed25519
|
|
||||||
|
|
||||||
# Force service updates (images are pulled from public registry)
|
|
||||||
ssh -o StrictHostKeyChecking=no localadmin@10.1.1.45 \
|
|
||||||
"docker service update --with-registry-auth --force mosaic-stack-api && \
|
|
||||||
docker service update --with-registry-auth --force mosaic-stack-web && \
|
|
||||||
docker service update --with-registry-auth --force mosaic-stack-orchestrator && \
|
|
||||||
docker service update --with-registry-auth --force mosaic-stack-coordinator && \
|
|
||||||
echo '✅ All services updated'"
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- link-packages
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Controller, Get, Query, Res, UseGuards } from "@nestjs/common";
|
import { Controller, Get, Res, UseGuards } from "@nestjs/common";
|
||||||
import { AgentStatus } from "@prisma/client";
|
import { AgentStatus } from "@prisma/client";
|
||||||
import type { Response } from "express";
|
import type { Response } from "express";
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
import { AuthGuard } from "../auth/guards/auth.guard";
|
||||||
@@ -6,7 +6,6 @@ import { PrismaService } from "../prisma/prisma.service";
|
|||||||
|
|
||||||
const AGENT_POLL_INTERVAL_MS = 5_000;
|
const AGENT_POLL_INTERVAL_MS = 5_000;
|
||||||
const SSE_HEARTBEAT_MS = 15_000;
|
const SSE_HEARTBEAT_MS = 15_000;
|
||||||
const DEFAULT_EVENTS_LIMIT = 25;
|
|
||||||
|
|
||||||
interface OrchestratorAgentDto {
|
interface OrchestratorAgentDto {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -16,26 +15,6 @@ interface OrchestratorAgentDto {
|
|||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface OrchestratorEventDto {
|
|
||||||
type: string;
|
|
||||||
timestamp: string;
|
|
||||||
agentId?: string;
|
|
||||||
taskId?: string;
|
|
||||||
data?: Record<string, unknown>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface OrchestratorHealthDto {
|
|
||||||
status: "healthy" | "degraded" | "unhealthy";
|
|
||||||
database: "connected" | "disconnected";
|
|
||||||
agents: {
|
|
||||||
total: number;
|
|
||||||
working: number;
|
|
||||||
idle: number;
|
|
||||||
errored: number;
|
|
||||||
};
|
|
||||||
timestamp: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Controller("orchestrator")
|
@Controller("orchestrator")
|
||||||
@UseGuards(AuthGuard)
|
@UseGuards(AuthGuard)
|
||||||
export class OrchestratorController {
|
export class OrchestratorController {
|
||||||
@@ -46,81 +25,6 @@ export class OrchestratorController {
|
|||||||
return this.fetchActiveAgents();
|
return this.fetchActiveAgents();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("events/recent")
|
|
||||||
async getRecentEvents(
|
|
||||||
@Query("limit") limit?: string
|
|
||||||
): Promise<{ events: OrchestratorEventDto[] }> {
|
|
||||||
const eventsLimit = limit ? parseInt(limit, 10) : DEFAULT_EVENTS_LIMIT;
|
|
||||||
const safeLimit = Math.min(Math.max(eventsLimit, 1), 100);
|
|
||||||
|
|
||||||
// Fetch recent agent activity to derive events
|
|
||||||
const agents = await this.prisma.agent.findMany({
|
|
||||||
where: {
|
|
||||||
status: {
|
|
||||||
not: AgentStatus.TERMINATED,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
orderBy: {
|
|
||||||
createdAt: "desc",
|
|
||||||
},
|
|
||||||
take: safeLimit,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Derive events from agent status changes
|
|
||||||
const events: OrchestratorEventDto[] = agents.map((agent) => ({
|
|
||||||
type: `agent:${agent.status.toLowerCase()}`,
|
|
||||||
timestamp: agent.createdAt.toISOString(),
|
|
||||||
agentId: agent.id,
|
|
||||||
data: {
|
|
||||||
name: agent.name,
|
|
||||||
role: agent.role,
|
|
||||||
model: agent.model,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
return { events };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get("health")
|
|
||||||
async getHealth(): Promise<OrchestratorHealthDto> {
|
|
||||||
let databaseConnected = false;
|
|
||||||
let agents: OrchestratorAgentDto[] = [];
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Check database connectivity
|
|
||||||
await this.prisma.$queryRaw`SELECT 1`;
|
|
||||||
databaseConnected = true;
|
|
||||||
|
|
||||||
// Get agent counts
|
|
||||||
agents = await this.fetchActiveAgents();
|
|
||||||
} catch {
|
|
||||||
databaseConnected = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const working = agents.filter((a) => a.status === AgentStatus.WORKING).length;
|
|
||||||
const idle = agents.filter((a) => a.status === AgentStatus.IDLE).length;
|
|
||||||
const errored = agents.filter((a) => a.status === AgentStatus.ERROR).length;
|
|
||||||
|
|
||||||
let status: OrchestratorHealthDto["status"] = "healthy";
|
|
||||||
if (!databaseConnected) {
|
|
||||||
status = "unhealthy";
|
|
||||||
} else if (errored > 0) {
|
|
||||||
status = "degraded";
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
status,
|
|
||||||
database: databaseConnected ? "connected" : "disconnected",
|
|
||||||
agents: {
|
|
||||||
total: agents.length,
|
|
||||||
working,
|
|
||||||
idle,
|
|
||||||
errored,
|
|
||||||
},
|
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get("events")
|
@Get("events")
|
||||||
async streamEvents(@Res() res: Response): Promise<void> {
|
async streamEvents(@Res() res: Response): Promise<void> {
|
||||||
res.setHeader("Content-Type", "text/event-stream");
|
res.setHeader("Content-Type", "text/event-stream");
|
||||||
|
|||||||
@@ -16,21 +16,6 @@ interface Agent {
|
|||||||
error?: string;
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isWorking(status: string): boolean {
|
|
||||||
const s = status.toLowerCase();
|
|
||||||
return s === "running" || s === "working";
|
|
||||||
}
|
|
||||||
|
|
||||||
function isIdle(status: string): boolean {
|
|
||||||
const s = status.toLowerCase();
|
|
||||||
return s === "idle" || s === "spawning" || s === "waiting" || s === "queued";
|
|
||||||
}
|
|
||||||
|
|
||||||
function isErrored(status: string): boolean {
|
|
||||||
const s = status.toLowerCase();
|
|
||||||
return s === "failed" || s === "error";
|
|
||||||
}
|
|
||||||
|
|
||||||
export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): React.JSX.Element {
|
export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): React.JSX.Element {
|
||||||
const [agents, setAgents] = useState<Agent[]>([]);
|
const [agents, setAgents] = useState<Agent[]>([]);
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
@@ -89,20 +74,25 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
|
|||||||
}, [fetchAgents]);
|
}, [fetchAgents]);
|
||||||
|
|
||||||
const getStatusIcon = (status: string): React.JSX.Element => {
|
const getStatusIcon = (status: string): React.JSX.Element => {
|
||||||
if (isWorking(status)) {
|
const statusLower = status.toLowerCase();
|
||||||
return <Activity className="w-4 h-4 text-blue-500 animate-pulse" />;
|
switch (statusLower) {
|
||||||
|
case "running":
|
||||||
|
case "working":
|
||||||
|
return <Activity className="w-4 h-4 text-blue-500 animate-pulse" />;
|
||||||
|
case "spawning":
|
||||||
|
case "queued":
|
||||||
|
return <Clock className="w-4 h-4 text-yellow-500" />;
|
||||||
|
case "completed":
|
||||||
|
return <CheckCircle className="w-4 h-4 text-green-500" />;
|
||||||
|
case "failed":
|
||||||
|
case "error":
|
||||||
|
return <AlertCircle className="w-4 h-4 text-red-500" />;
|
||||||
|
case "terminated":
|
||||||
|
case "killed":
|
||||||
|
return <CheckCircle className="w-4 h-4 text-gray-500" />;
|
||||||
|
default:
|
||||||
|
return <Clock className="w-4 h-4 text-gray-400" />;
|
||||||
}
|
}
|
||||||
if (isIdle(status)) {
|
|
||||||
return <Clock className="w-4 h-4 text-yellow-500" />;
|
|
||||||
}
|
|
||||||
if (isErrored(status)) {
|
|
||||||
return <AlertCircle className="w-4 h-4 text-red-500" />;
|
|
||||||
}
|
|
||||||
const s = status.toLowerCase();
|
|
||||||
if (s === "completed" || s === "terminated" || s === "killed") {
|
|
||||||
return <CheckCircle className="w-4 h-4 text-gray-500" />;
|
|
||||||
}
|
|
||||||
return <Clock className="w-4 h-4 text-gray-400" />;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const getStatusText = (status: string): string => {
|
const getStatusText = (status: string): string => {
|
||||||
@@ -131,9 +121,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
|
|||||||
|
|
||||||
const stats = {
|
const stats = {
|
||||||
total: agents.length,
|
total: agents.length,
|
||||||
working: agents.filter((a) => isWorking(a.status)).length,
|
working: agents.filter((a) => a.status.toLowerCase() === "running").length,
|
||||||
idle: agents.filter((a) => isIdle(a.status)).length,
|
idle: agents.filter((a) => a.status.toLowerCase() === "spawning").length,
|
||||||
error: agents.filter((a) => isErrored(a.status)).length,
|
error: agents.filter((a) => a.status.toLowerCase() === "failed").length,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
@@ -186,9 +176,9 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
|
|||||||
<div
|
<div
|
||||||
key={agent.agentId}
|
key={agent.agentId}
|
||||||
className={`p-3 rounded-lg border ${
|
className={`p-3 rounded-lg border ${
|
||||||
isErrored(agent.status)
|
agent.status.toLowerCase() === "failed"
|
||||||
? "bg-red-50 border-red-200"
|
? "bg-red-50 border-red-200"
|
||||||
: isWorking(agent.status)
|
: agent.status.toLowerCase() === "running"
|
||||||
? "bg-blue-50 border-blue-200"
|
? "bg-blue-50 border-blue-200"
|
||||||
: "bg-gray-50 border-gray-200"
|
: "bg-gray-50 border-gray-200"
|
||||||
}`}
|
}`}
|
||||||
|
|||||||
Reference in New Issue
Block a user