Merge branch 'main' of https://github.com/PenginYY/Orchestronic

Author: PenginYY

Dockerfile

@@ -0,0 +1,37 @@
+FROM apache/airflow:2.10.4
+
+# Switch to root to install system dependencies
+USER root
+
+# Install system dependencies with GPG signature verification workaround
+USER root
+RUN apt-get update -o Acquire::AllowInsecureRepositories=true \
+    && apt-get install -y --no-install-recommends --allow-unauthenticated \
+    curl \
+    unzip \
+    gnupg \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Terraform 1.5.7
+RUN curl -fsSL https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_amd64.zip -o terraform.zip && \
+    unzip terraform.zip -d /usr/local/bin && \
+    rm terraform.zip && \
+    terraform --version  # Verify installation
+
+# Switch back to the airflow user
+USER airflow
+WORKDIR /opt/airflow
+
+# Copy and install Python dependencies
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of your application code
+COPY . .
+
+# Expose the port for the Airflow webserver
+EXPOSE 8081
+
+# Set the default command to start the webserver
+CMD ["airflow", "webserver", "--port", "8081"]

Dockerfile.airflow

@@ -0,0 +1 @@
+FROM alpine

Dockerfile.dummy

@@ -0,0 +1,13 @@
+FROM node:20-slim
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm install
+
+COPY ./server/server.js ./
+
+EXPOSE 4000
+
+CMD ["node", "server.js"]

Dockerfile.socket-server

@@ -0,0 +1,15 @@
+FROM node:20
+
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+
+RUN npm install
+
+COPY . .
+
+RUN npm run build 
+
+EXPOSE 3000
+
+CMD ["npm", "run", "start"]

Dockerfile.website

@@ -0,0 +1,37 @@
+version: "3"
+services:
+  website:
+    image: orchestronic.azurecr.io/orchestronic-app:website-latest
+    ports:
+      - "8080:3000"
+    environment:
+      - NODE_ENV=production
+    command: ["npm", "run", "start"]
+  socket-server:
+    image: orchestronic.azurecr.io/orchestronic-app:socket-server-latest
+    ports:
+      - "4000:4000"
+    environment:
+      - NODE_ENV=production
+    command: ["node", "server.js"]
+  postgres:
+    image: postgres:13
+    environment:
+      POSTGRES_USER: airflow
+      POSTGRES_PASSWORD: airflow
+      POSTGRES_DB: airflow
+  redis:
+    image: redis:7.2-bookworm
+    expose:
+      - 6379
+  airflow-webserver:
+    image: orchestronic.azurecr.io/orchestronic-app:airflow-webserver-latest
+    command: webserver -p 8081
+    ports:
+      - "8081:8081"
+    environment:
+      AIRFLOW__CORE__EXECUTOR: CeleryExecutor
+      AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@postgres/airflow
+      AIRFLOW__CELERY__RESULT_BACKEND: db+postgresql://airflow:airflow@postgres/airflow
+      AIRFLOW__CELERY__BROKER_URL: redis://:@redis:6379/0
+      AIRFLOW__WEBSERVER__WEB_SERVER_PORT: "8081"

debug.log

@@ -49,8 +49,12 @@ x-airflow-common: &airflow-common
   # Comment the image line, place your Dockerfile in the directory where you placed the docker-compose.yaml
   # and uncomment the "build" line below, Then run `docker-compose build` to build the images.
   # image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.10.4}
-  build: .
+  build:
+    context: .
+    dockerfile: Dockerfile.airflow
+  image: ${AIRFLOW_IMAGE:-orchestronic.azurecr.io/orchestronic-app:airflow-webserver-latest}
   environment: &airflow-common-env
+    PYTHONWARNINGS: "ignore"
     AIRFLOW__CORE__EXECUTOR: CeleryExecutor
     AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@postgres/airflow
     AIRFLOW__CELERY__RESULT_BACKEND: db+postgresql://airflow:airflow@postgres/airflow
@@ -83,6 +87,33 @@ x-airflow-common: &airflow-common
       condition: service_healthy
 
 services:
+  website:
+    build:
+      context: .
+      dockerfile: Dockerfile.website
+    image: ${WEBSITE_IMAGE:-orchestronic.azurecr.io/orchestronic-app:website-latest}
+    ports:
+      - "8080:3000"
+    environment:
+      - NODE_ENV=production
+    command: ["npm", "run", start]
+    depends_on:
+      - socket-server
+    restart: always
+
+  socket-server:
+    build:
+      context: .
+      dockerfile: Dockerfile.socket-server
+    image: ${WEBSITE_IMAGE:-orchestronic.azurecr.io/orchestronic-app:socket-server-latest}
+    ports:
+      - "4000:4000"
+    environment:
+      - NODE_ENV=production
+    working_dir: /server
+    command: ["node", "server.js"]
+    restart: always
+
   rabbitmq:
     image: rabbitmq:management-alpine
     tty: true
@@ -128,9 +159,12 @@ services:
     <<: *airflow-common
     command: webserver
     ports:
-      - "8080:8080"
+      - "8081:8081"
+    environment:
+      <<: *airflow-common-env
+      AIRFLOW__WEBSERVER__WEB_SERVER_PORT: "8081"
     healthcheck:
-      test: ["CMD", "curl", "--fail", "http://localhost:8080/health"]
+      test: ["CMD", "curl", "--fail", "http://localhost:8081/health"]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -260,7 +294,7 @@ services:
       _PIP_ADDITIONAL_REQUIREMENTS: ""
     user: "0:0"
     volumes:
-      - ${AIRFLOW_PROJ_DIR:-.}:/sources
+      - ${AIRFLOW_PROJ_DIR:-.}:/opt/airflow
 
   airflow-cli:
     <<: *airflow-common

docker-compose-minimal.yaml

@@ -4,7 +4,7 @@ const notificationSchema = new Schema({
   projectName: { type: String },
   detail: { type: String },
   userId: { type: String },
-  date: { type: Date },
+  date: { type: Date, default: Date.now },
 });
 
 const Notification =

docker-compose.yaml

@@ -1,13 +1,11 @@
 import mongoose, { Schema } from "mongoose";
 
 const requesttypeSchema = new Schema({
-  projectid: { 
-    type: String,
-    ref: "Project"
-  },
-  status: { type: String },
+  projectid: { type: String, required: true },
+  status: { type: String, required: true },
 });
 
 const Requesttype =
-  mongoose.models.Requesttype || mongoose.model("Requesttype", requesttypeSchema);
+  mongoose.models.Requesttype ||
+  mongoose.model("Requesttype", requesttypeSchema);
 export default Requesttype;

models/notification.js

@@ -0,0 +1,12 @@
+properties:
+  configuration:
+    minReplicas: 1
+    maxReplicas: 10
+  template:
+    scale:
+      rules:
+        - name: cpu-scale
+          custom:
+            type: cpu
+            metadata:
+              value: "80" # CPU usage percentage (80%)

models/requesttype.js

@@ -1,5 +1,5 @@
 import { connectMongoDB } from "../../../../lib/mongodb";
-import Request from "../../../../models/requesttype";
+import Request from "../../../../models/request";
 import { NextResponse } from "next/server";
 
 export async function GET(req) {

scaling.yaml

@@ -17,21 +17,33 @@ export async function GET(req) {
 }
 
 export async function POST(req) {
-  // Connect to MongoDB
-  await connectMongoDB();
+  try {
+    await connectMongoDB();
 
-  const url = new URL(req.url);
-  const projectid = url.searchParams.get("projectid");
-  
-  const requesttype = await Requesttype({
-    projectid,
-    status: "created",
-  }).save();
+    // Parse the JSON body from the request
+    const body = await req.json();
 
-  return NextResponse.json(
-    { message: "Successfully added requests", requests: requesttype },
-    { status: 201 }
-  );
+    // Validate required fields
+    if (!body.projectid) throw new Error("Missing projectid");
+
+    // Set default status if not provided
+    const requestData = {
+      projectid: body.projectid,
+      status: body.status,
+    };
+
+    // Save to database
+    const requesttype = new Requesttype(requestData);
+    const saveRequestType = await requesttype.save();
+
+    return NextResponse.json({ saveRequestType }, { status: 200 });
+  } catch (error) {
+    console.error("Error creating request:", error);
+    return NextResponse.json(
+      { message: "Error creating request", error: error.message },
+      { status: 500 }
+    );
+  }
 }
 
 export async function PUT(req) {
@@ -43,25 +55,26 @@ export async function PUT(req) {
 
     // Update requesttype or create if it doesn't exist
     const updatedRequestType = await Requesttype.findOneAndUpdate(
-        { projectid },
-        { status },
-        { new: true, upsert: true }
-      );
-  
-      return NextResponse.json(
-        { message: "Successfully updated request type", requesttype: updatedRequestType },
-        { status: 200 }
-      );
-    } catch (error) {
-      console.error("Error updating request type:", error);
-      return NextResponse.json(
-        { message: "Internal Server Error", error: error.message },
-        { status: 500 }
-      );
-    }
-  }
+      { projectid },
+      { status },
+      { new: true, upsert: true }
+    );
 
-  
+    return NextResponse.json(
+      {
+        message: "Successfully updated request type",
+        requesttype: updatedRequestType,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error("Error updating request type:", error);
+    return NextResponse.json(
+      { message: "Internal Server Error", error: error.message },
+      { status: 500 }
+    );
+  }
+}
 
 export async function DELETE(req) {
   await connectMongoDB();
@@ -81,4 +94,4 @@ export async function DELETE(req) {
     { message: "Request type deleted successfully" },
     { status: 200 }
   );
-}
+}

server/dist/server.js renamed to server/server.js

@@ -27,7 +27,7 @@ export default function HomePage() {
 
       const data = await res.json();
       setNotificationList(data);
-      // console.log("Notifications:", data);
+      console.log("Notifications:", data);
       return data;
     } catch (error) {
       console.error("Error fetching notifications:", error);
@@ -128,7 +128,12 @@ export default function HomePage() {
 
                     {/* Footer Section */}
                     <div className="flex justify-between items-center mt-2 text-xs text-gray-500">
-                      <p>Date: {new Date().toLocaleDateString()}</p>
+                      <p>
+                        Date:{" "}
+                        {new Date(notification.date).toLocaleDateString(
+                          "en-US"
+                        )}
+                      </p>
                       <div className="flex items-center gap-2">
                         <Image
                           src={bell}