feat: Update SCIM documentation URLs to use environment configuration

- Implemented StatusPageSCIM model with necessary fields and access controls.
- Created migration script to set up StatusPageSCIM table in the database.
- Developed StatusPageSCIMService for handling SCIM configurations, including bearer token generation.
- Added SCIM management page in the dashboard with functionalities for creating, editing, and resetting bearer tokens.

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -31,7 +31,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -46,7 +46,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -61,7 +61,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -76,7 +76,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -91,7 +91,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -106,7 +106,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -122,7 +122,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -137,7 +137,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -154,7 +154,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -169,7 +169,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -185,7 +185,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -200,7 +200,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -209,29 +209,13 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Dashboard/Dockerfile .
 
-  docker-build-haraka:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build images
-      - name: build docker image
-        run: sudo docker build -f ./Haraka/Dockerfile .
-
-
   docker-build-probe:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       
       - name: Preinstall 
         run: npm run prerun
@@ -240,20 +224,80 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Probe/Dockerfile .
 
-  docker-build-ingestor:
+  docker-build-probe-ingest:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       
       - name: Preinstall 
         run: npm run prerun
         
       # build image probe api
       - name: build docker image
-        run: sudo docker build -f ./Ingestor/Dockerfile .
+        run: sudo docker build -f ./ProbeIngest/Dockerfile .
+
+  docker-build-server-monitor-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v4
+      
+      - name: Preinstall 
+        run: npm run prerun
+        
+      # build image probe api
+      - name: build docker image
+        run: sudo docker build -f ./ServerMonitorIngest/Dockerfile .
+
+  docker-build-open-telemetry-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v4
+      
+      - name: Preinstall 
+        run: npm run prerun
+        
+      # build image probe api
+      - name: build docker image
+        run: sudo docker build -f ./OpenTelemetryIngest/Dockerfile .
+
+  docker-build-incoming-request-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v4
+      
+      - name: Preinstall 
+        run: npm run prerun
+        
+      # build image probe api
+      - name: build docker image
+        run: sudo docker build -f ./IncomingRequestIngest/Dockerfile .
+
+  docker-build-fluent-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v4
+      
+      - name: Preinstall 
+        run: npm run prerun
+        
+      # build image probe api
+      - name: build docker image
+        run: sudo docker build -f ./FluentIngest/Dockerfile .
 
   docker-build-status-page:
     runs-on: ubuntu-latest
@@ -261,7 +305,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun
@@ -276,7 +320,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Preinstall 
         run: npm run prerun

.github/workflows/codeql-analysis.yml

@@ -31,8 +31,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
       matrix:
         language: [ 'javascript', 'typescript', 'go' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]

.github/workflows/common-jobs.yaml

@@ -14,7 +14,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Helm
         run: |
           curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
@@ -28,7 +28,7 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - run: sudo apt-get update
       - run: sudo apt-get install -y curl gcc
       - run: sudo apt-get install -y build-essential

.github/workflows/compile.yml

@@ -15,10 +15,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Accounts && npm install && npm run compile && npm run dep-check
 
@@ -27,10 +27,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
 
@@ -39,10 +39,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install && npm run compile && npm run dep-check
 
   compile-app:
@@ -50,10 +50,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd App && npm install && npm run compile && npm run dep-check
 
@@ -62,10 +62,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Home && npm install && npm run compile && npm run dep-check
 
@@ -74,10 +74,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Worker && npm install && npm run compile && npm run dep-check
 
@@ -86,10 +86,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Workflow && npm install && npm run compile && npm run dep-check
 
@@ -98,10 +98,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd APIReference && npm install && npm run compile && npm run dep-check
 
@@ -110,10 +110,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Docs && npm install && npm run compile && npm run dep-check
 
@@ -122,10 +122,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Copilot && npm install && npm run compile && npm run dep-check
 
@@ -134,10 +134,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       
       - run: cd Nginx && npm install && npm run compile && npm run dep-check
@@ -158,10 +158,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       
       - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check
@@ -171,10 +171,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       
       - run: cd Dashboard && npm install && npm run compile && npm run dep-check
@@ -185,10 +185,11 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
+      - run: sudo apt-get update
       - run: cd Common && npm install
       - run: cd E2E && npm install && npm run compile && npm run dep-check
 
@@ -197,24 +198,73 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Probe && npm install && npm run compile && npm run dep-check
 
-  compile-ingestor:
+  compile-probe-ingest:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
-      - run: cd Ingestor && npm install && npm run compile && npm run dep-check
+      - run: cd ProbeIngest && npm install && npm run compile && npm run dep-check
+
+  compile-server-monitor-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check
+
+  compile-open-telemetry-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd OpenTelemetryIngest && npm install && npm run compile && npm run dep-check
+
+
+  compile-incoming-request-ingest: 
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check
+
+  compile-fluent-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd FluentIngest && npm install && npm run compile && npm run dep-check
   
 
   compile-status-page:
@@ -222,10 +272,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       
       - run: cd StatusPage && npm install && npm run compile && npm run dep-check
@@ -235,9 +285,21 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
-      - run: cd TestServer && npm install && npm run compile && npm run dep-check
+      - run: cd TestServer && npm install && npm run compile && npm run dep-check
+
+  compile-mcp:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd MCP && npm install && npm run compile && npm run dep-check

.github/workflows/openapi-spec-generation.yml

@@ -0,0 +1,74 @@
+name: OpenAPI Spec Generation
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   
+      - 'release'
+
+jobs:
+  generate-openapi-spec:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{ github.run_number }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+
+      - name: Install Common dependencies
+        run: cd Common && npm install
+
+      - name: Install root dependencies
+        run: npm install
+
+      - name: Install Script dependencies
+        run: cd Scripts && npm install
+
+      - name: Generate OpenAPI specification
+        run: npm run generate-openapi-spec
+
+      - name: Check if OpenAPI spec was generated
+        run: |
+          if [ -f "./openapi.json" ]; then
+            echo "✅ OpenAPI spec file generated successfully"
+            echo "📄 File size: $(du -h ./openapi.json | cut -f1)"
+            echo "📊 Spec contains $(jq '.paths | length' ./openapi.json) API paths"
+            echo "🏷️  API version: $(jq -r '.info.version' ./openapi.json)"
+            echo "📝 API title: $(jq -r '.info.title' ./openapi.json)"
+          else
+            echo "❌ OpenAPI spec file was not generated"
+            exit 1
+          fi
+
+      - name: Validate OpenAPI spec format
+        run: |
+          # Check if the file is valid JSON
+          if jq empty ./openapi.json; then
+            echo "✅ OpenAPI spec is valid JSON"
+          else
+            echo "❌ OpenAPI spec is not valid JSON"
+            exit 1
+          fi
+          
+          # Check if it has required OpenAPI fields
+          if jq -e '.openapi and .info and .paths' ./openapi.json > /dev/null; then
+            echo "✅ OpenAPI spec has required fields"
+          else
+            echo "❌ OpenAPI spec missing required fields (openapi, info, paths)"
+            exit 1
+          fi
+
+      - name: Upload OpenAPI spec as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: openapi-spec
+          path: ./openapi.json
+          retention-days: 30

.github/workflows/release.yml

@@ -68,6 +68,142 @@ jobs:
           git commit -m "Helm Chart Release 7.0.${{needs.generate-build-number.outputs.build_number}}"
           git push origin master
 
+  publish-mcp-server:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number, publish-npm-packages]
+    env:
+      CI_PIPELINE_ID: ${{ github.run_number }}
+      NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+
+      - name: Install Common dependencies
+        run: cd Common && npm install
+
+      - name: Install root dependencies
+        run: npm install
+
+      - name: Install Script dependencies
+        run: cd Scripts && npm install
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing MCP server version: $VERSION"
+
+      - name: Verify MCP server directory
+        run: |
+          MCP_DIR="./MCP"
+          
+          if [ ! -d "$MCP_DIR" ]; then
+            echo "❌ MCP server directory not found"
+            exit 1
+          fi
+          
+          echo "✅ MCP server directory found"
+          echo "📊 Source files:"
+          find "$MCP_DIR" -type f -name "*.ts" -o -name "*.js" -o -name "*.json" | wc -l
+          echo "📁 Directory structure:"
+          ls -la "$MCP_DIR"
+
+      - name: Setup npm authentication
+        run: |
+          # Clean up any existing npm configuration that might cause warnings
+          rm -f ~/.npmrc
+          # Create npmrc file with authentication
+          touch ~/.npmrc
+          echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" >> ~/.npmrc
+          echo "//registry.npmjs.org/:email=npm@oneuptime.com" >> ~/.npmrc
+          echo "✅ npm authentication configured"
+
+      - name: Update package version
+        run: |
+          cd MCP
+          npm version ${{ steps.version.outputs.version }} --no-git-tag-version
+
+      - name: Install dependencies
+        run: |
+          cd MCP
+          npm update @oneuptime/common
+          npm install
+
+      - name: Build MCP server
+        run: |
+          cd MCP
+          npm run build
+
+      - name: Run tests
+        run: |
+          cd MCP
+          npm test || echo "No tests found or tests failed, continuing..."
+
+      - name: Verify package before publish
+        run: |
+          cd MCP
+          echo "📦 Package information:"
+          npm publish --dry-run
+          echo "📋 Package.json bin configuration:"
+          cat package.json | grep -A 5 -B 5 '"bin"'
+          echo "📁 Build directory contents:"
+          ls -la build/
+
+      - name: Publish to npm
+        run: |
+          cd MCP
+          npm publish --access public
+          echo "✅ Published @oneuptime/mcp-server@${{ steps.version.outputs.version }} to npm"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker images
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --file ./MCP/Dockerfile.tpl \
+            --tag oneuptime/mcp-server:${{ steps.version.outputs.version }} \
+            --tag oneuptime/mcp-server:release \
+            --tag ghcr.io/oneuptime/mcp-server:${{ steps.version.outputs.version }} \
+            --tag ghcr.io/oneuptime/mcp-server:release \
+            --build-arg GIT_SHA=${{ github.sha }} \
+            --build-arg APP_VERSION=${{ steps.version.outputs.version }} \
+            --push .
+          echo "✅ Pushed Docker images to Docker Hub and GitHub Container Registry"
+
+      - name: Upload MCP server artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcp-server-${{ steps.version.outputs.version }}
+          path: ./MCP/
+          retention-days: 90
+
   nginx-docker-image-deploy:
     needs: [generate-build-number]
     runs-on: ubuntu-latest
@@ -87,9 +223,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -147,9 +283,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -207,9 +343,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -267,9 +403,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -330,9 +466,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -390,9 +526,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -452,9 +588,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -512,9 +648,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -553,7 +689,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  ingestor-docker-image-deploy:
+  probe-ingest-docker-image-deploy:
     needs: [generate-build-number]
     runs-on: ubuntu-latest
     steps:
@@ -562,8 +698,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/ingestor
-            ghcr.io/oneuptime/ingestor
+            oneuptime/probe-ingest
+            ghcr.io/oneuptime/probe-ingest
           tags: |
             type=raw,value=release,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
@@ -572,9 +708,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -585,7 +721,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -603,7 +739,251 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Ingestor/Dockerfile
+          file: ./ProbeIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  
+  server-monitor-ingest-docker-image-deploy:
+    needs: [generate-build-number]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/server-monitor-ingest
+            ghcr.io/oneuptime/server-monitor-ingest
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy probe-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./ServerMonitorIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+          
+          
+  
+  open-telemetry-ingest-docker-image-deploy:
+    needs: [generate-build-number]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/open-telemetry-ingest
+            ghcr.io/oneuptime/open-telemetry-ingest
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy open-telemetry-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./OpenTelemetryIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+
+  incoming-request-ingest-docker-image-deploy:
+    needs: [generate-build-number]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/incoming-request-ingest
+            ghcr.io/oneuptime/incoming-request-ingest
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy incoming-request-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IncomingRequestIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  fluent-ingest-docker-image-deploy:
+    needs: [generate-build-number]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/fluent-ingest
+            ghcr.io/oneuptime/fluent-ingest
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy fluent-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./FluentIngest/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -632,9 +1012,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -673,67 +1053,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-
-  haraka-docker-image-deploy:
-    needs: [generate-build-number]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/haraka
-            ghcr.io/oneuptime/haraka
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy haraka.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Haraka/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   admin-dashboard-docker-image-deploy:
     needs: [generate-build-number]
     runs-on: ubuntu-latest
@@ -753,9 +1072,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -814,9 +1133,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -874,9 +1193,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -935,9 +1254,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -995,9 +1314,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1046,17 +1365,15 @@ jobs:
       PACKAGE_VERSION: 7.0.${{needs.generate-build-number.outputs.build_number}}
     steps:
       - name: Checkout 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Preinstall 
         run: npm run prerun
-      - name: Publish Infrastructure Agent
+      - name: Publish NPM Packages
         run: bash ./Scripts/NPM/PublishAllPackages.sh
 
   
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
       
@@ -1090,9 +1407,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       # - name: Setup Git LFS
       #   run: git lfs install
@@ -1140,8 +1457,6 @@ jobs:
         
   docs-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1161,9 +1476,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1207,8 +1522,6 @@ jobs:
 
   worker-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1228,9 +1541,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1274,8 +1587,6 @@ jobs:
   
   workflow-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1295,9 +1606,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1337,13 +1648,71 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
             
   
-  
+
+  publish-terraform-provider:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number]
+    env: 
+      CI_PIPELINE_ID: ${{github.run_number}}
+      GITHUB_TOKEN: ${{ secrets.SIMLARSEN_GITHUB_PAT }}
+      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY: ${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+          cache: 'npm'
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          install-only: true
+
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing Terraform provider version: $VERSION"
+
+      - name: Install dependencies
+        run: |
+          npm install
+          if [ -d "Common" ]; then cd Common && npm install && cd ..; fi
+          if [ -d "Scripts" ]; then cd Scripts && npm install && cd ..; fi
+
+      - name:  Import GPG key
+        run: |
+          echo '${{ secrets.GPG_PRIVATE_KEY }}' > private.key
+          gpg --import private.key || true
+          rm private.key
+          echo "GPG key imported successfully"
+          gpg --export-secret-keys >~/.gnupg/secring.gpg 
+          echo "GPG key exported successfully"
+
+      - name: Generate Terraform provider
+        run: npm run publish-terraform-provider -- --version "${{ steps.version.outputs.version }}" --github-token "${{ secrets.SIMLARSEN_GITHUB_PAT }}" --github-repo-deploy-key "${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}"
+
   
 
   api-reference-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1363,9 +1732,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1409,7 +1778,7 @@ jobs:
 
   test-e2e-release-saas: 
     runs-on: ubuntu-latest
-    needs: [copilot-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy,  llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy,  otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
+    needs: [open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -1426,10 +1795,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: npm run prerun && bash ./Tests/Scripts/enable-billing-env-var.sh
       - name: Start Server with release tag
         run: npm run start
@@ -1462,7 +1831,7 @@ jobs:
   test-e2e-release-self-hosted: 
     runs-on: ubuntu-latest
     # After all the jobs runs
-    needs: [copilot-docker-image-deploy, docs-docker-image-deploy,  api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
+    needs: [open-telemetry-ingest-docker-image-deploy, publish-mcp-server, copilot-docker-image-deploy, incoming-request-ingest-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -1479,10 +1848,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: npm run prerun
       - name: Start Server with release tag
         run: npm run start
@@ -1549,15 +1918,25 @@ jobs:
         uses: actions/setup-go@v4
 
       - name: Install GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6.1.0
         with:
           install-only: true
 
+      - name: GoReleaser Version
+        run: goreleaser -v
+
+      # This tool is used to generate .rpm and .deb packages
+      - name: Install NFPM
+        run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
+
       - name: Show GoReleaser version
         run: goreleaser -v
 
       - name: Run GoReleaser
         run: cd InfrastructureAgent && export GORELEASER_CURRENT_TAG=7.0.${{needs.generate-build-number.outputs.build_number}} && goreleaser release --clean --snapshot
+
+      - name: Release MSI Images
+        run: cd InfrastructureAgent && bash build-msi.sh 7.0.${{needs.generate-build-number.outputs.build_number}}
       
       # Upload binaries to github release
       - name: Release
@@ -1570,4 +1949,3 @@ jobs:
           prerelease: false
           tag_name: 7.0.${{needs.generate-build-number.outputs.build_number}}
 
-

.github/workflows/terraform-provider-generation.yml

@@ -0,0 +1,97 @@
+name: Terraform Provider Generation
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+  workflow_dispatch: # Allow manual trigger
+
+jobs:
+  generate-terraform-provider:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{ github.run_number }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install Common dependencies
+        run: cd Common && npm install
+
+      - name: Install root dependencies
+        run: npm install
+
+      - name: Install Script dependencies
+        run: cd Scripts && npm install
+
+      - name: Generate Terraform provider
+        run: npm run generate-terraform-provider
+
+      - name: Verify provider generation
+        run: |
+          PROVIDER_DIR="./Terraform"
+          
+          # Check if provider directory was created
+          if [ ! -d "$PROVIDER_DIR" ]; then
+            echo "❌ Terraform provider directory not created"
+            exit 1
+          fi
+          echo "✅ Provider directory created: $PROVIDER_DIR"
+          
+          # Count generated files
+          GO_FILES=$(find "$PROVIDER_DIR" -name "*.go" | wc -l)
+          echo "📊 Generated Go files: $GO_FILES"
+          
+          if [ "$GO_FILES" -eq 0 ]; then
+            echo "❌ No Go files were generated"
+            exit 1
+          fi
+          
+          # Check for essential files
+          if [ -f "$PROVIDER_DIR/go.mod" ]; then
+            echo "✅ Go module file created"
+          fi
+          
+          if [ -f "$PROVIDER_DIR/README.md" ]; then
+            echo "✅ Documentation created"
+          fi
+          
+          # Show directory structure for debugging
+          echo "📁 Provider directory structure:"
+          ls -la "$PROVIDER_DIR" || true
+
+      - name: Test Go build
+        run: |
+          PROVIDER_DIR="./Terraform"
+          if [ -d "$PROVIDER_DIR" ] && [ -f "$PROVIDER_DIR/go.mod" ]; then
+            cd "$PROVIDER_DIR"
+            echo "🔨 Testing Go build..."
+            go mod tidy
+            go build -v ./...
+            echo "✅ Go build successful"
+          else
+            echo "⚠️ Cannot test build - missing go.mod or provider directory"
+          fi
+
+      - name: Upload Terraform provider as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Terraform
+          path: ./Terraform/
+          retention-days: 30

.github/workflows/test-release.yaml

@@ -1,5 +1,9 @@
 name: Push Test Images to Docker Hub and GitHub Container Registry
 
+concurrency:
+  group: test-release
+  cancel-in-progress: true
+
 on:
   push:
     branches:
@@ -19,10 +23,183 @@ jobs:
         token: ${{secrets.github_token}}
     - run: echo "Build number is ${{ steps.buildnumber.outputs.build_number }}"
 
+
+  publish-terraform-provider:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number]
+    env: 
+      CI_PIPELINE_ID: ${{github.run_number}}
+      GITHUB_TOKEN: ${{ secrets.SIMLARSEN_GITHUB_PAT }}
+      GPG_PRIVATE_KEY: ${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}
+      TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY: ${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+          cache: 'npm'
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          install-only: true
+
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing Terraform provider version: $VERSION"
+
+      - name: Install dependencies
+        run: |
+          npm install
+          if [ -d "Common" ]; then cd Common && npm install && cd ..; fi
+          if [ -d "Scripts" ]; then cd Scripts && npm install && cd ..; fi
+
+      - name:  Import GPG key
+        run: |
+          echo '${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}' > private.key
+          gpg --import private.key || true
+          rm private.key
+          echo "GPG key imported successfully"
+          gpg --export-secret-keys >~/.gnupg/secring.gpg 
+          echo "GPG key exported successfully"
+
+      - name: Generate Terraform provider
+        run: npm run publish-terraform-provider -- --version "${{ steps.version.outputs.version }}" --github-token "${{ secrets.SIMLARSEN_GITHUB_PAT }}" --github-repo-deploy-key "${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}" --test-release
+
+  publish-mcp-server:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number]
+    env:
+      CI_PIPELINE_ID: ${{ github.run_number }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Common dependencies
+        run: cd Common && npm install
+
+      - name: Install root dependencies
+        run: npm install
+
+      - name: Install Script dependencies
+        run: cd Scripts && npm install
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}-test"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing MCP server version: $VERSION"
+
+      - name: Verify MCP server directory
+        run: |
+          MCP_DIR="./MCP"
+          
+          if [ ! -d "$MCP_DIR" ]; then
+            echo "❌ MCP server directory not found"
+            exit 1
+          fi
+          
+          echo "✅ MCP server directory found"
+          echo "📊 Source files:"
+          find "$MCP_DIR" -type f -name "*.ts" -o -name "*.js" -o -name "*.json" | wc -l
+          echo "📁 Directory structure:"
+          ls -la "$MCP_DIR"
+
+      - name: Update package version
+        run: |
+          cd MCP
+          npm version ${{ steps.version.outputs.version }} --no-git-tag-version
+
+      - name: Install dependencies and build
+        run: |
+          cd MCP
+          npm update @oneuptime/common
+          npm install
+          npm run build
+
+      - name: Run tests
+        run: |
+          cd MCP
+          npm test || echo "No tests found or tests failed, continuing..."
+
+      - name: Publish to npm (dry run for test releases)
+        run: |
+          cd MCP
+          npm pack --dry-run
+          echo "✅ Dry run completed successfully for test release"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker images (test)
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --file ./MCP/Dockerfile.tpl \
+            --tag oneuptime/mcp-server:${{ steps.version.outputs.version }} \
+            --tag oneuptime/mcp-server:test \
+            --tag ghcr.io/oneuptime/mcp-server:${{ steps.version.outputs.version }} \
+            --tag ghcr.io/oneuptime/mcp-server:test \
+            --build-arg GIT_SHA=${{ github.sha }} \
+            --build-arg APP_VERSION=${{ steps.version.outputs.version }} \
+            --push .
+          echo "✅ Pushed test Docker images to Docker Hub and GitHub Container Registry"
+
+      - name: Upload MCP server artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcp-server-${{ steps.version.outputs.version }}
+          path: ./MCP/
+          retention-days: 90
+
+  
+
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -56,9 +233,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       
       # - name: Setup Git LFS
       #   run: git lfs install
@@ -126,9 +303,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -188,9 +365,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -249,9 +426,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -310,9 +487,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -371,9 +548,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -432,9 +609,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -495,9 +672,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -558,9 +735,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -599,7 +776,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  ingestor-docker-image-deploy:
+  probe-ingest-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -608,8 +785,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/ingestor
-            ghcr.io/oneuptime/ingestor
+            oneuptime/probe-ingest
+            ghcr.io/oneuptime/probe-ingest
           tags: |
             type=raw,value=test,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@@ -619,9 +796,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -632,7 +809,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/login-action@v2.2.0
@@ -650,7 +827,256 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Ingestor/Dockerfile
+          file: ./ProbeIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+
+
+  server-monitor-ingest-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/server-monitor-ingest
+            ghcr.io/oneuptime/server-monitor-ingest
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy ServerMonitorIngest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./ServerMonitorIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+          
+            
+
+
+  incoming-request-ingest-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/incoming-request-ingest
+            ghcr.io/oneuptime/incoming-request-ingest
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy incoming-request-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IncomingRequestIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  open-telemetry-ingest-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/open-telemetry-ingest
+            ghcr.io/oneuptime/open-telemetry-ingest
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy incoming-request-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./OpenTelemetryIngest/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  fluent-ingest-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/fluent-ingest
+            ghcr.io/oneuptime/fluent-ingest
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy probe-ingest.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./FluentIngest/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -680,9 +1106,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -721,67 +1147,6 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  haraka-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/haraka
-            ghcr.io/oneuptime/haraka
-          tags: |
-            type=raw,value=test,enable=true
-            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy haraka.
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: ./Haraka/Dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ github.sha }}
-            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
-
   dashboard-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -802,9 +1167,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -863,9 +1228,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -924,9 +1289,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -988,9 +1353,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1051,9 +1416,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1112,9 +1477,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1173,9 +1538,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1235,9 +1600,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1297,9 +1662,9 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -1343,14 +1708,14 @@ jobs:
 
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [llm-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy]
+    needs: [infrastructure-agent-deploy, publish-mcp-server, llm-docker-image-deploy, publish-terraform-provider, open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, fluent-ingest-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd HelmChart && cd Tests && bash index.sh
 
   test-e2e-test-saas: 
@@ -1372,10 +1737,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: npm run prerun && bash ./Tests/Scripts/change-release-to-test-tag.sh
       - name: Start Server with release tag
         run: npm run start
@@ -1425,10 +1790,10 @@ jobs:
           large-packages: true
           docker-images: true
           swap-storage: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: npm run prerun && bash ./Tests/Scripts/change-release-to-test-tag.sh
       - name: Start Server with release tag
         run: npm run start
@@ -1457,6 +1822,56 @@ jobs:
           # Optional. Defaults to repository settings.
           retention-days: 7
 
+  infrastructure-agent-deploy:
+    needs: [generate-build-number]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          
+      - name: Set up Go
+        uses: actions/setup-go@v4
 
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v6.1.0
+        with:
+          install-only: true
+
+      - name: GoReleaser Version
+        run: goreleaser -v
+
+      # This tool is used to generate .rpm and .deb packages
+      - name: Install NFPM
+        run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
+
+      - name: Show GoReleaser version
+        run: goreleaser -v
+
+      - name: Run GoReleaser
+        run: cd InfrastructureAgent && export GORELEASER_CURRENT_TAG=7.0.${{needs.generate-build-number.outputs.build_number}} && goreleaser release --clean --snapshot
+
+      - name: Release MSI Images
+        run: cd InfrastructureAgent && bash build-msi.sh 7.0.${{needs.generate-build-number.outputs.build_number}}
+      
+
+      - name: Upload Release Binaries
+        uses: actions/upload-artifact@v4
+        # Run this on failure
+        with:
+          # Name of the artifact to upload.
+          # Optional. Default is 'artifact'
+          name: binaries
+      
+          # A file, directory or wildcard pattern that describes what to upload
+          # Required.
+          path: |
+            ./InfrastructureAgent/dist
+      
+        
+          # Duration after which artifact will expire in days. 0 means using default retention.
+          # Minimum 1 day.
+          # Maximum 90 days unless changed from the repository settings page.
+          # Optional. Defaults to repository settings.
+          retention-days: 7
 
-    

.github/workflows/test.common.yaml

@@ -14,10 +14,10 @@ jobs:
       CI_PIPELINE_ID: ${{github.run_number}}
       BILLING_PRIVATE_KEY: ${{secrets.TEST_BILLING_PRIVATE_KEY}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0 
+          node-version: latest 
       - run: cd Common && bash test-setup.sh
       - run: cd Common && npm install && rm -rf build && npm run test
   

.github/workflows/test.e2e.yaml

@@ -1,58 +0,0 @@
-name: E2E Tests
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      # Docker compose needs a lot of space to build images, so we need to free up some space first in the GitHub Actions runner
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: npm run prerun && bash ./Tests/Scripts/enable-billing-env-var.sh
-      - run: npm run dev
-      - name: Wait for server to start
-        run:  bash ./Tests/Scripts/status-check.sh http://localhost
-      - name: Run E2E Tests. Run docker container e2e in docker compose file
-        run: export $(grep -v '^#' config.env | xargs) && docker compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker compose -f docker-compose.dev.yml logs e2e && exit 1)
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        # Run this on failure
-        if: failure()
-        with:
-          # Name of the artifact to upload.
-          # Optional. Default is 'artifact'
-          name: test-results
-      
-          # A file, directory or wildcard pattern that describes what to upload
-          # Required.
-          path: |
-            ./E2E
-      
-        
-          # Duration after which artifact will expire in days. 0 means using default retention.
-          # Minimum 1 day.
-          # Maximum 90 days unless changed from the repository settings page.
-          # Optional. Defaults to repository settings.
-          retention-days: 7

.github/workflows/test.fluent-ingest.yaml

@@ -0,0 +1,20 @@
+name: Fluent Ingest Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd FluentIngest && npm install && npm run test

.github/workflows/test.incoming-request-ingest.yml

@@ -0,0 +1,21 @@
+name: Incoming Request Ingest Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd IncomingRequestIngest && npm install && npm run test
+  

.github/workflows/test.mcp.yaml

@@ -0,0 +1,21 @@
+name: MCP Server Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest 
+      - run: cd Common && npm install
+      - run: cd MCP && npm install && npm run test

.github/workflows/test.open-telemetry-ingest.yaml

@@ -0,0 +1,21 @@
+name: OpenTelemetryIngest Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd OpenTelemetryIngest && npm install && npm run test
+  

.github/workflows/test.probe-ingest.yaml

@@ -1,4 +1,4 @@
-name: Ingestor Test
+name: ProbeIngest Test
 
 on:
   pull_request: 
@@ -13,9 +13,9 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
-      - run: cd Ingestor && npm install && npm run test
+          node-version: latest
+      - run: cd ProbeIngest && npm install && npm run test
   

.github/workflows/test.probe.yaml

@@ -13,10 +13,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Common && npm install
       - run: cd Probe && npm install
       - run: cd Probe && npm run test

.github/workflows/test.yaml

@@ -13,10 +13,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd App && npm install && npm run test
 
   test-home:
@@ -24,10 +24,10 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Home && npm install && npm run test
 
   test-worker:
@@ -35,8 +35,8 @@ jobs:
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.3.0
+          node-version: latest
       - run: cd Worker && npm install && npm run test

.gitignore

@@ -86,9 +86,6 @@ Backups/*.tar
 
 .env
 
-Haraka/dkim/keys/private_base64.txt
-Haraka/dkim/keys/public_base64.txt
-
 .eslintcache
 
 HelmChart/Values/*.values.yaml
@@ -112,3 +109,21 @@ App/greenlock/greenlock.d/config.json
 App/greenlock/greenlock.d/config.json.bak
 Examples/otel-dotnet/bin/Debug/net6.0/Grpc.Core.Api.dll.txt
 InfrastructureAgent/oneuptime-infrastructure-agent
+
+# ESLint cache
+.eslintcache*
+
+# Terraform generated files
+openapi.json
+
+Terraform/**
+
+TerraformTest/**
+
+terraform-provider-example/**
+
+# MCP Server
+MCP/build/
+MCP/.env
+MCP/node_modules 
+Dashboard/public/sw.js

.oneuptime/scripts/on-before-commit.sh

@@ -1 +1 @@
-# Description: Copilot will run this script before we commit the changes to your repository.
+# Description: Copilot will run this script before we commit the changes to your repository.

.vscode/launch.json

@@ -93,7 +93,7 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Worker",
+            "localRoot": "${workspaceFolder}/Workflow",
             "name": "Workflow: Debug with Docker",
             "port": 8735,
             "remoteRoot": "/usr/src/app",
@@ -107,7 +107,7 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Worker",
+            "localRoot": "${workspaceFolder}/Docs",
             "name": "Docs: Debug with Docker",
             "port": 8738,
             "remoteRoot": "/usr/src/app",
@@ -121,7 +121,7 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Worker",
+            "localRoot": "${workspaceFolder}/APIReference",
             "name": "API Reference: Debug with Docker",
             "port": 8737,
             "remoteRoot": "/usr/src/app",
@@ -151,7 +151,7 @@
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Probe",
             "name": "Probe: Debug with Docker",
-            "port": 9655,
+            "port": 9229,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
             "skipFiles": [
@@ -163,8 +163,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Ingestor",
-            "name": "Ingestor: Debug with Docker",
+            "localRoot": "${workspaceFolder}/ProbeIngest",
+            "name": "ProbeIngest: Debug with Docker",
             "port": 9932,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -175,6 +175,62 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/ServerMonitorIngest",
+            "name": "ServerMonitorIngest: Debug with Docker",
+            "port": 9941,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/IncomingRequestIngest",
+            "name": "IncomingRequestIngest: Debug with Docker",
+            "port": 9933,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/OpenTelemetryIngest",
+            "name": "OpenTelemetryIngest: Debug with Docker",
+            "port": 9938,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/FluentIngest",
+            "name": "Fluent Ingest: Debug with Docker",
+            "port": 9937,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/IsolatedVM",
@@ -217,20 +273,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Workers",
-            "name": "Workers: Debug with Docker",
-            "port": 9654,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/StatusPage",

APIReference/CodeExamples/DataTypes/EqualTo.md

@@ -1,6 +1,8 @@
 {
     "query": {
-        "name": "Hello", 
-        // other filters
+        "age": {
+            "_type": "EqualTo",
+            value: 10
+        }
     }
 }

APIReference/CodeExamples/DataTypes/GreaterThanOrNull.md

@@ -0,0 +1,8 @@
+{
+    "query": {
+        "age": {
+            "_type": "GreaterThanOrNull",
+            "value": 10
+        }
+    }
+}

APIReference/CodeExamples/DataTypes/Includes.md

@@ -0,0 +1,11 @@
+{
+    "query": {
+        "labels": {
+            "_type": "Includes",
+            "value": [
+                "aaa00000-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+                "bbb00000-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+            ]
+        }
+    }
+}

APIReference/CodeExamples/DataTypes/LessThanOrNull.md

@@ -0,0 +1,8 @@
+{
+    "query": {
+        "age": {
+            "_type": "LessThanOrNull",
+            "value": 10
+        }
+    }
+}

APIReference/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.2-alpine3.18
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 RUN npm config set fetch-retries 5
@@ -65,6 +65,8 @@ CMD [ "npm", "run", "dev" ]
 COPY ./APIReference /usr/src/app
 # Bundle app source
 RUN npm run compile
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}

APIReference/Index.ts

@@ -17,10 +17,11 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
 
     const statusCheck: PromiseVoidFunction = async (): Promise<void> => {
       // Check the status of infrastructure components
-      return await InfrastructureStatus.checkStatus({
+      return await InfrastructureStatus.checkStatusWithRetry({
         checkClickhouseStatus: false,
         checkPostgresStatus: false,
         checkRedisStatus: false,
+        retryCount: 3,
       });
     };
 

APIReference/Routes.ts

@@ -1,6 +1,7 @@
 import AuthenticationServiceHandler from "./Service/Authentication";
 import DataTypeServiceHandler from "./Service/DataType";
 import ErrorServiceHandler from "./Service/Errors";
+import OpenAPIServiceHandler from "./Service/OpenAPI";
 import IntroductionServiceHandler from "./Service/Introduction";
 import ModelServiceHandler from "./Service/Model";
 import PageNotFoundServiceHandler from "./Service/PageNotFound";
@@ -65,6 +66,8 @@ const APIReferenceFeatureSet: FeatureSet = {
           return ErrorServiceHandler.executeResponse(req, res);
         } else if (req.params["page"] === "introduction") {
           return IntroductionServiceHandler.executeResponse(req, res);
+        } else if (req.params["page"] === "openapi") {
+          return OpenAPIServiceHandler.executeResponse(req, res);
         } else if (req.params["page"] === "status") {
           return StatusServiceHandler.executeResponse(req, res);
         } else if (req.params["page"] === "data-types") {

APIReference/Service/Authentication.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
@@ -26,6 +27,7 @@ export default class ServiceHandler {
       page: page,
       resources: Resources,
       pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,
       pageData: pageData,
     });

APIReference/Service/DataType.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
@@ -87,6 +88,36 @@ export default class ServiceHandler {
       },
     );
 
+    pageData.includesCode = await LocalCache.getOrSetString(
+      "data-type",
+      "includes",
+      async () => {
+        return await LocalFile.read(
+          `${CodeExamplesPath}/DataTypes/Includes.md`,
+        );
+      },
+    );
+
+    pageData.lessThanOrNullCode = await LocalCache.getOrSetString(
+      "data-type",
+      "less-than-or-equal",
+      async () => {
+        return await LocalFile.read(
+          `${CodeExamplesPath}/DataTypes/LessThanOrNull.md`,
+        );
+      },
+    );
+
+    pageData.greaterThanOrNullCode = await LocalCache.getOrSetString(
+      "data-type",
+      "less-than-or-equal",
+      async () => {
+        return await LocalFile.read(
+          `${CodeExamplesPath}/DataTypes/LessThanOrNull.md`,
+        );
+      },
+    );
+
     pageData.isNullCode = await LocalCache.getOrSetString(
       "data-type",
       "is-null",
@@ -117,6 +148,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: "data-types",
       pageTitle: "Data Types",
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription:
         "Data Types that can be used to interact with OneUptime API",
       resources: Resources,

APIReference/Service/Errors.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
@@ -27,6 +28,7 @@ export default class ServiceHandler {
       page: page,
       resources: Resources,
       pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,
       pageData: pageData,
     });

APIReference/Service/Introduction.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
@@ -33,6 +34,7 @@ export default class ServiceHandler {
       page: page,
       resources: Resources,
       pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,
       pageData: pageData,
     });

APIReference/Service/Model.ts

@@ -13,6 +13,7 @@ import Permission, {
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import LocalFile from "Common/Server/Utils/LocalFile";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 
 // Get all resources and resource dictionary
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
@@ -76,6 +77,11 @@ export default class ServiceHandler {
         continue;
       }
 
+      if (tableColumns[key].hideColumnInDocumentation) {
+        delete tableColumns[key];
+        continue;
+      }
+
       tableColumns[key].permissions = accessControl;
     }
 
@@ -262,6 +268,7 @@ export default class ServiceHandler {
       page: page,
       resources: Resources,
       pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,
       pageData: pageData,
     });

APIReference/Service/OpenAPI.ts

@@ -0,0 +1,44 @@
+import {
+  Host,
+  HttpProtocol,
+  IsBillingEnabled,
+} from "Common/Server/EnvironmentConfig";
+import { ViewsPath } from "../Utils/Config";
+import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
+import URL from "Common/Types/API/URL";
+
+// Fetch a list of resources used in the application
+const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
+
+export default class ServiceHandler {
+  // Handles the HTTP response for a given request
+  public static async executeResponse(
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    let pageTitle: string = "";
+    let pageDescription: string = "";
+
+    // Get the 'page' parameter from the request
+    const page: string | undefined = req.params["page"];
+    const pageData: any = {
+      hostUrl: new URL(HttpProtocol, Host).toString(),
+    };
+
+    // Set the default page title and description
+    pageTitle = "OneUptime OpenAPI Specification";
+    pageDescription =
+      "Learn more about the OpenAPI specification for OneUptime";
+
+    // Render the response using the given view and data
+    return res.render(`${ViewsPath}/pages/index`, {
+      page: page,
+      resources: Resources,
+      pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
+      pageDescription: pageDescription,
+      pageData: pageData,
+    });
+  }
+}

APIReference/Service/PageNotFound.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
@@ -17,6 +18,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: "404", // The page type (404 in this case)
       pageTitle: "Page Not Found", // The page title
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: "Page you're looking for is not found.", // The page description
       resources: Resources, // The array of model documentation resources
       pageData: {}, // An empty object to hold any additional page data

APIReference/Service/Pagination.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
@@ -47,7 +48,8 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: page, // Pass the page parameter
       resources: Resources, // Pass all resources
-      pageTitle: pageTitle, // Pass the page title
+      pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled, // Pass the page title
       pageDescription: pageDescription, // Pass the page description
       pageData: pageData, // Pass the page data
     });

APIReference/Service/Permissions.ts

@@ -2,6 +2,7 @@ import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { PermissionHelper, PermissionProps } from "Common/Types/Permission";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 
@@ -34,6 +35,7 @@ export default class ServiceHandler {
       page: page,
       resources: Resources,
       pageTitle: pageTitle,
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: pageDescription,
       pageData: pageData,
     });

APIReference/Service/Status.ts

@@ -1,3 +1,4 @@
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
@@ -17,6 +18,7 @@ export default class ServiceHandler {
     return res.render(`${ViewsPath}/pages/index`, {
       page: "status",
       pageTitle: "Status",
+      enableGoogleTagManager: IsBillingEnabled,
       pageDescription: "200 - Success",
       resources: resources, // Pass resources to the template
       pageData: {}, // Pass empty data to the template

APIReference/Utils/Resources.ts

@@ -15,7 +15,7 @@ export default class ResourceUtil {
   // Get all resources that should have documentation enabled
   public static getResources(): Array<ModelDocumentation> {
     const resources: Array<ModelDocumentation> = Models.filter(
-      (model: typeof BaseModel) => {
+      (model: { new (): BaseModel }) => {
         const modelInstance: BaseModel = new model();
         let showDocs: boolean = modelInstance.enableDocumentation;
 
@@ -27,7 +27,7 @@ export default class ResourceUtil {
         return showDocs;
       },
     )
-      .map((model: typeof BaseModel) => {
+      .map((model: { new (): BaseModel }) => {
         const modelInstance: BaseModel = new model();
 
         return {

APIReference/package-lock.json

@@ -1,17 +1,16 @@
 {
-  "name": "@oneuptime/app",
+  "name": "@oneuptime/api-reference",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "@oneuptime/app",
+      "name": "@oneuptime/api-reference",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
         "Common": "file:../Common",
         "ejs": "^3.1.9",
-        "handlebars": "^4.7.8",
         "ts-node": "^10.9.1"
       },
       "devDependencies": {
@@ -26,8 +25,9 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
+        "@asteasolutions/zod-to-openapi": "^7.3.2",
         "@bull-board/express": "^5.21.4",
-        "@clickhouse/client": "^0.2.10",
+        "@clickhouse/client": "^1.10.1",
         "@elastic/elasticsearch": "^8.12.1",
         "@monaco-editor/react": "^4.4.6",
         "@opentelemetry/api": "^1.9.0",
@@ -55,18 +55,19 @@
         "@types/react-highlight": "^0.12.8",
         "@types/react-syntax-highlighter": "^15.5.13",
         "@types/uuid": "^8.3.4",
+        "@types/web-push": "^3.6.4",
         "acme-client": "^5.3.0",
         "airtable": "^0.12.2",
         "axios": "^1.7.2",
         "bullmq": "^5.3.3",
-        "Common": "file:../Common",
-        "cookie-parser": "^1.4.6",
+        "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "cron-parser": "^4.8.1",
         "crypto-js": "^4.2.0",
         "dotenv": "^16.4.4",
         "ejs": "^3.1.10",
-        "express": "^4.19.2",
+        "esbuild": "^0.25.5",
+        "express": "^4.21.1",
         "formik": "^2.4.6",
         "history": "^5.3.0",
         "ioredis": "^5.3.2",
@@ -74,7 +75,6 @@
         "json5": "^2.2.3",
         "jsonwebtoken": "^9.0.0",
         "jwt-decode": "^4.0.0",
-        "lodash": "^4.17.21",
         "marked": "^12.0.2",
         "moment": "^2.30.1",
         "moment-timezone": "^0.5.45",
@@ -82,6 +82,7 @@
         "nodemailer": "^6.9.10",
         "otpauth": "^9.3.1",
         "pg": "^8.7.3",
+        "playwright": "^1.50.0",
         "posthog-js": "^1.139.6",
         "prop-types": "^15.8.1",
         "qrcode": "^1.5.3",
@@ -104,6 +105,7 @@
         "redis-semaphore": "^5.5.1",
         "reflect-metadata": "^0.2.2",
         "remark-gfm": "^3.0.1",
+        "slackify-markdown": "^4.4.0",
         "slugify": "^1.6.5",
         "socket.io": "^4.7.4",
         "socket.io-client": "^4.7.5",
@@ -113,9 +115,11 @@
         "twilio": "^4.22.0",
         "typeorm": "^0.3.20",
         "typeorm-extension": "^2.2.13",
-        "universal-cookie": "^4.0.4",
+        "universal-cookie": "^7.2.1",
         "use-async-effect": "^2.2.6",
-        "uuid": "^8.3.2"
+        "uuid": "^8.3.2",
+        "web-push": "^3.6.7",
+        "zod": "^3.25.30"
       },
       "devDependencies": {
         "@faker-js/faker": "^8.0.2",
@@ -129,7 +133,6 @@
         "@types/jest": "^28.1.4",
         "@types/json2csv": "^5.0.3",
         "@types/jsonwebtoken": "^8.5.9",
-        "@types/lodash": "^4.14.202",
         "@types/node": "^17.0.45",
         "@types/node-cron": "^3.0.7",
         "@types/nodemailer": "^6.4.7",
@@ -143,6 +146,7 @@
         "jest-environment-jsdom": "^29.7.0",
         "jest-mock-extended": "^3.0.5",
         "react-test-renderer": "^18.2.0",
+        "sass": "^1.89.2",
         "ts-jest": "^28.0.5"
       }
     },
@@ -2378,26 +2382,6 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3445,14 +3429,6 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3465,11 +3441,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -3961,6 +3932,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4243,18 +4215,6 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/undefsafe": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
@@ -4340,11 +4300,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
-    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",

APIReference/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "Index.ts",
   "scripts": {
-    "start": "node --require ts-node/register Index.ts",
+    "start": "export NODE_OPTIONS='--max-old-space-size=8096' && node --require ts-node/register Index.ts",
     "compile": "tsc",
     "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
     "dev": "npx nodemon",

APIReference/views/main/authentication.ejs

@@ -32,7 +32,7 @@
       <p>You can use OneUptime API Key on Request Header when you're making a request. You can use <code
             class="rounded p-0.5 px-1 text-sm text-gray-500 bg-gray-100 border-2 border-gray-200">Authorization</code>
          header with your API Key when you make a request.</p>
-      <%- include('../partials/code', {title: "Example request with API Key" , requestUrl: "" , requestType: "" , code: "curl --header \"ApiKey: {secret-api-key}\" --header \"ProjectID: {project-id}\" https://oneuptime.com/api/\<path\>" }) -%>
+      <%- include('../partials/code', {title: "Example request with API Key" , requestUrl: "" , requestType: "" , code: "curl --header \"ApiKey: {secret-api-key}\" https://oneuptime.com/api/\<path\>" }) -%>
          <p class="text-sm">Please don't commit your OneUptime API Key to GitHub, or on any other source control
             project. Please regenerate a new API Key, if your API Key is committed by mistake.</p>
    </article>

APIReference/views/main/data-types.ejs

@@ -115,7 +115,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of Equal To Query</p>
+                                    <p>Here is an example of an Equal To Query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -153,7 +153,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of Not Equal To Query</p>
+                                    <p>Here is an example of a Not Equal To Query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -191,7 +191,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of is null query</p>
+                                    <p>Here is an example of an is null query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -229,7 +229,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of is not null query</p>
+                                    <p>Here is an example of an is not null query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -266,7 +266,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of greater than query</p>
+                                    <p>Here is an example of a greater than query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -304,7 +304,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of greater or equal than query</p>
+                                    <p>Here is an example of a greater than or equal query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -342,7 +342,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of less than query</p>
+                                    <p>Here is an example of a less than query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -380,7 +380,7 @@
                                 <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
                                 <dt class="sr-only">Description</dt>
                                 <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-                                    <p>Here is an example of less or equal than query</p>
+                                    <p>Here is an example of a less than or equal query</p>
                                 </dd>
                             </dl>
                         </li>
@@ -395,5 +395,44 @@
             </div>
         </div>
 
+        <h3 id="example-using-cursors" class="scroll-mt-24">
+            Inlcudes
+        </h3>
+
+        <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
+            <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                <p> 
+                    Includes will get objects that match any of the values in the array. It is used to
+                    filter objects that have a field that matches any of the values in the array. For example, if you
+                    want to get all objects that have a label with ID `aaa00000-aaaa-aaaa-aaaa-aaaaaaaaaaaa` or
+                    `bbb00000-bbbb-bbbb-bbbb-bbbbbbbbbbbb`, you can use the `includes` query type.
+                </p>
+
+                <div class="my-6">
+                    <ul role="list"
+                        class="m-0 max-w-[calc(theme(maxWidth.lg)-theme(spacing.8))] list-none divide-y divide-zinc-900/5 p-0 ">
+                        <li class="m-0 px-0 py-4 first:pt-0 last:pb-0">
+                            <dl class="m-0 flex flex-wrap items-center gap-x-3 gap-y-2">
+                                <dt class="sr-only">Query</dt>
+                                <dd><code class="inline-code">query</code></dd>
+                                <dt class="sr-only">Type</dt>
+                                <dd class="font-mono text-xs text-zinc-400 ">Query</dd>
+                                <dt class="sr-only">Description</dt>
+                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                                    <p>Here is an example of a less than or equal query</p>
+                                </dd>
+                            </dl>
+                        </li>
+
+                    </ul>
+                </div>
+            </div>
+            <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                <%- include('../partials/code', {title: "Example Not EqualTo Request Body" , requestUrl: "" , requestType: "" ,
+                    code: pageData.includesCode }) -%>
+
+            </div>
+        </div>
+
     </article>
 </main>

APIReference/views/main/model.ejs

@@ -12,14 +12,14 @@
       </h2>
 
       <script>
-         function showPermissions(id){
-            var permissionsblock = document.getElementById(id+"-permissions");
-            var viewPermissionsBtn = document.getElementById(id+"-view-permissions");
+         function showPermissions(id) {
+            var permissionsblock = document.getElementById(id + "-permissions");
+            var viewPermissionsBtn = document.getElementById(id + "-view-permissions");
 
-            if(permissionsblock.style.display === "none"){
+            if (permissionsblock.style.display === "none") {
                permissionsblock.style.display = "block";
                viewPermissionsBtn.innerHTML = "Hide Permissions";
-            }else{
+            } else {
                permissionsblock.style.display = "none";
                viewPermissionsBtn.innerHTML = "View Permissions";
             }
@@ -48,11 +48,16 @@
                      <dt class="sr-only">Description</dt>
                      <dd class="w-full flex-none text-sm [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
                         <p>
-                           <%= pageData.columns[Object.keys(pageData.columns)[i]].description -%> <a class="text-gray-500 hover:underline cursor-pointer text-xs" id="<%= Object.keys(pageData.columns)[i] -%>-view-permissions" onclick="showPermissions('<%= Object.keys(pageData.columns)[i] -%>')">View Permissions</a>
+                           <%= pageData.columns[Object.keys(pageData.columns)[i]].description -%> <a
+                                 class="text-gray-500 hover:underline cursor-pointer text-xs"
+                                 id="<%= Object.keys(pageData.columns)[i] -%>-view-permissions"
+                                 onclick="showPermissions('<%= Object.keys(pageData.columns)[i] -%>')">View
+                                 Permissions</a>
                         </p>
                      </dd>
 
-                     <dd class="font-mono text-xs" style="display: none;" id="<%= Object.keys(pageData.columns)[i] -%>-permissions">
+                     <dd class="font-mono text-xs" style="display: none;"
+                        id="<%= Object.keys(pageData.columns)[i] -%>-permissions">
 
                         <div class="mb-3 mt-3">
                            <span class="text-gray-700  text-xs">Permissions to Create:&nbsp;</span>
@@ -319,8 +324,7 @@
 
                <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0 xl:sticky xl:top-24">
                   <%- include('../partials/code', {title: "Example Item Request" , requestUrl:
-                     pageData.apiPath+"/3599ee69-43a7-42d7/get-item", code: pageData.itemRequest, requestType: "POST" })
-                     -%>
+                     pageData.apiPath+"/:id/get-item", code: pageData.itemRequest, requestType: "POST" }) -%>
                      <%- include('../partials/code', {title: "Example Item Response" , code: pageData.itemResponse,
                         requestType: "" }) -%>
                </div>
@@ -469,11 +473,34 @@
 
                      </ul>
                   </div>
+                  <div class="border border-gray-100 bg-gray-50 rounded-md p-4 text-sm mt-10">
+                     <h4 class="font-semibold text-gray-700 ">For clients that do not support PUT requests<h4>
+                           <p class="text-gray-500 text-xs mt-4">
+                              You can also update an object by sending a POST or GET request to these endpoints with the
+                              same
+                              request headers and body.
+                           </p>
+
+                           <div class="flex items-center gap-x-3 mt-10"><span
+                                 class="font-mono text-[0.625rem] font-semibold leading-6 rounded-lg px-1.5 ring-1 ring-inset ring-sky-300  bg-sky-400/10 text-sky-500 ">POST</span><span
+                                 class="h-0.5 w-0.5 rounded-full bg-zinc-300 "></span><span
+                                 class="font-mono text-xs text-zinc-400">
+                                 <%= pageData.apiPath -%>/:id/update-item
+                              </span></div>
+                           <div class="flex items-center gap-x-3 mt-10"><span
+                                 class="font-mono text-[0.625rem] font-semibold leading-6 rounded-lg px-1.5 ring-1 ring-inset ring-emerald-300  bg-emerald-400/10 text-emerald-500 ">GET</span><span
+                                 class="h-0.5 w-0.5 rounded-full bg-zinc-300 "></span><span
+                                 class="font-mono text-xs text-zinc-400">
+                                 <%= pageData.apiPath -%>/:id/update-item
+                              </span></div>
+                  </div>
                </div>
 
+
+
                <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0 xl:sticky xl:top-24">
                   <%- include('../partials/code', {title: "Example Update Request" , requestUrl:
-                     pageData.apiPath+"/3599ee69-43a7-42d7", code: pageData.updateRequest, requestType: "PUT" }) -%>
+                     pageData.apiPath+"/:id", code: pageData.updateRequest, requestType: "PUT" }) -%>
                      <%- include('../partials/code', {title: "Example Update Response" , code: pageData.updateResponse,
                         requestType: "" }) -%>
                </div>
@@ -498,11 +525,34 @@
                   <p>This endpoint allows you to delete object by its ID. </p>
 
 
+                  <div class="border border-gray-100 bg-gray-50 rounded-md p-4 text-sm mt-10">
+                     <h4 class="font-semibold text-gray-700 ">For clients that do not support DELETE requests<h4>
+                           <p class="text-gray-500 text-xs mt-4">
+                              You can also delete an object by sending a POST or GET request to these endpoints with the
+                              same
+                              request headers and body.
+                           </p>
+
+                           <div class="flex items-center gap-x-3 mt-10"><span
+                                 class="font-mono text-[0.625rem] font-semibold leading-6 rounded-lg px-1.5 ring-1 ring-inset ring-sky-300  bg-sky-400/10 text-sky-500 ">POST</span><span
+                                 class="h-0.5 w-0.5 rounded-full bg-zinc-300 "></span><span
+                                 class="font-mono text-xs text-zinc-400">
+                                 <%= pageData.apiPath -%>/:id/delete-item
+                              </span></div>
+                           <div class="flex items-center gap-x-3 mt-10"><span
+                                 class="font-mono text-[0.625rem] font-semibold leading-6 rounded-lg px-1.5 ring-1 ring-inset ring-emerald-300  bg-emerald-400/10 text-emerald-500 ">GET</span><span
+                                 class="h-0.5 w-0.5 rounded-full bg-zinc-300 "></span><span
+                                 class="font-mono text-xs text-zinc-400">
+                                 <%= pageData.apiPath -%>/:id/delete-item
+                              </span></div>
+                  </div>
+
+
                </div>
 
                <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0 xl:sticky xl:top-24">
                   <%- include('../partials/code', {title: "Example Delete Request" , requestUrl:
-                     pageData.apiPath+"/3599ee69-43a7-42d7", code: pageData.deleteRequest, requestType: "DELETE" }) -%>
+                     pageData.apiPath+"/:id", code: pageData.deleteRequest, requestType: "DELETE" }) -%>
                      <%- include('../partials/code', {title: "Example Delete Response" , code: pageData.deleteResponse,
                         requestType: "" }) -%>
                </div>

APIReference/views/main/openapi.ejs

@@ -0,0 +1,53 @@
+<main class="py-16">
+    <article class="prose ">
+        <h1>OneUptime OpenAPI Specification</h1>
+        <p class="lead">In this guide, we will look at how to import and work with the OneUptime OpenAPI specification. The OpenAPI spec provides a comprehensive reference for all available API endpoints.</p>
+        <p>The OneUptime API follows the OpenAPI 3.0 specification, which provides a standardized way to describe REST APIs. You can import our OpenAPI spec into various tools like Swagger Editor, Postman, or other API documentation tools to explore and test our endpoints.</p>
+        <h2 id="importing-spec" class="scroll-mt-24">
+            Importing the OpenAPI Spec
+        </h2>
+        <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10">
+            <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                <p>To import the OneUptime OpenAPI specification into Swagger Editor, follow these simple steps:</p>
+                <div class="my-6">
+                    <ol class="list-decimal pl-6">
+                        <li class="mb-2">Open <a href="https://editor.swagger.io" target="_blank" class="text-blue-600 hover:text-blue-800">editor.swagger.io</a> in your web browser</li>
+                        <li class="mb-2">Click on <strong>File</strong> in the menu bar</li>
+                        <li class="mb-2">Select <strong>Import URL</strong> from the dropdown menu</li>
+                        <li class="mb-2">Enter the URL: <code class="inline-code"><%= pageData.hostUrl  %>api/openapi/spec</code></li>
+                        <li class="mb-2">Click <strong>Import</strong> to load the specification</li>
+                    </ol>
+                </div>
+                <h2 id="spec-url" class="scroll-mt-24">
+                    Specification URL
+                </h2>
+                <div class="my-6">
+                    <ul role="list"
+                        class="m-0  list-none divide-y divide-zinc-900/5 p-0 ">
+                        <li class="m-0 px-0 py-4 first:pt-0 last:pb-0">
+                            <dl class="m-0 flex flex-wrap items-center gap-x-3 gap-y-2">
+                                <dt class="sr-only">Endpoint</dt>
+                                <dd><code class="inline-code"><%= pageData.hostUrl %>api/openapi/spec</code></dd>
+                                <dt class="sr-only">Description</dt>
+                                <dd class="w-full flex-none [&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
+                                    <p>Complete OpenAPI 3.0 specification for the OneUptime API including all endpoints, request/response schemas, and authentication methods.</p>
+                                </dd>
+                            </dl>
+                        </li>
+                    </ul>
+                </div>
+                <h2 id="benefits" class="scroll-mt-24">
+                    Benefits of Using the OpenAPI Spec
+                </h2>
+                <div class="my-6">
+                    <ul class="list-disc pl-6">
+                        <li class="mb-2"><strong>Interactive Documentation:</strong> Test API endpoints directly in Swagger Editor</li>
+                        <li class="mb-2"><strong>Code Generation:</strong> Generate client SDKs in multiple programming languages</li>
+                        <li class="mb-2"><strong>Validation:</strong> Ensure your requests match the expected schema</li>
+                        <li class="mb-2"><strong>Import to Tools:</strong> Use with Postman, Insomnia, or other API testing tools</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </article>
+</main>

APIReference/views/main/pagination.ejs

@@ -13,7 +13,7 @@
       </h2>
       <div class="grid grid-cols-1 items-start gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
          <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-            <p>In this example, we request the list fo monitors. As a result, we get a list of three monitors and can
+            <p>In this example, we request the list of monitors. As a result, we get a list of three monitors and can
                tell by the <code class="inline-code">count</code> attribute that we have reached the end of the
                result set</p>
                <h2 id="example-using-cursors" class="scroll-mt-24">

APIReference/views/pages/index.ejs

@@ -1,5 +1,7 @@
 <html lang="en" class="js-focus-visible ctshmsrlsm idc0_345">
-<%- include('../partials/head') -%>
+<%- include('../partials/head', {
+   enableGoogleTagManager: typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false,
+}) -%>
 
    <body onload="applyStyles()" class="bg-white antialiased " data-new-gr-c-s-check-loaded="14.1095.0"
       data-gr-ext-installed="">

APIReference/views/partials/head.ejs

@@ -103,6 +103,8 @@
    </style>
    <script src="https://cdn.tailwindcss.com"></script>
 
+   <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
+
    <!-- Google Tag Manager -->
    <script>(function (w, d, s, l, i) {
          w[l] = w[l] || []; w[l].push({
@@ -113,6 +115,7 @@
                'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
       })(window, document, 'script', 'dataLayer', 'GTM-PKQD5WH');</script>
    <!-- End Google Tag Manager -->
+   <% } %>
 
 
    <style>

APIReference/views/partials/nav.ejs

@@ -146,6 +146,9 @@
                                 with us on Slack</a></li>
                         <li><a class="text-sm leading-5 text-zinc-600 transition hover:text-zinc-900  "
                                 href="/support">Support</a></li>
+
+                                <li><a class="text-sm leading-5 text-zinc-600 transition hover:text-zinc-900  "
+                                href="/reference/openapi" type="_blank">OpenAPI Spec</a></li>
                         <li><a class="text-sm leading-5 text-zinc-600 transition hover:text-zinc-900  "
                                 href="https://github.com/oneuptime/oneuptime">GitHub</a></li>
                     </ul>
@@ -232,6 +235,10 @@
                                     class="flex justify-between gap-2 py-1 pr-3 text-sm transition pl-4 text-zinc-600 hover:text-zinc-900  "
                                     href="/reference/errors"><span class="truncate">Errors</span></a></li>
 
+                                    <li class="relative" style="transform: none; transform-origin: 50% 50% 0px;"><a
+                                    class="flex justify-between gap-2 py-1 pr-3 text-sm transition pl-4 text-zinc-600 hover:text-zinc-900  "
+                                    href="/reference/openapi"><span class="truncate">OpenAPI Spec</span></a></li>
+
 
                         </ul>
                     </div>

Accounts/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.7.3-alpine3.18
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 RUN npm config set fetch-retries 5
@@ -69,12 +69,11 @@ RUN npm install
 #   - 3003:  accounts
 EXPOSE 3003
 
-RUN npm i -D webpack-cli
+
 
 {{ if eq .Env.ENVIRONMENT "development" }}
-RUN mkdir /usr/src/app/dev-env
-RUN touch /usr/src/app/dev-env/.env
-RUN npm i -D webpack-dev-server
+
+
 
 #Run the app
 CMD [ "npm", "run", "dev" ]
@@ -84,6 +83,8 @@ COPY ./Accounts /usr/src/app
 # Bundle app source
 
 RUN npm run build
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}

Accounts/README.md

@@ -35,7 +35,7 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
 
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+Instead, it will copy all the configuration files and the transitive dependencies ( Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
 
 You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
 

Accounts/Serve.ts

@@ -2,6 +2,7 @@ import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import App from "Common/Server/Utils/StartServer";
+import "ejs";
 
 export const APP_NAME: string = "accounts";
 

Accounts/esbuild.config.js

@@ -0,0 +1,12 @@
+const { createConfig, build, watch } = require('Common/UI/esbuild-config');
+
+const config = createConfig({
+  serviceName: 'Accounts',
+  publicPath: '/accounts/dist/',
+});
+
+if (process.argv.includes('--watch')) {
+  watch(config, 'Accounts');
+} else {
+  build(config, 'Accounts');
+}

Accounts/nodemon.json

@@ -1,4 +1,14 @@
 {
-    "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3003 --mode=development"
+    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
+    "ignore": [
+        "./public/**",
+        "./public/dist/**",
+        "./build/*",
+        "./build/**",
+        "./build/dist/*",
+        "./build/dist/**",
+        "../Common/Server/**"
+    ],
+    "exec": "npm run dev-build && npm run start"
 }

Accounts/package.json

@@ -3,8 +3,10 @@
     "version": "0.1.0",
     "private": false,
     "scripts": {
+        "dev-build": "NODE_ENV=development node esbuild.config.js",
         "dev": "npx nodemon",
-        "build": "webpack build --mode=production",
+        "build": "NODE_ENV=production node esbuild.config.js",
+        "analyze": "analyze=true NODE_ENV=production node esbuild.config.js",
         "test": "",
         "compile": "tsc",
         "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
@@ -27,16 +29,11 @@
     },
     "dependencies": {
         "Common": "file:../Common",
-        "css-loader": "^6.11.0",
-        "dotenv": "^16.4.5",
-        "express": "^4.19.2",
-        "file-loader": "^6.2.0",
+        
+        "ejs": "^3.1.10",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",
-        "sass-loader": "^13.3.3",
-        "style-loader": "^3.3.4",
-        "ts-loader": "^9.5.1",
         "use-async-effect": "^2.2.7"
     },
     "devDependencies": {
@@ -45,7 +42,7 @@
         "@types/react-dom": "^18.0.4",
         "@types/react-router-dom": "^5.3.3",
         "nodemon": "^2.0.20",
-        "ts-node": "^10.9.1",
-        "webpack": "^5.76.0"
+       
+        "ts-node": "^10.9.1"
     }
 }

Accounts/src/App.tsx

@@ -1,12 +1,4 @@
-import ForgotPasswordPage from "./Pages/ForgotPassword";
-import LoginPage from "./Pages/Login";
-import LoginWithSSO from "./Pages/LoginWithSSO";
-import NotFound from "./Pages/NotFound";
-import RegisterPage from "./Pages/Register";
-import ResetPasswordPage from "./Pages/ResetPassword";
-import VerifyEmail from "./Pages/VerifyEmail";
-import Navigation from "Common/UI/Utils/Navigation";
-import React, { ReactElement } from "react";
+import React, { ReactElement, lazy, Suspense } from "react";
 import {
   Route,
   Routes,
@@ -14,6 +6,38 @@ import {
   useNavigate,
   useParams,
 } from "react-router-dom";
+import Navigation from "Common/UI/Utils/Navigation";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+
+// Lazy load page components
+const ForbiddenPage: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/Forbidden");
+});
+const ForgotPasswordPage: React.LazyExoticComponent<() => JSX.Element> = lazy(
+  () => {
+    return import("./Pages/ForgotPassword");
+  },
+);
+const LoginPage: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/Login");
+});
+const LoginWithSSO: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/LoginWithSSO");
+});
+const NotFound: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/NotFound");
+});
+const RegisterPage: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/Register");
+});
+const ResetPasswordPage: React.LazyExoticComponent<() => JSX.Element> = lazy(
+  () => {
+    return import("./Pages/ResetPassword");
+  },
+);
+const VerifyEmail: React.LazyExoticComponent<() => JSX.Element> = lazy(() => {
+  return import("./Pages/VerifyEmail");
+});
 
 function App(): ReactElement {
   Navigation.setNavigateHook(useNavigate());
@@ -22,24 +46,29 @@ function App(): ReactElement {
 
   return (
     <div className="m-auto h-screen">
-      <Routes>
-        <Route path="/accounts" element={<LoginPage />} />
-        <Route path="/accounts/login" element={<LoginPage />} />
-
-        <Route path="/accounts/sso" element={<LoginWithSSO />} />
-        <Route
-          path="/accounts/forgot-password"
-          element={<ForgotPasswordPage />}
-        />
-        <Route
-          path="/accounts/reset-password/:token"
-          element={<ResetPasswordPage />}
-        />
-        <Route path="/accounts/register" element={<RegisterPage />} />
-        <Route path="/accounts/verify-email/:token" element={<VerifyEmail />} />
-        {/* 👇️ only match this when no other routes match */}
-        <Route path="*" element={<NotFound />} />
-      </Routes>
+      <Suspense fallback={<PageLoader isVisible={true} />}>
+        <Routes>
+          <Route path="/accounts" element={<LoginPage />} />
+          <Route path="/accounts/login" element={<LoginPage />} />
+          <Route path="/accounts/forbidden" element={<ForbiddenPage />} />
+          <Route path="/accounts/sso" element={<LoginWithSSO />} />
+          <Route
+            path="/accounts/forgot-password"
+            element={<ForgotPasswordPage />}
+          />
+          <Route
+            path="/accounts/reset-password/:token"
+            element={<ResetPasswordPage />}
+          />
+          <Route path="/accounts/register" element={<RegisterPage />} />
+          <Route
+            path="/accounts/verify-email/:token"
+            element={<VerifyEmail />}
+          />
+          {/* 👇️ only match this when no other routes match */}
+          <Route path="*" element={<NotFound />} />
+        </Routes>
+      </Suspense>
     </div>
   );
 }

Accounts/src/Index.tsx

@@ -1,5 +1,5 @@
 import App from "./App";
-import Telemetry from "Common/UI/Utils/Telemetry";
+import Telemetry from "Common/UI/Utils/Telemetry/Telemetry";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";

Accounts/src/Pages/Forbidden.tsx

@@ -0,0 +1,18 @@
+import React from "react";
+
+const ForbiddenPage: () => JSX.Element = () => {
+  return (
+    <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
+      <div className="sm:mx-auto sm:w-full sm:max-w-md">
+        <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
+          Forbidden
+        </h2>
+        <p className="mt-2 text-center text-sm text-gray-600">
+          You do not have permission to access this page.
+        </p>
+      </div>
+    </div>
+  );
+};
+
+export default ForbiddenPage;

Accounts/src/Pages/ForgotPassword.tsx

@@ -56,6 +56,7 @@ const ForgotPassword: () => JSX.Element = () => {
                   title: "Email",
                   fieldType: FormFieldSchemaType.Email,
                   required: true,
+                  disableSpellCheck: true,
                 },
               ]}
               onSuccess={() => {

Accounts/src/Pages/Login.tsx

@@ -122,6 +122,7 @@ const LoginPage: () => JSX.Element = () => {
                   disabled: Boolean(initialValues && initialValues["email"]),
                   title: "Email",
                   dataTestId: "email",
+                  disableSpellCheck: true,
                 },
                 {
                   field: {
@@ -139,6 +140,7 @@ const LoginPage: () => JSX.Element = () => {
                     openLinkInNewTab: false,
                   },
                   dataTestId: "password",
+                  disableSpellCheck: true,
                 },
               ]}
               createOrUpdateApiUrl={apiUrl}

Accounts/src/Pages/LoginWithSSO.tsx

@@ -196,6 +196,7 @@ const LoginPage: () => JSX.Element = () => {
                 required: true,
                 title: "Email",
                 dataTestId: "email",
+                disableSpellCheck: true,
               },
             ]}
             maxPrimaryButtonWidth={true}
@@ -208,7 +209,7 @@ const LoginPage: () => JSX.Element = () => {
                 <div>
                   <Link to={new Route("/accounts/login")}>
                     <div className="text-indigo-500 hover:text-indigo-900 cursor-pointer text-sm">
-                      Use username and password insead.
+                      Use username and password instead.
                     </div>
                   </Link>
                 </div>

Accounts/src/Pages/Register.tsx

@@ -104,6 +104,7 @@ const RegisterPage: () => JSX.Element = () => {
       disabled: Boolean(initialValues && initialValues["email"]),
       title: "Email",
       dataTestId: "email",
+      disableSpellCheck: true,
     },
     {
       field: {
@@ -114,6 +115,7 @@ const RegisterPage: () => JSX.Element = () => {
       required: true,
       title: "Full Name",
       dataTestId: "name",
+      disableSpellCheck: true,
     },
   ];
 
@@ -128,6 +130,7 @@ const RegisterPage: () => JSX.Element = () => {
         required: true,
         title: "Company Name",
         dataTestId: "companyName",
+        disableSpellCheck: true,
       },
     ]);
 
@@ -159,6 +162,7 @@ const RegisterPage: () => JSX.Element = () => {
       title: "Password",
       required: true,
       dataTestId: "password",
+      disableSpellCheck: true,
     },
     {
       field: {
@@ -175,11 +179,12 @@ const RegisterPage: () => JSX.Element = () => {
       required: true,
       showEvenIfPermissionDoesNotExist: true,
       dataTestId: "confirmPassword",
+      disableSpellCheck: true,
     },
   ]);
 
   if (error) {
-    return <ErrorMessage error={error} />;
+    return <ErrorMessage message={error} />;
   }
 
   if (isLoading) {

Accounts/src/Pages/ResetPassword.tsx

@@ -68,6 +68,7 @@ const RegisterPage: () => JSX.Element = () => {
                   title: "New Password",
                   required: true,
                   showEvenIfPermissionDoesNotExist: true,
+                  disableSpellCheck: true,
                 },
                 {
                   field: {
@@ -83,6 +84,7 @@ const RegisterPage: () => JSX.Element = () => {
                   overrideFieldKey: "confirmPassword",
                   required: true,
                   showEvenIfPermissionDoesNotExist: true,
+                  disableSpellCheck: true,
                 },
               ]}
               createOrUpdateApiUrl={apiUrl}

Accounts/views/index.ejs

@@ -12,6 +12,7 @@
   <meta name="slack-app-id" content="ACVBMTPJQ">
   <meta name="description" content="OneUptime — the complete open-source observability platform.">
 
+  <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
   <!-- Google Tag Manager -->
   <script>(function (w, d, s, l, i) {
       w[l] = w[l] || []; w[l].push({
@@ -22,6 +23,7 @@
           'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
     })(window, document, 'script', 'dataLayer', 'GTM-PKQD5WH');</script>
   <!-- End Google Tag Manager -->
+  <% } %>
 
   <link rel="manifest" href="/accounts/assets/img/favicons/ma">
   
@@ -73,7 +75,7 @@
           width: auto;
       }
       </style>
-    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="/accounts/assets/js/tailwind-3.4.5.js"></script>
 
   <title>OneUptime Accounts</title>
 
@@ -95,14 +97,16 @@
 </head>
 
 <body class="h-full bg-gray-50">
+  <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
   <!-- Google Tag Manager (noscript) -->
   <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PKQD5WH" height="0" width="0"
       style="display:none;visibility:hidden"></iframe></noscript>
   <!-- End Google Tag Manager (noscript) -->
+  <% } %>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
 
-  <script src="/accounts/dist/bundle.js"></script>
+  <script type="module" src="/accounts/dist/Index.js"></script>
   <script>
     tailwind.config = {
       theme: {

Accounts/webpack.config.js

@@ -1,84 +0,0 @@
-require("ts-loader");
-require("file-loader");
-require("style-loader");
-require("css-loader");
-require("sass-loader");
-const path = require("path");
-const webpack = require("webpack");
-const dotenv = require("dotenv");
-const express = require("express");
-
-const readEnvFile = (pathToFile) => {
-  const parsed = dotenv.config({ path: pathToFile }).parsed;
-
-  const env = {};
-
-  for (const key in parsed) {
-    env[key] = JSON.stringify(parsed[key]);
-  }
-
-  return env;
-};
-
-module.exports = {
-  entry: "./src/Index.tsx",
-  mode: "development",
-  output: {
-    filename: "bundle.js",
-    path: path.resolve(__dirname, "public", "dist"),
-    publicPath: "/accounts/dist/",
-  },
-  resolve: {
-    extensions: [".ts", ".tsx", ".js", ".jsx", ".json", ".css", ".scss"],
-    alias: {
-      react: path.resolve("./node_modules/react"),
-    },
-  },
-  externals: {
-    "react-native-sqlite-storage": "react-native-sqlite-storage",
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      process: {
-        env: {
-          ...readEnvFile("/usr/src/app/dev-env/.env"),
-        },
-      },
-    }),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.(ts|tsx)$/,
-        use: "ts-loader",
-      },
-      {
-        test: /\.s[ac]ss$/i,
-        use: ["style-loader", "css-loader", "sass-loader"],
-      },
-      {
-        test: /\.css$/i,
-        use: ["style-loader", "css-loader"],
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg)$/i,
-        loader: "file-loader",
-      },
-    ],
-  },
-  devServer: {
-    historyApiFallback: true,
-    devMiddleware: {
-      writeToDisk: true,
-    },
-    allowedHosts: "all",
-    setupMiddlewares: (middlewares, devServer) => {
-      devServer.app.use(
-        "/accounts/assets",
-        express.static(path.resolve(__dirname, "public", "assets")),
-      );
-      return middlewares;
-    },
-  },
-  devtool: "eval-source-map",
-};

AdminDashboard/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.7.3-alpine3.18
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 RUN npm config set fetch-retries 5
@@ -67,19 +67,20 @@ RUN npm install
 #   - 3158:  AdminDashboard
 EXPOSE 3158
 
-RUN npm i -D webpack-cli
+
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
-RUN mkdir /usr/src/app/dev-env
-RUN touch /usr/src/app/dev-env/.env
-RUN npm i -D webpack-dev-server
+
+
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
 COPY ./AdminDashboard /usr/src/app
 # Bundle app source
 RUN npm run build
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}

AdminDashboard/README.md

@@ -35,7 +35,7 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
 
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+Instead, it will copy all the configuration files and the transitive dependencies ( Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
 
 You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
 

AdminDashboard/Serve.ts

@@ -2,6 +2,7 @@ import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import App from "Common/Server/Utils/StartServer";
+import "ejs";
 
 export const APP_NAME: string = "admin";
 

AdminDashboard/esbuild.config.js

@@ -0,0 +1,12 @@
+const { createConfig, build, watch } = require('Common/UI/esbuild-config');
+
+const config = createConfig({
+  serviceName: 'AdminDashboard',
+  publicPath: '/admin/dist/',
+});
+
+if (process.argv.includes('--watch')) {
+  watch(config, 'AdminDashboard');
+} else {
+  build(config, 'AdminDashboard');
+}

AdminDashboard/nodemon.json

@@ -1,4 +1,14 @@
 {
-    "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3158 --mode=development"
+    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
+    "ignore": [
+        "./public/**",
+        "./public/dist/**",
+        "./build/*",
+        "./build/**",
+        "./build/dist/*",
+        "./build/dist/**",
+        "../Common/Server/**"
+    ],
+    "exec": " npm run dev-build && npm run start"
 }

AdminDashboard/package.json

@@ -4,19 +4,19 @@
     "private": false,
     "dependencies": {
         "Common": "file:../Common",
-    
-        "dotenv": "^16.4.5",
-        "file-loader": "^6.2.0",
+        
+        "ejs": "^3.1.10",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-router-dom": "^6.23.1",
-        "style-loader": "^3.3.4"
+        "react-router-dom": "^6.23.1"
     },
     "scripts": {
+        "dev-build": "NODE_ENV=development node esbuild.config.js",
         "dev": "npx nodemon",
-        "build": "webpack build --mode=production",
+        "build": "NODE_ENV=production node esbuild.config.js",
+        "analyze": "analyze=true NODE_ENV=production node esbuild.config.js",
         "test": "react-app-rewired test",
-        "eject": "webpack eject",
+        "eject": "echo 'esbuild does not require eject'",
         "compile": "tsc",
         "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
         "start": "node --require ts-node/register Serve.ts",
@@ -41,13 +41,8 @@
         "@types/react": "^18.2.38",
         "@types/react-dom": "^18.0.4",
         "@types/react-router-dom": "^5.3.3",
-        "css-loader": "^6.8.1",
         "nodemon": "^2.0.20",
-        "react-app-rewired": "^2.2.1",
-        "sass": "^1.51.0",
-        "sass-loader": "^12.6.0",
-        "ts-loader": "^9.5.1",
-        "ts-node": "^10.9.1",
-        "webpack": "^5.76.0"
+       
+        "ts-node": "^10.9.1"
     }
 }

AdminDashboard/src/Components/Footer/Footer.tsx

@@ -67,7 +67,7 @@ const DashboardFooter: () => JSX.Element = () => {
   return (
     <>
       <Footer
-        className="bg-white h-16 inset-x-0 bottom-0 px-8"
+        className="bg-white px-8"
         copyright="HackerBay, Inc."
         links={[
           {

AdminDashboard/src/Components/Header/Logo.tsx

@@ -17,7 +17,9 @@ const Logo: FunctionComponent<ComponentProps> = (
         <Image
           className="block h-8 w-auto"
           onClick={() => {
-            props.onClick && props.onClick();
+            if (props.onClick) {
+              props.onClick();
+            }
           }}
           imageUrl={Route.fromString(`${OneUptimeLogo}`)}
           alt={"OneUptime"}

AdminDashboard/src/Components/Header/ProjectPicker.tsx

@@ -137,7 +137,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
             minLength: 6,
           },
           footerElement: getFooter(),
-          fieldType: FormFieldSchemaType.RadioButton,
+          fieldType: FormFieldSchemaType.OptionChooserButton,
           radioButtonOptions: SubscriptionPlan.getSubscriptionPlans(
             getAllEnvVars(),
           ).map((plan: SubscriptionPlan): RadioButton => {

AdminDashboard/src/Components/NavBar/NavBar.tsx

@@ -2,36 +2,33 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
-import NavBar from "Common/UI/Components/Navbar/NavBar";
-import NavBarItem from "Common/UI/Components/Navbar/NavBarItem";
+import NavBar, { NavItem } from "Common/UI/Components/Navbar/NavBar";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const DashboardNavbar: FunctionComponent = (): ReactElement => {
-  return (
-    <NavBar>
-      <NavBarItem
-        title="Users"
-        icon={IconProp.User}
-        route={RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route)}
-      ></NavBarItem>
+  // Build the navigation items
+  const navItems: NavItem[] = [
+    {
+      id: "users-nav-bar-item",
+      title: "Users",
+      icon: IconProp.User,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route),
+    },
+    {
+      id: "projects-nav-bar-item",
+      title: "Projects",
+      icon: IconProp.Folder,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.PROJECTS] as Route),
+    },
+    {
+      id: "settings-nav-bar-item",
+      title: "Settings",
+      icon: IconProp.Settings,
+      route: RouteUtil.populateRouteParams(RouteMap[PageMap.SETTINGS] as Route),
+    },
+  ];
 
-      <NavBarItem
-        title="Projects"
-        icon={IconProp.Folder}
-        route={RouteUtil.populateRouteParams(
-          RouteMap[PageMap.PROJECTS] as Route,
-        )}
-      ></NavBarItem>
-
-      <NavBarItem
-        title="Settings"
-        icon={IconProp.Settings}
-        route={RouteUtil.populateRouteParams(
-          RouteMap[PageMap.SETTINGS] as Route,
-        )}
-      ></NavBarItem>
-    </NavBar>
-  );
+  return <NavBar items={navItems} />;
 };
 
 export default DashboardNavbar;

AdminDashboard/src/Index.tsx

@@ -1,5 +1,5 @@
 import App from "./App";
-import Telemetry from "Common/UI/Utils/Telemetry";
+import Telemetry from "Common/UI/Utils/Telemetry/Telemetry";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -16,7 +16,7 @@ const Logout: FunctionComponent = (): ReactElement => {
 
   const logout: PromiseVoidFunction = async (): Promise<void> => {
     UiAnalytics.logout();
-    await UserUtil.logout();
+    UserUtil.logout();
     Navigation.navigate(ACCOUNTS_URL);
   };
 
@@ -41,7 +41,7 @@ const Logout: FunctionComponent = (): ReactElement => {
       ]}
     >
       {!error ? <PageLoader isVisible={true} /> : <></>}
-      {error ? <ErrorMessage error={error} /> : <></>}
+      {error ? <ErrorMessage message={error} /> : <></>}
     </Page>
   );
 };

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -75,7 +75,7 @@ const Projects: FunctionComponent = (): ReactElement => {
             minLength: 6,
           },
           footerElement: getFooter(),
-          fieldType: FormFieldSchemaType.RadioButton,
+          fieldType: FormFieldSchemaType.OptionChooserButton,
           radioButtonOptions: SubscriptionPlan.getSubscriptionPlans(
             getAllEnvVars(),
           ).map((plan: SubscriptionPlan): RadioButton => {
@@ -241,8 +241,10 @@ const Projects: FunctionComponent = (): ReactElement => {
             },
             title: "Created At",
             type: FieldType.DateTime,
+            hideOnMobile: true,
           },
         ]}
+        userPreferencesKey="admin-projects-table"
       />
     </Page>
   );

AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx

@@ -72,9 +72,9 @@ const Settings: FunctionComponent = (): ReactElement => {
           },
           {
             field: {
-              twilioPhoneNumber: true,
+              twilioPrimaryPhoneNumber: true,
             },
-            title: "Twilio Phone Number",
+            title: "Primary Twilio Phone Number",
             fieldType: FormFieldSchemaType.Phone,
             required: true,
             description: "You can find this in your Twilio console.",
@@ -83,6 +83,20 @@ const Settings: FunctionComponent = (): ReactElement => {
               minLength: 2,
             },
           },
+          {
+            field: {
+              twilioSecondaryPhoneNumbers: true,
+            },
+            title: "Secondary Twilio Phone Number",
+            fieldType: FormFieldSchemaType.LongText,
+            required: true,
+            description:
+              "If you have bought more phone numbers from Twilio for specific countries, you can add them here.",
+            placeholder: "+1234567890, +4444444444",
+            validation: {
+              minLength: 2,
+            },
+          },
         ]}
         modelDetailProps={{
           modelType: GlobalConfig,
@@ -97,12 +111,20 @@ const Settings: FunctionComponent = (): ReactElement => {
             },
             {
               field: {
-                twilioPhoneNumber: true,
+                twilioPrimaryPhoneNumber: true,
               },
-              title: "Twilio Phone Number",
+              title: "Primary Twilio Phone Number",
               fieldType: FieldType.Phone,
               placeholder: "None",
             },
+            {
+              field: {
+                twilioSecondaryPhoneNumbers: true,
+              },
+              title: "Secondary Twilio Phone Numbers",
+              fieldType: FieldType.LongText,
+              placeholder: "None",
+            },
           ],
           modelId: ObjectID.getZeroObjectID(),
         }}

AdminDashboard/src/Pages/Settings/Email/Index.tsx

@@ -21,7 +21,7 @@ import React, { FunctionComponent, ReactElement, useEffect } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {
   const [emailServerType, setemailServerType] = React.useState<EmailServerType>(
-    EmailServerType.Internal,
+    EmailServerType.CustomSMTP,
   );
 
   const [isLoading, setIsLoading] = React.useState<boolean>(true);
@@ -43,7 +43,7 @@ const Settings: FunctionComponent = (): ReactElement => {
 
     if (globalConfig) {
       setemailServerType(
-        globalConfig.emailServerType || EmailServerType.Internal,
+        globalConfig.emailServerType || EmailServerType.CustomSMTP,
       );
     }
 
@@ -61,7 +61,7 @@ const Settings: FunctionComponent = (): ReactElement => {
   }
 
   if (error) {
-    return <ErrorMessage error={error} />;
+    return <ErrorMessage message={error} />;
   }
 
   return (
@@ -106,6 +106,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             title: "Admin Notification Email",
             fieldType: FormFieldSchemaType.Email,
             required: false,
+            disableSpellCheck: true,
           },
         ]}
         modelDetailProps={{
@@ -126,7 +127,7 @@ const Settings: FunctionComponent = (): ReactElement => {
       />
 
       <CardModelDetail
-        name="Internal SMTP Settings"
+        name="Email Server Settings"
         cardProps={{
           title: "Email Server Settings",
           description:
@@ -171,7 +172,7 @@ const Settings: FunctionComponent = (): ReactElement => {
           cardProps={{
             title: "Custom Email and SMTP Settings",
             description:
-              "If you have not enabled Internal SMTP server to send emails. Please configure your SMTP server here.",
+              "Please configure your SMTP server here to send emails.",
           }}
           isEditable={true}
           editButtonText="Edit SMTP Config"
@@ -199,6 +200,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.Hostname,
               required: true,
               placeholder: "smtp.server.com",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -229,6 +231,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.Text,
               required: false,
               placeholder: "emailuser",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -239,6 +242,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.EncryptedText,
               required: false,
               placeholder: "Password",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -251,6 +255,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description:
                 "Email used to log in to this SMTP Server. This is also the email your customers will see. ",
               placeholder: "email@company.com",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -263,6 +268,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description:
                 "This is the display name your team and customers see, when they receive emails from OneUptime.",
               placeholder: "Company, Inc.",
+              disableSpellCheck: true,
             },
           ]}
           modelDetailProps={{

AdminDashboard/src/Pages/Settings/Probes/Index.tsx

@@ -54,9 +54,11 @@ const Settings: FunctionComponent = (): ReactElement => {
         title="Need help with setting up Global Probes?"
         description="Here is a guide which will help you get set up"
         link={Route.fromString("/docs/probe/custom-probe")}
+        hideOnMobile={true}
       />
 
       <ModelTable<Probe>
+        userPreferencesKey={"admin-probes-table"}
         modelType={Probe}
         id="probes-table"
         name="Settings > Global Probes"
@@ -99,7 +101,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             },
             title: "Description",
             fieldType: FormFieldSchemaType.LongText,
-            required: true,
+            required: false,
             placeholder: "This probe is to monitor all the internal services.",
           },
 
@@ -151,7 +153,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description: true,
             },
             title: "Description",
-            type: FieldType.Text,
+            type: FieldType.LongText,
           },
         ]}
         columns={[
@@ -170,8 +172,10 @@ const Settings: FunctionComponent = (): ReactElement => {
             field: {
               description: true,
             },
+            noValueMessage: "-",
             title: "Description",
-            type: FieldType.Text,
+            type: FieldType.LongText,
+            hideOnMobile: true,
           },
           {
             field: {
@@ -179,6 +183,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             },
             title: "Status",
             type: FieldType.Text,
+
             getElement: (item: Probe): ReactElement => {
               if (
                 item &&

AdminDashboard/src/Pages/Users/Index.tsx

@@ -26,6 +26,7 @@ const Users: FunctionComponent = (): ReactElement => {
     >
       <ModelTable<User>
         modelType={User}
+        userPreferencesKey="admin-users-table"
         id="users-table"
         isDeleteable={false}
         isEditable={false}
@@ -47,6 +48,7 @@ const Users: FunctionComponent = (): ReactElement => {
             fieldType: FormFieldSchemaType.Email,
             required: true,
             placeholder: "email@company.com",
+            disableSpellCheck: true,
           },
           {
             field: {
@@ -56,6 +58,7 @@ const Users: FunctionComponent = (): ReactElement => {
             fieldType: FormFieldSchemaType.Password,
             required: true,
             placeholder: "Password",
+            disableSpellCheck: true,
           },
           {
             field: {
@@ -113,6 +116,7 @@ const Users: FunctionComponent = (): ReactElement => {
             },
             title: "Email Verified",
             type: FieldType.Boolean,
+            hideOnMobile: true,
           },
           {
             field: {
@@ -120,6 +124,7 @@ const Users: FunctionComponent = (): ReactElement => {
             },
             title: "Created At",
             type: FieldType.DateTime,
+            hideOnMobile: true,
           },
         ]}
       />

AdminDashboard/views/index.ejs

@@ -11,6 +11,7 @@
     <meta name="slack-app-id" content="ACVBMTPJQ">
     <meta name="description" content="OneUptime — the complete open-source observability platform.">
 
+    <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
     <!-- Google Tag Manager -->
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
       new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -19,6 +20,7 @@
       })(window,document,'script','dataLayer','GTM-PKQD5WH');
     </script>
     <!-- End Google Tag Manager -->
+    <% } %>
 
     <link rel="manifest" href="/admin/assets/img/favicons/ma">
     <link rel="apple-touch-icon" sizes="180x180" href="/admin/assets/img/favicons/apple-touch-icon.png">
@@ -66,7 +68,7 @@
           width: auto;
       }
       </style>
-    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="/admin/assets/js/tailwind-3.4.5.js"></script>
     
     <script src="/admin/env.js"></script>
 
@@ -89,14 +91,16 @@
     -->
   </head>
   <body class="h-full bg-gray-50">
+    <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
     <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PKQD5WH"
   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
   <!-- End Google Tag Manager (noscript) -->
+    <% } %>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
 
-    <script src="/admin/dist/bundle.js"></script>
+    <script type="module" src="/admin/dist/Index.js"></script>
     <script>
       tailwind.config = {
         theme: {

AdminDashboard/webpack.config.js

@@ -1,84 +0,0 @@
-require("ts-loader");
-require("file-loader");
-require("style-loader");
-require("css-loader");
-require("sass-loader");
-const path = require("path");
-const webpack = require("webpack");
-const dotenv = require("dotenv");
-const express = require("express");
-
-const readEnvFile = (pathToFile) => {
-  const parsed = dotenv.config({ path: pathToFile }).parsed;
-
-  const env = {};
-
-  for (const key in parsed) {
-    env[key] = JSON.stringify(parsed[key]);
-  }
-
-  return env;
-};
-
-module.exports = {
-  entry: "./src/Index.tsx",
-  mode: "development",
-  output: {
-    filename: "bundle.js",
-    path: path.resolve(__dirname, "public", "dist"),
-    publicPath: "/admin/dist/",
-  },
-  resolve: {
-    extensions: [".ts", ".tsx", ".js", ".jsx", ".json", ".css", ".scss"],
-    alias: {
-      react: path.resolve("./node_modules/react"),
-    },
-  },
-  externals: {
-    "react-native-sqlite-storage": "react-native-sqlite-storage",
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      process: {
-        env: {
-          ...readEnvFile("/usr/src/app/dev-env/.env"),
-        },
-      },
-    }),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.(ts|tsx)$/,
-        use: "ts-loader",
-      },
-      {
-        test: /\.s[ac]ss$/i,
-        use: ["style-loader", "css-loader", "sass-loader"],
-      },
-      {
-        test: /\.css$/i,
-        use: ["style-loader", "css-loader"],
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg)$/i,
-        loader: "file-loader",
-      },
-    ],
-  },
-  devServer: {
-    historyApiFallback: true,
-    devMiddleware: {
-      writeToDisk: true,
-    },
-    allowedHosts: "all",
-    setupMiddlewares: (middlewares, devServer) => {
-      devServer.app.use(
-        "/admin/assets",
-        express.static(path.resolve(__dirname, "public", "assets")),
-      );
-      return middlewares;
-    },
-  },
-  devtool: "eval-source-map",
-};

App/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.2-alpine3.18
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 RUN npm config set fetch-retries 5
@@ -65,6 +65,8 @@ CMD [ "npm", "run", "dev" ]
 COPY ./App /usr/src/app
 # Bundle app source
 RUN npm run compile
+# Set permission to write logs and cache in case container run as non root
+RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}

App/FeatureSet/BaseAPI/Index.ts

@@ -10,21 +10,26 @@ import GlobalConfigAPI from "Common/Server/API/GlobalConfigAPI";
 import MonitorGroupAPI from "Common/Server/API/MonitorGroupAPI";
 import NotificationAPI from "Common/Server/API/NotificationAPI";
 import TelemetryAPI from "Common/Server/API/TelemetryAPI";
-import Ingestor from "Common/Server/API/ProbeAPI";
+import ProbeAPI from "Common/Server/API/ProbeAPI";
 import ProjectAPI from "Common/Server/API/ProjectAPI";
 import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
+
 // Import API
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
+import MonitorAPI from "Common/Server/API/MonitorAPI";
 import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
 import StatusPageAPI from "Common/Server/API/StatusPageAPI";
+import WorkspaceNotificationRuleAPI from "Common/Server/API/WorkspaceNotificationRuleAPI";
 import StatusPageDomainAPI from "Common/Server/API/StatusPageDomainAPI";
 import StatusPageSubscriberAPI from "Common/Server/API/StatusPageSubscriberAPI";
 import UserCallAPI from "Common/Server/API/UserCallAPI";
 import UserTwoFactorAuthAPI from "Common/Server/API/UserTwoFactorAuthAPI";
+import MonitorTest from "Common/Models/DatabaseModels/MonitorTest";
 // User Notification methods.
 import UserEmailAPI from "Common/Server/API/UserEmailAPI";
 import UserNotificationLogTimelineAPI from "Common/Server/API/UserOnCallLogTimelineAPI";
 import UserSMSAPI from "Common/Server/API/UserSmsAPI";
+import UserPushAPI from "Common/Server/API/UserPushAPI";
 import ApiKeyPermissionService, {
   Service as ApiKeyPermissionServiceType,
 } from "Common/Server/Services/ApiKeyPermissionService";
@@ -46,6 +51,40 @@ import TelemetryIngestionKeyService, {
 import EmailVerificationTokenService, {
   Service as EmailVerificationTokenServiceType,
 } from "Common/Server/Services/EmailVerificationTokenService";
+
+import AlertCustomFieldService, {
+  Service as AlertCustomFieldServiceType,
+} from "Common/Server/Services/AlertCustomFieldService";
+import AlertInternalNoteService, {
+  Service as AlertInternalNoteServiceType,
+} from "Common/Server/Services/AlertInternalNoteService";
+import AlertNoteTemplateService, {
+  Service as AlertNoteTemplateServiceType,
+} from "Common/Server/Services/AlertNoteTemplateService";
+import AlertOwnerTeamService, {
+  Service as AlertOwnerTeamServiceType,
+} from "Common/Server/Services/AlertOwnerTeamService";
+
+import DashboardService, {
+  Service as DashboardServiceType,
+} from "Common/Server/Services/DashboardService";
+
+import AlertOwnerUserService, {
+  Service as AlertOwnerUserServiceType,
+} from "Common/Server/Services/AlertOwnerUserService";
+import AlertService, {
+  Service as AlertServiceType,
+} from "Common/Server/Services/AlertService";
+import AlertSeverityService, {
+  Service as AlertSeverityServiceType,
+} from "Common/Server/Services/AlertSeverityService";
+import AlertStateService, {
+  Service as AlertStateServiceType,
+} from "Common/Server/Services/AlertStateService";
+import AlertStateTimelineService, {
+  Service as AlertStateTimelineServiceType,
+} from "Common/Server/Services/AlertStateTimelineService";
+
 import IncidentCustomFieldService, {
   Service as IncidentCustomFieldServiceType,
 } from "Common/Server/Services/IncidentCustomFieldService";
@@ -55,6 +94,9 @@ import IncidentInternalNoteService, {
 import IncidentNoteTemplateService, {
   Service as IncidentNoteTemplateServiceType,
 } from "Common/Server/Services/IncidentNoteTemplateService";
+import TableViewService, {
+  Service as TableViewServiceType,
+} from "Common/Server/Services/TableViewService";
 import IncidentOwnerTeamService, {
   Service as IncidentOwnerTeamServiceType,
 } from "Common/Server/Services/IncidentOwnerTeamService";
@@ -73,6 +115,9 @@ import IncidentSeverityService, {
 import IncidentStateService, {
   Service as IncidentStateServiceType,
 } from "Common/Server/Services/IncidentStateService";
+import MonitorTestService, {
+  Service as MonitorTestServiceType,
+} from "Common/Server/Services/MonitorTestService";
 import IncidentStateTimelineService, {
   Service as IncidentStateTimelineServiceType,
 } from "Common/Server/Services/IncidentStateTimelineService";
@@ -114,9 +159,6 @@ import MonitorGroupOwnerUserService, {
 import MonitorGroupResourceService, {
   Service as MonitorGroupResourceServiceType,
 } from "Common/Server/Services/MonitorGroupResourceService";
-import MonitorMetricsByMinuteService, {
-  MonitorMetricsByMinuteService as MonitorMetricsByMinuteServiceType,
-} from "Common/Server/Services/MonitorMetricsByMinuteService";
 import MonitorOwnerTeamService, {
   Service as MonitorOwnerTeamServiceType,
 } from "Common/Server/Services/MonitorOwnerTeamService";
@@ -129,15 +171,17 @@ import MonitorProbeService, {
 import MonitorSecretService, {
   Service as MonitorSecretServiceType,
 } from "Common/Server/Services/MonitorSecretService";
-import MonitorService, {
-  Service as MonitorServiceType,
-} from "Common/Server/Services/MonitorService";
 import MonitorStatusService, {
   Service as MonitorStatusServiceType,
 } from "Common/Server/Services/MonitorStatusService";
 import MonitorTimelineStatusService, {
   Service as MonitorTimelineStatusServiceType,
 } from "Common/Server/Services/MonitorStatusTimelineService";
+// user override
+import OnCallDutyPolicyUserOverrideService, {
+  Service as OnCallDutyPolicyUserOverrideServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyUserOverrideService";
+import OnCallDutyPolicyUserOverride from "Common/Models/DatabaseModels/OnCallDutyPolicyUserOverride";
 import OnCallDutyPolicyCustomFieldService, {
   Service as OnCallDutyPolicyCustomFieldServiceType,
 } from "Common/Server/Services/OnCallDutyPolicyCustomFieldService";
@@ -168,9 +212,6 @@ import OnCallDutyPolicyScheduleLayerUserService, {
 import OnCallDutyPolicyScheduleService, {
   Service as OnCallDutyPolicyScheduleServiceType,
 } from "Common/Server/Services/OnCallDutyPolicyScheduleService";
-import OnCallDutyPolicyService, {
-  Service as OnCallDutyPolicyServiceType,
-} from "Common/Server/Services/OnCallDutyPolicyService";
 import ProjectCallSMSConfigService, {
   Service as ProjectCallSMSConfigServiceType,
 } from "Common/Server/Services/ProjectCallSMSConfigService";
@@ -334,7 +375,6 @@ import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import Log from "Common/Models/AnalyticsModels/Log";
 import Metric from "Common/Models/AnalyticsModels/Metric";
-import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
 import Span from "Common/Models/AnalyticsModels/Span";
 import ApiKey from "Common/Models/DatabaseModels/ApiKey";
 import ApiKeyPermission from "Common/Models/DatabaseModels/ApiKeyPermission";
@@ -342,6 +382,18 @@ import CallLog from "Common/Models/DatabaseModels/CallLog";
 import Domain from "Common/Models/DatabaseModels/Domain";
 import EmailLog from "Common/Models/DatabaseModels/EmailLog";
 import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
+import Dashboard from "Common/Models/DatabaseModels/Dashboard";
+
+import Alert from "Common/Models/DatabaseModels/Alert";
+import AlertCustomField from "Common/Models/DatabaseModels/AlertCustomField";
+import AlertInternalNote from "Common/Models/DatabaseModels/AlertInternalNote";
+import AlertNoteTemplate from "Common/Models/DatabaseModels/AlertNoteTemplate";
+import AlertOwnerTeam from "Common/Models/DatabaseModels/AlertOwnerTeam";
+import AlertOwnerUser from "Common/Models/DatabaseModels/AlertOwnerUser";
+import AlertSeverity from "Common/Models/DatabaseModels/AlertSeverity";
+import AlertState from "Common/Models/DatabaseModels/AlertState";
+import AlertStateTimeline from "Common/Models/DatabaseModels/AlertStateTimeline";
+
 import Incident from "Common/Models/DatabaseModels/Incident";
 import IncidentCustomField from "Common/Models/DatabaseModels/IncidentCustomField";
 import IncidentInternalNote from "Common/Models/DatabaseModels/IncidentInternalNote";
@@ -355,8 +407,8 @@ import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTim
 import IncidentTemplate from "Common/Models/DatabaseModels/IncidentTemplate";
 import IncidentTemplateOwnerTeam from "Common/Models/DatabaseModels/IncidentTemplateOwnerTeam";
 import IncidentTemplateOwnerUser from "Common/Models/DatabaseModels/IncidentTemplateOwnerUser";
+
 import Label from "Common/Models/DatabaseModels/Label";
-import Monitor from "Common/Models/DatabaseModels/Monitor";
 import MonitorCustomField from "Common/Models/DatabaseModels/MonitorCustomField";
 import MonitorGroupOwnerTeam from "Common/Models/DatabaseModels/MonitorGroupOwnerTeam";
 import MonitorGroupOwnerUser from "Common/Models/DatabaseModels/MonitorGroupOwnerUser";
@@ -367,7 +419,6 @@ import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe";
 import MonitorSecret from "Common/Models/DatabaseModels/MonitorSecret";
 import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus";
 import MonitorTimelineStatus from "Common/Models/DatabaseModels/MonitorStatusTimeline";
-import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy";
 import OnCallDutyPolicyCustomField from "Common/Models/DatabaseModels/OnCallDutyPolicyCustomField";
 import OnCallDutyPolicyEscalationRule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicyEscalationRuleSchedule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule";
@@ -443,6 +494,103 @@ import ScheduledMaintenanceTemplateOwnerTeamService, {
 import ScheduledMaintenanceTemplateOwnerUserService, {
   Service as ScheduledMaintenanceTemplateOwnerUserServiceType,
 } from "Common/Server/Services/ScheduledMaintenanceTemplateOwnerUserService";
+import TableView from "Common/Models/DatabaseModels/TableView";
+
+import IncidentFeed from "Common/Models/DatabaseModels/IncidentFeed";
+import AlertFeed from "Common/Models/DatabaseModels/AlertFeed";
+import ScheduledMaintenanceFeed from "Common/Models/DatabaseModels/ScheduledMaintenanceFeed";
+
+import IncidentFeedService, {
+  Service as IncidentFeedServiceType,
+} from "Common/Server/Services/IncidentFeedService";
+
+import AlertFeedService, {
+  Service as AlertFeedServiceType,
+} from "Common/Server/Services/AlertFeedService";
+
+import ScheduledMaintenanceFeedService, {
+  Service as ScheduledMaintenanceFeedServiceType,
+} from "Common/Server/Services/ScheduledMaintenanceFeedService";
+
+import SlackAPI from "Common/Server/API/SlackAPI";
+
+import WorkspaceProjectAuthToken from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken";
+import WorkspaceProjectAuthTokenService, {
+  Service as WorkspaceProjectAuthTokenServiceType,
+} from "Common/Server/Services/WorkspaceProjectAuthTokenService";
+
+import WorkspaceUserAuthToken from "Common/Models/DatabaseModels/WorkspaceUserAuthToken";
+
+import WorkspaceUserAuthTokenService, {
+  Service as WorkspaceUserAuthTokenServiceType,
+} from "Common/Server/Services/WorkspaceUserAuthTokenService";
+
+import WorkspaceSetting from "Common/Models/DatabaseModels/WorkspaceSetting";
+import WorkspaceSettingService, {
+  Service as WorkspaceSettingServiceType,
+} from "Common/Server/Services/WorkspaceSettingService";
+
+import ProjectUser from "Common/Models/DatabaseModels/ProjectUser";
+import ProjectUserService, {
+  Service as ProjectUserServiceType,
+} from "Common/Server/Services/ProjectUserService";
+
+import MonitorFeed from "Common/Models/DatabaseModels/MonitorFeed";
+import MonitorFeedService, {
+  Service as MonitorFeedServiceType,
+} from "Common/Server/Services/MonitorFeedService";
+
+// MetricType.
+import MetricTypeService, {
+  Service as MetricTypeServiceType,
+} from "Common/Server/Services/MetricTypeService";
+import MetricType from "Common/Models/DatabaseModels/MetricType";
+
+import OnCallDutyPolicyAPI from "Common/Server/API/OnCallDutyPolicyAPI";
+
+// OnCallDutyPolicyOwnerTeam
+// OnCallDutyPolicyOwnerUser
+// OnCallDutyPolicyFeed
+
+import OnCallDutyPolicyFeed from "Common/Models/DatabaseModels/OnCallDutyPolicyFeed";
+import OnCallDutyPolicyFeedService, {
+  Service as OnCallDutyPolicyFeedServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyFeedService";
+
+import OnCallDutyPolicyOwnerTeam from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerTeam";
+import OnCallDutyPolicyOwnerTeamService, {
+  Service as OnCallDutyPolicyOwnerTeamServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyOwnerTeamService";
+
+import OnCallDutyPolicyOwnerUser from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerUser";
+import OnCallDutyPolicyOwnerUserService, {
+  Service as OnCallDutyPolicyOwnerUserServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyOwnerUserService";
+import MonitorLog from "Common/Models/AnalyticsModels/MonitorLog";
+import MonitorLogService, {
+  Service as MonitorLogServiceType,
+} from "Common/Server/Services/MonitorLogService";
+
+//OnCallDutyPolicyTimeLog
+import OnCallDutyPolicyTimeLog from "Common/Models/DatabaseModels/OnCallDutyPolicyTimeLog";
+import OnCallDutyPolicyTimeLogService, {
+  Service as OnCallDutyPolicyTimeLogServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyTimeLogService";
+
+// statu spage announcement templates
+import StatusPageAnnouncementTemplate from "Common/Models/DatabaseModels/StatusPageAnnouncementTemplate";
+import StatusPageAnnouncementTemplateService, {
+  Service as StatusPageAnnouncementTemplateServiceType,
+} from "Common/Server/Services/StatusPageAnnouncementTemplateService";
+
+// ProjectSCIM
+import ProjectSCIM from "Common/Models/DatabaseModels/ProjectSCIM";
+import ProjectSCIMService, {
+  Service as ProjectSCIMServiceType,
+} from "Common/Server/Services/ProjectSCIMService";
+
+// Open API Spec
+import OpenAPI from "Common/Server/API/OpenAPI";
 
 const BaseAPIFeatureSet: FeatureSet = {
   init: async (): Promise<void> => {
@@ -458,6 +606,247 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, OpenAPI.getRouter());
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAnalyticsAPI<MonitorLog, MonitorLogServiceType>(
+        MonitorLog,
+        MonitorLogService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertState, AlertStateServiceType>(
+        AlertState,
+        AlertStateService,
+      ).getRouter(),
+    );
+
+    // Project SCIM
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectSCIM, ProjectSCIMServiceType>(
+        ProjectSCIM,
+        ProjectSCIMService,
+      ).getRouter(),
+    );
+
+    // status page announcement templates
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateServiceType
+      >(
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateService,
+      ).getRouter(),
+    );
+
+    // OnCallDutyPolicyTimeLogService
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<OnCallDutyPolicyTimeLog, OnCallDutyPolicyTimeLogServiceType>(
+        OnCallDutyPolicyTimeLog,
+        OnCallDutyPolicyTimeLogService,
+      ).getRouter(),
+    );
+
+    // on-call policy owner user.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyOwnerUser,
+        OnCallDutyPolicyOwnerUserServiceType
+      >(
+        OnCallDutyPolicyOwnerUser,
+        OnCallDutyPolicyOwnerUserService,
+      ).getRouter(),
+    );
+
+    // on-call policy owner team.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyOwnerTeam,
+        OnCallDutyPolicyOwnerTeamServiceType
+      >(
+        OnCallDutyPolicyOwnerTeam,
+        OnCallDutyPolicyOwnerTeamService,
+      ).getRouter(),
+    );
+
+    // on-call policy feed.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<OnCallDutyPolicyFeed, OnCallDutyPolicyFeedServiceType>(
+        OnCallDutyPolicyFeed,
+        OnCallDutyPolicyFeedService,
+      ).getRouter(),
+    );
+
+    // monitor feed
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MonitorFeed, MonitorFeedServiceType>(
+        MonitorFeed,
+        MonitorFeedService,
+      ).getRouter(),
+    );
+
+    // MetricType
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MetricType, MetricTypeServiceType>(
+        MetricType,
+        MetricTypeService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MonitorTest, MonitorTestServiceType>(
+        MonitorTest,
+        MonitorTestService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectUser, ProjectUserServiceType>(
+        ProjectUser,
+        ProjectUserService,
+      ).getRouter(),
+    );
+
+    //service provider setting
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<WorkspaceSetting, WorkspaceSettingServiceType>(
+        WorkspaceSetting,
+        WorkspaceSettingService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<IncidentFeed, IncidentFeedServiceType>(
+        IncidentFeed,
+        IncidentFeedService,
+      ).getRouter(),
+    );
+
+    // user override
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyUserOverride,
+        OnCallDutyPolicyUserOverrideServiceType
+      >(
+        OnCallDutyPolicyUserOverride,
+        OnCallDutyPolicyUserOverrideService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertFeed, AlertFeedServiceType>(
+        AlertFeed,
+        AlertFeedService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        ScheduledMaintenanceFeed,
+        ScheduledMaintenanceFeedServiceType
+      >(ScheduledMaintenanceFeed, ScheduledMaintenanceFeedService).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertNoteTemplate, AlertNoteTemplateServiceType>(
+        AlertNoteTemplate,
+        AlertNoteTemplateService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        WorkspaceProjectAuthToken,
+        WorkspaceProjectAuthTokenServiceType
+      >(
+        WorkspaceProjectAuthToken,
+        WorkspaceProjectAuthTokenService,
+      ).getRouter(),
+    );
+
+    // user auth token
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<WorkspaceUserAuthToken, WorkspaceUserAuthTokenServiceType>(
+        WorkspaceUserAuthToken,
+        WorkspaceUserAuthTokenService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<Alert, AlertServiceType>(Alert, AlertService).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertSeverity, AlertSeverityServiceType>(
+        AlertSeverity,
+        AlertSeverityService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertOwnerTeam, AlertOwnerTeamServiceType>(
+        AlertOwnerTeam,
+        AlertOwnerTeamService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertOwnerUser, AlertOwnerUserServiceType>(
+        AlertOwnerUser,
+        AlertOwnerUserService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertCustomField, AlertCustomFieldServiceType>(
+        AlertCustomField,
+        AlertCustomFieldService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertInternalNote, AlertInternalNoteServiceType>(
+        AlertInternalNote,
+        AlertInternalNoteService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<AlertStateTimeline, AlertStateTimelineServiceType>(
+        AlertStateTimeline,
+        AlertStateTimelineService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAnalyticsAPI<ExceptionInstance, ExceptionInstanceServiceType>(
@@ -526,18 +915,18 @@ const BaseAPIFeatureSet: FeatureSet = {
 
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAnalyticsAPI<Metric, MetricServiceType>(
-        Metric,
-        MetricService,
+      new BaseAPI<Dashboard, DashboardServiceType>(
+        Dashboard,
+        DashboardService,
       ).getRouter(),
     );
 
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAnalyticsAPI<
-        MonitorMetricsByMinute,
-        MonitorMetricsByMinuteServiceType
-      >(MonitorMetricsByMinute, MonitorMetricsByMinuteService).getRouter(),
+      new BaseAnalyticsAPI<Metric, MetricServiceType>(
+        Metric,
+        MetricService,
+      ).getRouter(),
     );
 
     app.use(
@@ -776,6 +1165,14 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<TableView, TableViewServiceType>(
+        TableView,
+        TableViewService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<IncidentState, IncidentStateServiceType>(
@@ -1114,14 +1511,6 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<Monitor, MonitorServiceType>(
-        Monitor,
-        MonitorService,
-      ).getRouter(),
-    );
-
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<SmsLog, SmsLogServiceType>(SmsLog, SmsLogService).getRouter(),
@@ -1168,10 +1557,22 @@ const BaseAPIFeatureSet: FeatureSet = {
     );
 
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ShortLinkAPI().getRouter());
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new MonitorAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new StatusPageAPI().getRouter(),
     );
+
+    // OnCallDutyPolicyAPI
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new OnCallDutyPolicyAPI().getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new WorkspaceNotificationRuleAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new FileAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1191,6 +1592,7 @@ const BaseAPIFeatureSet: FeatureSet = {
       `/${APP_NAME.toLocaleLowerCase()}`,
       new ResellerPlanAPI().getRouter(),
     );
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new SlackAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new GlobalConfigAPI().getRouter(),
@@ -1222,7 +1624,8 @@ const BaseAPIFeatureSet: FeatureSet = {
     );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserEmailAPI().getRouter());
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserSMSAPI().getRouter());
-    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new Ingestor().getRouter());
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserPushAPI().getRouter());
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ProbeAPI().getRouter());
 
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1279,14 +1682,6 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<OnCallDutyPolicy, OnCallDutyPolicyServiceType>(
-        OnCallDutyPolicy,
-        OnCallDutyPolicyService,
-      ).getRouter(),
-    );
-
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<

App/FeatureSet/Identity/API/SCIM.ts

@@ -0,0 +1,663 @@
+import SCIMMiddleware from "Common/Server/Middleware/SCIMAuthorization";
+import UserService from "Common/Server/Services/UserService";
+import TeamMemberService from "Common/Server/Services/TeamMemberService";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+  OneUptimeRequest,
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
+import logger from "Common/Server/Utils/Logger";
+import ObjectID from "Common/Types/ObjectID";
+import Email from "Common/Types/Email";
+import Name from "Common/Types/Name";
+import { JSONObject } from "Common/Types/JSON";
+import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import ProjectSCIM from "Common/Models/DatabaseModels/ProjectSCIM";
+import BadRequestException from "Common/Types/Exception/BadRequestException";
+import NotFoundException from "Common/Types/Exception/NotFoundException";
+import OneUptimeDate from "Common/Types/Date";
+import LIMIT_MAX, { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
+import Query from "Common/Types/BaseDatabase/Query";
+import ProjectUser from "Common/Models/DatabaseModels/ProjectUser";
+import QueryHelper from "Common/Server/Types/Database/QueryHelper";
+import User from "Common/Models/DatabaseModels/User";
+import {
+  parseNameFromSCIM,
+  formatUserForSCIM,
+  generateServiceProviderConfig,
+  generateUsersListResponse,
+  parseSCIMQueryParams,
+  logSCIMOperation,
+} from "../Utils/SCIMUtils";
+import { DocsClientUrl } from "Common/Server/EnvironmentConfig";
+
+const router: ExpressRouter = Express.getRouter();
+
+const handleUserTeamOperations: (
+  operation: "add" | "remove",
+  projectId: ObjectID,
+  userId: ObjectID,
+  scimConfig: ProjectSCIM,
+) => Promise<void> = async (
+  operation: "add" | "remove",
+  projectId: ObjectID,
+  userId: ObjectID,
+  scimConfig: ProjectSCIM,
+): Promise<void> => {
+  const teamsIds: Array<ObjectID> =
+    scimConfig.teams?.map((team: any) => {
+      return team.id;
+    }) || [];
+
+  if (teamsIds.length === 0) {
+    logger.debug(`SCIM Team operations - no teams configured for SCIM`);
+    return;
+  }
+
+  if (operation === "add") {
+    logger.debug(
+      `SCIM Team operations - adding user to ${teamsIds.length} configured teams`,
+    );
+
+    for (const team of scimConfig.teams || []) {
+      const existingMember: TeamMember | null =
+        await TeamMemberService.findOneBy({
+          query: {
+            projectId: projectId,
+            userId: userId,
+            teamId: team.id!,
+          },
+          select: { _id: true },
+          props: { isRoot: true },
+        });
+
+      if (!existingMember) {
+        logger.debug(`SCIM Team operations - adding user to team: ${team.id}`);
+        const teamMember: TeamMember = new TeamMember();
+        teamMember.projectId = projectId;
+        teamMember.userId = userId;
+        teamMember.teamId = team.id!;
+        teamMember.hasAcceptedInvitation = true;
+        teamMember.invitationAcceptedAt = OneUptimeDate.getCurrentDate();
+
+        await TeamMemberService.create({
+          data: teamMember,
+          props: {
+            isRoot: true,
+            ignoreHooks: true,
+          },
+        });
+      } else {
+        logger.debug(
+          `SCIM Team operations - user already member of team: ${team.id}`,
+        );
+      }
+    }
+  } else if (operation === "remove") {
+    logger.debug(
+      `SCIM Team operations - removing user from ${teamsIds.length} configured teams`,
+    );
+
+    await TeamMemberService.deleteBy({
+      query: {
+        projectId: projectId,
+        userId: userId,
+        teamId: QueryHelper.any(teamsIds),
+      },
+      skip: 0,
+      limit: LIMIT_PER_PROJECT,
+      props: { isRoot: true },
+    });
+  }
+};
+
+// SCIM Service Provider Configuration - GET /scim/v2/ServiceProviderConfig
+router.get(
+  "/scim/v2/:projectScimId/ServiceProviderConfig",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logSCIMOperation("ServiceProviderConfig", "project", req.params["projectScimId"]!);
+      
+      const serviceProviderConfig: JSONObject = generateServiceProviderConfig(
+        req,
+        req.params["projectScimId"]!,
+        "project",
+        DocsClientUrl.toString()+"/identity/scim"
+      );
+
+      logger.debug("Project SCIM ServiceProviderConfig response prepared successfully");
+      return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Basic Users endpoint - GET /scim/v2/Users
+router.get(
+  "/scim/v2/:projectScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logSCIMOperation("Users list", "project", req.params["projectScimId"]!);
+      
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+
+      // Parse query parameters
+      const { startIndex, count } = parseSCIMQueryParams(req);
+      const filter: string = req.query["filter"] as string;
+
+      logSCIMOperation(
+        "Users list",
+        "project", 
+        req.params["projectScimId"]!,
+        `startIndex: ${startIndex}, count: ${count}, filter: ${filter || "none"}`
+      );
+
+      // Build query for team members in this project
+      const query: Query<ProjectUser> = {
+        projectId: projectId,
+      };
+
+      // Handle SCIM filter for userName
+      if (filter) {
+        const emailMatch: RegExpMatchArray | null = filter.match(
+          /userName eq "([^"]+)"/i,
+        );
+        if (emailMatch) {
+          const email: string = emailMatch[1]!;
+          logSCIMOperation("Users list", "project", req.params["projectScimId"]!, `filter by email: ${email}`);
+          
+          if (email) {
+            const user: User | null = await UserService.findOneBy({
+              query: { email: new Email(email) },
+              select: { _id: true },
+              props: { isRoot: true },
+            });
+            if (user && user.id) {
+              query.userId = user.id;
+              logSCIMOperation("Users list", "project", req.params["projectScimId"]!, `found user with id: ${user.id}`);
+            } else {
+              logSCIMOperation("Users list", "project", req.params["projectScimId"]!, `user not found for email: ${email}`);
+              return Response.sendJsonObjectResponse(req, res, generateUsersListResponse([], startIndex, 0));
+            }
+          }
+        }
+      }
+
+      logSCIMOperation("Users list", "project", req.params["projectScimId"]!, `query built for projectId: ${projectId}`);
+
+      // Get team members
+      const teamMembers: Array<TeamMember> = await TeamMemberService.findBy({
+        query: query,
+        limit: LIMIT_MAX,
+        skip: 0,
+        props: { isRoot: true },
+        select: {
+          userId: true,
+          user: {
+            _id: true,
+            email: true,
+            name: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+        },
+      });
+
+      // now get unique users.
+      const usersInProjects: Array<JSONObject> = teamMembers
+        .filter((tm: TeamMember) => {
+          return tm.user && tm.user.id;
+        })
+        .map((tm: TeamMember) => {
+          return formatUserForSCIM(tm.user!, req, req.params["projectScimId"]!, "project");
+        });
+
+      // remove duplicates
+      const uniqueUserIds: Set<string> = new Set<string>();
+      const users: Array<JSONObject> = usersInProjects.filter(
+        (user: JSONObject) => {
+          if (uniqueUserIds.has(user["id"]?.toString() || "")) {
+            return false;
+          }
+          uniqueUserIds.add(user["id"]?.toString() || "");
+          return true;
+        },
+      );
+
+      // now paginate the results
+      const paginatedUsers: Array<JSONObject> = users.slice(
+        (startIndex - 1) * count,
+        startIndex * count,
+      );
+
+      logger.debug(`SCIM Users response prepared with ${users.length} users`);
+
+      return Response.sendJsonObjectResponse(req, res, generateUsersListResponse(paginatedUsers, startIndex, users.length));
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Get Individual User - GET /scim/v2/Users/{id}
+router.get(
+  "/scim/v2/:projectScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `SCIM Get individual user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const userId: string = req.params["userId"]!;
+
+      logger.debug(
+        `SCIM Get user - projectId: ${projectId}, userId: ${userId}`,
+      );
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Check if user exists and is part of the project
+      const projectUser: TeamMember | null = await TeamMemberService.findOneBy({
+        query: {
+          projectId: projectId,
+          userId: new ObjectID(userId),
+        },
+        select: {
+          userId: true,
+          user: {
+            _id: true,
+            email: true,
+            name: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+        },
+        props: { isRoot: true },
+      });
+
+      if (!projectUser || !projectUser.user) {
+        logger.debug(
+          `SCIM Get user - user not found or not part of project for userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this project",
+        );
+      }
+
+      logger.debug(`SCIM Get user - found user: ${projectUser.user.id}`);
+
+      const user: JSONObject = formatUserForSCIM(projectUser.user, req, req.params["projectScimId"]!, "project");
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Update User - PUT /scim/v2/Users/{id}
+router.put(
+  "/scim/v2/:projectScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `SCIM Update user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const userId: string = req.params["userId"]!;
+      const scimUser: JSONObject = req.body;
+
+      logger.debug(
+        `SCIM Update user - projectId: ${projectId}, userId: ${userId}`,
+      );
+
+      logger.debug(
+        `Request body for SCIM Update user: ${JSON.stringify(scimUser, null, 2)}`,
+      );
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Check if user exists and is part of the project
+      const projectUser: TeamMember | null = await TeamMemberService.findOneBy({
+        query: {
+          projectId: projectId,
+          userId: new ObjectID(userId),
+        },
+        select: {
+          userId: true,
+          user: {
+            _id: true,
+            email: true,
+            name: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+        },
+        props: { isRoot: true },
+      });
+
+      if (!projectUser || !projectUser.user) {
+        logger.debug(
+          `SCIM Update user - user not found or not part of project for userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this project",
+        );
+      }
+
+      // Update user information
+      const email: string =
+        (scimUser["userName"] as string) ||
+        ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
+      const name: string = parseNameFromSCIM(scimUser);
+      const active: boolean = scimUser["active"] as boolean;
+
+      logger.debug(
+        `SCIM Update user - email: ${email}, name: ${name}, active: ${active}`,
+      );
+
+      // Handle user deactivation by removing from teams
+      if (active === false) {
+        logger.debug(
+          `SCIM Update user - user marked as inactive, removing from teams`,
+        );
+        const scimConfig: ProjectSCIM = bearerData["scimConfig"] as ProjectSCIM;
+        await handleUserTeamOperations(
+          "remove",
+          projectId,
+          new ObjectID(userId),
+          scimConfig,
+        );
+        logger.debug(
+          `SCIM Update user - user successfully removed from teams due to deactivation`,
+        );
+      }
+
+      // Handle user activation by adding to teams
+      if (active === true) {
+        logger.debug(
+          `SCIM Update user - user marked as active, adding to teams`,
+        );
+        const scimConfig: ProjectSCIM = bearerData["scimConfig"] as ProjectSCIM;
+        await handleUserTeamOperations(
+          "add",
+          projectId,
+          new ObjectID(userId),
+          scimConfig,
+        );
+        logger.debug(
+          `SCIM Update user - user successfully added to teams due to activation`,
+        );
+      }
+
+      if (email || name) {
+        const updateData: any = {};
+        if (email) {
+          updateData.email = new Email(email);
+        }
+        if (name) {
+          updateData.name = new Name(name);
+        }
+
+        logger.debug(
+          `SCIM Update user - updating user with data: ${JSON.stringify(updateData)}`,
+        );
+
+        await UserService.updateOneById({
+          id: new ObjectID(userId),
+          data: updateData,
+          props: { isRoot: true },
+        });
+
+        logger.debug(`SCIM Update user - user updated successfully`);
+
+        // Fetch updated user
+        const updatedUser: User | null = await UserService.findOneById({
+          id: new ObjectID(userId),
+          select: {
+            _id: true,
+            email: true,
+            name: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          props: { isRoot: true },
+        });
+
+        if (updatedUser) {
+          const user: JSONObject = formatUserForSCIM(updatedUser, req, req.params["projectScimId"]!, "project");
+          return Response.sendJsonObjectResponse(req, res, user);
+        }
+      }
+
+      logger.debug(
+        `SCIM Update user - no updates made, returning existing user`,
+      );
+
+      // If no updates were made, return the existing user
+      const user: JSONObject = formatUserForSCIM(projectUser.user, req, req.params["projectScimId"]!, "project");
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Groups endpoint - GET /scim/v2/Groups
+router.get(
+  "/scim/v2/:projectScimId/Groups",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `SCIM Groups list request for projectScimId: ${req.params["projectScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const scimConfig: ProjectSCIM = bearerData["scimConfig"] as ProjectSCIM;
+
+      logger.debug(
+        `SCIM Groups - found ${scimConfig.teams?.length || 0} configured teams`,
+      );
+
+      // Return configured teams as groups
+      const groups: JSONObject[] = (scimConfig.teams || []).map((team: any) => {
+        return {
+          schemas: ["urn:ietf:params:scim:schemas:core:2.0:Group"],
+          id: team.id?.toString(),
+          displayName: team.name?.toString(),
+          members: [],
+          meta: {
+            resourceType: "Group",
+            location: `${req.protocol}://${req.get("host")}/scim/v2/${req.params["projectScimId"]}/Groups/${team.id?.toString()}`,
+          },
+        };
+      });
+
+      return Response.sendJsonObjectResponse(req, res, {
+        schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+        totalResults: groups.length,
+        startIndex: 1,
+        itemsPerPage: groups.length,
+        Resources: groups,
+      });
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Create User - POST /scim/v2/Users
+router.post(
+  "/scim/v2/:projectScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `SCIM Create user request for projectScimId: ${req.params["projectScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: ProjectSCIM = bearerData["scimConfig"] as ProjectSCIM;
+
+      if (!scimConfig.autoProvisionUsers) {
+        throw new BadRequestException(
+          "Auto-provisioning is disabled for this project",
+        );
+      }
+
+      const scimUser: JSONObject = req.body;
+      const email: string =
+        (scimUser["userName"] as string) ||
+        ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
+      const name: string = parseNameFromSCIM(scimUser);
+
+      logger.debug(`SCIM Create user - email: ${email}, name: ${name}`);
+
+      if (!email) {
+        throw new BadRequestException("userName or email is required");
+      }
+
+      // Check if user already exists
+      let user: User | null = await UserService.findOneBy({
+        query: { email: new Email(email) },
+        select: {
+          _id: true,
+          email: true,
+          name: true,
+          createdAt: true,
+          updatedAt: true,
+        },
+        props: { isRoot: true },
+      });
+
+      // Create user if doesn't exist
+      if (!user) {
+        logger.debug(
+          `SCIM Create user - creating new user for email: ${email}`,
+        );
+        user = await UserService.createByEmail({
+          email: new Email(email),
+          name: name ? new Name(name) : new Name("Unknown"),
+          isEmailVerified: true,
+          generateRandomPassword: true,
+          props: { isRoot: true },
+        });
+      } else {
+        logger.debug(
+          `SCIM Create user - user already exists with id: ${user.id}`,
+        );
+      }
+
+      // Add user to default teams if configured
+      if (scimConfig.teams && scimConfig.teams.length > 0) {
+        logger.debug(
+          `SCIM Create user - adding user to ${scimConfig.teams.length} configured teams`,
+        );
+        await handleUserTeamOperations("add", projectId, user.id!, scimConfig);
+      }
+
+      const createdUser: JSONObject = formatUserForSCIM(user, req, req.params["projectScimId"]!, "project");
+
+      logger.debug(
+        `SCIM Create user - returning created user with id: ${user.id}`,
+      );
+
+      res.status(201);
+      return Response.sendJsonObjectResponse(req, res, createdUser);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Delete User - DELETE /scim/v2/Users/{id}
+router.delete(
+  "/scim/v2/:projectScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `SCIM Delete user request for userId: ${req.params["userId"]}, projectScimId: ${req.params["projectScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const projectId: ObjectID = bearerData["projectId"] as ObjectID;
+      const scimConfig: ProjectSCIM = bearerData["scimConfig"] as ProjectSCIM;
+      const userId: string = req.params["userId"]!;
+
+      if (!scimConfig.autoDeprovisionUsers) {
+        logger.debug("SCIM Delete user - auto-deprovisioning is disabled");
+        throw new BadRequestException(
+          "Auto-deprovisioning is disabled for this project",
+        );
+      }
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      logger.debug(
+        `SCIM Delete user - removing user from all teams in project: ${projectId}`,
+      );
+
+      // Remove user from teams the SCIM configured
+      if (!scimConfig.teams || scimConfig.teams.length === 0) {
+        logger.debug("SCIM Delete user - no teams configured for SCIM");
+        throw new BadRequestException("No teams configured for SCIM");
+      }
+
+      await handleUserTeamOperations(
+        "remove",
+        projectId,
+        new ObjectID(userId),
+        scimConfig,
+      );
+
+      logger.debug(
+        `SCIM Delete user - user successfully deprovisioned from project`,
+      );
+
+      res.status(204);
+      return Response.sendJsonObjectResponse(req, res, {
+        message: "User deprovisioned",
+      });
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+export default router;

App/FeatureSet/Identity/API/SSO.ts

@@ -36,6 +36,7 @@ import ProjectSSO from "Common/Models/DatabaseModels/ProjectSso";
 import TeamMember from "Common/Models/DatabaseModels/TeamMember";
 import User from "Common/Models/DatabaseModels/User";
 import xml2js from "xml2js";
+import Name from "Common/Types/Name";
 
 const router: ExpressRouter = Express.getRouter();
 
@@ -45,106 +46,112 @@ const router: ExpressRouter = Express.getRouter();
 router.get(
   "/service-provider-login",
   async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
-    if (!req.query["email"]) {
-      return Response.sendErrorResponse(
-        req,
-        res,
-        new BadRequestException("Email is required"),
-      );
-    }
+    try {
+      if (!req.query["email"]) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("Email is required"),
+        );
+      }
 
-    const email: Email = new Email(req.query["email"] as string);
+      const email: Email = new Email(req.query["email"] as string);
 
-    if (!email) {
-      return Response.sendErrorResponse(
-        req,
-        res,
-        new BadRequestException("Email is required"),
-      );
-    }
+      if (!email) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("Email is required"),
+        );
+      }
 
-    // get sso config for this user.
+      // get sso config for this user.
 
-    const user: User | null = await UserService.findOneBy({
-      query: { email: email },
-      select: {
-        _id: true,
-      },
-      props: {
-        isRoot: true,
-      },
-    });
-
-    if (!user) {
-      return Response.sendErrorResponse(
-        req,
-        res,
-        new BadRequestException("No SSO config found for this user"),
-      );
-    }
-
-    const userId: ObjectID = user.id!;
-
-    if (!userId) {
-      return Response.sendErrorResponse(
-        req,
-        res,
-        new BadRequestException("No SSO config found for this user"),
-      );
-    }
-
-    const projectUserBelongsTo: Array<ObjectID> = (
-      await TeamMemberService.findBy({
-        query: { userId: userId },
+      const user: User | null = await UserService.findOneBy({
+        query: { email: email },
         select: {
-          projectId: true,
+          _id: true,
         },
-        limit: LIMIT_PER_PROJECT,
-        skip: 0,
         props: {
           isRoot: true,
         },
-      })
-    ).map((teamMember: TeamMember) => {
-      return teamMember.projectId!;
-    });
+      });
 
-    if (projectUserBelongsTo.length === 0) {
-      return Response.sendErrorResponse(
+      if (!user) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("No SSO config found for this user"),
+        );
+      }
+
+      const userId: ObjectID = user.id!;
+
+      if (!userId) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("No SSO config found for this user"),
+        );
+      }
+
+      const projectUserBelongsTo: Array<ObjectID> = (
+        await TeamMemberService.findBy({
+          query: { userId: userId },
+          select: {
+            projectId: true,
+          },
+          limit: LIMIT_PER_PROJECT,
+          skip: 0,
+          props: {
+            isRoot: true,
+          },
+        })
+      ).map((teamMember: TeamMember) => {
+        return teamMember.projectId!;
+      });
+
+      if (projectUserBelongsTo.length === 0) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("No SSO config found for this user"),
+        );
+      }
+
+      const projectSSOList: Array<ProjectSSO> = await ProjectSSOService.findBy({
+        query: {
+          projectId: QueryHelper.any(projectUserBelongsTo),
+          isEnabled: true,
+        },
+        limit: LIMIT_PER_PROJECT,
+        skip: 0,
+        select: {
+          name: true,
+          description: true,
+          _id: true,
+          projectId: true,
+          project: {
+            name: true,
+          } as Select<Project>,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      return Response.sendEntityArrayResponse(
         req,
         res,
-        new BadRequestException("No SSO config found for this user"),
+        projectSSOList,
+        projectSSOList.length,
+        ProjectSSO,
       );
+    } catch (err) {
+      logger.error(err);
+
+      Response.sendErrorResponse(req, res, err as Exception);
     }
-
-    const projectSSOList: Array<ProjectSSO> = await ProjectSSOService.findBy({
-      query: {
-        projectId: QueryHelper.any(projectUserBelongsTo),
-        isEnabled: true,
-      },
-      limit: LIMIT_PER_PROJECT,
-      skip: 0,
-      select: {
-        name: true,
-        description: true,
-        _id: true,
-        projectId: true,
-        project: {
-          name: true,
-        } as Select<Project>,
-      },
-      props: {
-        isRoot: true,
-      },
-    });
-
-    return Response.sendEntityArrayResponse(
-      req,
-      res,
-      projectSSOList,
-      projectSSOList.length,
-      ProjectSSO,
-    );
   },
 );
 
@@ -153,7 +160,7 @@ router.get(
   async (
     req: ExpressRequest,
     res: ExpressResponse,
-    next: NextFunction,
+    _next: NextFunction,
   ): Promise<void> => {
     try {
       if (!req.params["projectId"]) {
@@ -227,7 +234,9 @@ router.get(
 
       return Response.redirect(req, res, samlRequestUrl);
     } catch (err) {
-      return next(err);
+      logger.error(err);
+
+      Response.sendErrorResponse(req, res, err as Exception);
     }
   },
 );
@@ -275,6 +284,7 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
 
     let issuerUrl: string = "";
     let email: Email | null = null;
+    let fullName: Name | null = null;
 
     if (!req.params["projectId"]) {
       return Response.sendErrorResponse(
@@ -364,6 +374,7 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
 
       issuerUrl = SSOUtil.getIssuer(response);
       email = SSOUtil.getEmail(response);
+      fullName = SSOUtil.getUserFullName(response);
     } catch (err: unknown) {
       if (err instanceof Exception) {
         return Response.sendErrorResponse(req, res, err);
@@ -412,6 +423,7 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
 
       alreadySavedUser = await UserService.createByEmail({
         email,
+        name: fullName || undefined,
         isEmailVerified: true,
         generateRandomPassword: true,
         props: {
@@ -522,7 +534,8 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
     );
   } catch (err) {
     logger.error(err);
-    Response.sendErrorResponse(req, res, new ServerException());
+
+    Response.sendErrorResponse(req, res, err as Exception);
   }
 };
 

App/FeatureSet/Identity/API/StatusPageSCIM.ts

@@ -0,0 +1,488 @@
+import SCIMMiddleware from "Common/Server/Middleware/SCIMAuthorization";
+import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+  OneUptimeRequest,
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
+import logger from "Common/Server/Utils/Logger";
+import ObjectID from "Common/Types/ObjectID";
+import Email from "Common/Types/Email";
+import { JSONObject } from "Common/Types/JSON";
+import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
+import StatusPageSCIM from "Common/Models/DatabaseModels/StatusPageSCIM";
+import BadRequestException from "Common/Types/Exception/BadRequestException";
+import NotFoundException from "Common/Types/Exception/NotFoundException";
+import LIMIT_MAX, { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
+import {
+  formatUserForSCIM,
+  generateServiceProviderConfig,
+  logSCIMOperation,
+} from "../Utils/SCIMUtils";
+
+const router: ExpressRouter = Express.getRouter();
+
+// SCIM Service Provider Configuration - GET /status-page-scim/v2/ServiceProviderConfig
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/ServiceProviderConfig",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logSCIMOperation("ServiceProviderConfig", "status-page", req.params["statusPageScimId"]!);
+      
+      const serviceProviderConfig: JSONObject = generateServiceProviderConfig(
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page"
+      );
+
+      return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Status Page Users endpoint - GET /status-page-scim/v2/Users
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `Status Page SCIM Users list request for statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+
+      // Parse query parameters
+      const startIndex: number = parseInt(req.query["startIndex"] as string) || 1;
+      const count: number = Math.min(
+        parseInt(req.query["count"] as string) || 100,
+        LIMIT_PER_PROJECT,
+      );
+
+      logger.debug(
+        `Status Page SCIM Users - statusPageId: ${statusPageId}, startIndex: ${startIndex}, count: ${count}`,
+      );
+
+      // Get all private users for this status page
+      const statusPageUsers: Array<StatusPagePrivateUser> =
+        await StatusPagePrivateUserService.findBy({
+          query: {
+            statusPageId: statusPageId,
+          },
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          skip: 0,
+          limit: LIMIT_MAX,
+          props: { isRoot: true },
+        });
+
+      logger.debug(
+        `Status Page SCIM Users - found ${statusPageUsers.length} users`,
+      );
+
+      // Format users for SCIM
+      const users: Array<JSONObject> = statusPageUsers.map(
+        (user: StatusPagePrivateUser) => {
+          return formatUserForSCIM(user, req, req.params["statusPageScimId"]!, "status-page");
+        },
+      );
+
+      // Paginate the results
+      const paginatedUsers: Array<JSONObject> = users.slice(
+        (startIndex - 1) * count,
+        startIndex * count,
+      );
+
+      logger.debug(`Status Page SCIM Users response prepared with ${users.length} users`);
+
+      return Response.sendJsonObjectResponse(req, res, {
+        schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+        totalResults: users.length,
+        startIndex: startIndex,
+        itemsPerPage: paginatedUsers.length,
+        Resources: paginatedUsers,
+      });
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Get Individual Status Page User - GET /status-page-scim/v2/Users/{id}
+router.get(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `Status Page SCIM Get individual user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const userId: string = req.params["userId"]!;
+
+      logger.debug(
+        `Status Page SCIM Get user - statusPageId: ${statusPageId}, userId: ${userId}`,
+      );
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+        query: {
+          statusPageId: statusPageId,
+          _id: new ObjectID(userId),
+        },
+        select: {
+          _id: true,
+          email: true,
+          createdAt: true,
+          updatedAt: true,
+        },
+        props: { isRoot: true },
+      });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Get user - user not found for userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      const user: JSONObject = formatUserForSCIM(statusPageUser, req, req.params["statusPageScimId"]!, "status-page");
+
+      logger.debug(
+        `Status Page SCIM Get user - returning user with id: ${statusPageUser.id}`,
+      );
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Create Status Page User - POST /status-page-scim/v2/Users
+router.post(
+  "/status-page-scim/v2/:statusPageScimId/Users",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `Status Page SCIM Create user request for statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+
+      if (!scimConfig.autoProvisionUsers) {
+        throw new BadRequestException(
+          "Auto-provisioning is disabled for this status page",
+        );
+      }
+
+      const scimUser: JSONObject = req.body;
+
+      logger.debug(
+        `Status Page SCIM Create user - statusPageId: ${statusPageId}`,
+      );
+
+      logger.debug(
+        `Request body for Status Page SCIM Create user: ${JSON.stringify(scimUser, null, 2)}`,
+      );
+
+      // Extract user data from SCIM payload
+      const email: string =
+        (scimUser["userName"] as string) ||
+        ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
+
+      if (!email) {
+        throw new BadRequestException("Email is required for user creation");
+      }
+
+      logger.debug(
+        `Status Page SCIM Create user - email: ${email}`,
+      );
+
+      // Check if user already exists for this status page
+      let user: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+        query: {
+          statusPageId: statusPageId,
+          email: new Email(email),
+        },
+        select: {
+          _id: true,
+          email: true,
+          createdAt: true,
+          updatedAt: true,
+        },
+        props: { isRoot: true },
+      });
+
+      if (!user) {
+        logger.debug(
+          `Status Page SCIM Create user - creating new user with email: ${email}`,
+        );
+
+        // Create new status page private user
+        user = await StatusPagePrivateUserService.create({
+          data: {
+            statusPageId: statusPageId,
+            email: new Email(email),
+          } as any,
+          props: { isRoot: true },
+        });
+      } else {
+        logger.debug(
+          `Status Page SCIM Create user - user already exists with id: ${user.id}`,
+        );
+      }
+
+      const createdUser: JSONObject = formatUserForSCIM(user, req, req.params["statusPageScimId"]!, "status-page");
+
+      logger.debug(
+        `Status Page SCIM Create user - returning created user with id: ${user.id}`,
+      );
+
+      res.status(201);
+      return Response.sendJsonObjectResponse(req, res, createdUser);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Update Status Page User - PUT /status-page-scim/v2/Users/{id}
+router.put(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `Status Page SCIM Update user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const userId: string = req.params["userId"]!;
+      const scimUser: JSONObject = req.body;
+
+      logger.debug(
+        `Status Page SCIM Update user - statusPageId: ${statusPageId}, userId: ${userId}`,
+      );
+
+      logger.debug(
+        `Request body for Status Page SCIM Update user: ${JSON.stringify(scimUser, null, 2)}`,
+      );
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+        query: {
+          statusPageId: statusPageId,
+          _id: new ObjectID(userId),
+        },
+        select: {
+          _id: true,
+          email: true,
+          createdAt: true,
+          updatedAt: true,
+        },
+        props: { isRoot: true },
+      });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Update user - user not found for userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
+        );
+      }
+
+      // Update user information
+      const email: string =
+        (scimUser["userName"] as string) ||
+        ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
+      const active: boolean = scimUser["active"] as boolean;
+
+      logger.debug(
+        `Status Page SCIM Update user - email: ${email}, active: ${active}`,
+      );
+
+      // Handle user deactivation by deleting from status page
+      if (active === false) {
+        logger.debug(
+          `Status Page SCIM Update user - user marked as inactive, removing from status page`,
+        );
+        
+        const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+        if (scimConfig.autoDeprovisionUsers) {
+          await StatusPagePrivateUserService.deleteOneById({
+            id: new ObjectID(userId),
+            props: { isRoot: true },
+          });
+
+          logger.debug(
+            `Status Page SCIM Update user - user removed from status page`,
+          );
+
+          // Return empty response for deleted user
+          return Response.sendJsonObjectResponse(req, res, {});
+        }
+      }
+
+      // Prepare update data
+      const updateData: {
+        email?: Email;
+      } = {};
+
+      if (email && email !== statusPageUser.email?.toString()) {
+        updateData.email = new Email(email);
+      }
+
+      // Only update if there are changes
+      if (Object.keys(updateData).length > 0) {
+        logger.debug(
+          `Status Page SCIM Update user - updating user with data: ${JSON.stringify(updateData)}`,
+        );
+
+        await StatusPagePrivateUserService.updateOneById({
+          id: new ObjectID(userId),
+          data: updateData,
+          props: { isRoot: true },
+        });
+
+        logger.debug(`Status Page SCIM Update user - user updated successfully`);
+
+        // Fetch updated user
+        const updatedUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneById({
+          id: new ObjectID(userId),
+          select: {
+            _id: true,
+            email: true,
+            createdAt: true,
+            updatedAt: true,
+          },
+          props: { isRoot: true },
+        });
+
+        if (updatedUser) {
+          const user: JSONObject = formatUserForSCIM(updatedUser, req, req.params["statusPageScimId"]!, "status-page");
+          return Response.sendJsonObjectResponse(req, res, user);
+        }
+      }
+
+      logger.debug(
+        `Status Page SCIM Update user - no updates made, returning existing user`,
+      );
+
+      // If no updates were made, return the existing user
+      const user: JSONObject = formatUserForSCIM(statusPageUser, req, req.params["statusPageScimId"]!, "status-page");
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+// Delete Status Page User - DELETE /status-page-scim/v2/Users/{id}
+router.delete(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
+      logger.debug(
+        `Status Page SCIM Delete user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
+      );
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const scimConfig: StatusPageSCIM = bearerData["scimConfig"] as StatusPageSCIM;
+      const userId: string = req.params["userId"]!;
+
+      if (!scimConfig.autoDeprovisionUsers) {
+        throw new BadRequestException(
+          "Auto-deprovisioning is disabled for this status page",
+        );
+      }
+
+      logger.debug(
+        `Status Page SCIM Delete user - statusPageId: ${statusPageId}, userId: ${userId}`,
+      );
+
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
+      }
+
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null = await StatusPagePrivateUserService.findOneBy({
+        query: {
+          statusPageId: statusPageId,
+          _id: new ObjectID(userId),
+        },
+        select: {
+          _id: true,
+        },
+        props: { isRoot: true },
+      });
+
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Delete user - user not found for userId: ${userId}`,
+        );
+        // SCIM spec says to return 404 for non-existent resources
+        throw new NotFoundException("User not found");
+      }
+
+      // Delete the user from status page
+      await StatusPagePrivateUserService.deleteOneById({
+        id: new ObjectID(userId),
+        props: { isRoot: true },
+      });
+
+      logger.debug(
+        `Status Page SCIM Delete user - user deleted successfully for userId: ${userId}`,
+      );
+
+      // Return 204 No Content for successful deletion
+      res.status(204);
+      return Response.sendEmptySuccessResponse(req, res);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
+    }
+  },
+);
+
+export default router;

App/FeatureSet/Identity/API/StatusPageSSO.ts

@@ -27,8 +27,10 @@ import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivat
 import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
 import xml2js from "xml2js";
 
+// Initialize Express router.
 const router: ExpressRouter = Express.getRouter();
 
+// Define a GET route for SSO in a status page context.
 router.get(
   "/status-page-sso/:statusPageId/:statusPageSsoId",
   async (
@@ -37,6 +39,7 @@ router.get(
     next: NextFunction,
   ): Promise<void> => {
     try {
+      // Check if statusPageId parameter is present.
       if (!req.params["statusPageId"]) {
         return Response.sendErrorResponse(
           req,
@@ -45,6 +48,7 @@ router.get(
         );
       }
 
+      // Check if statusPageSsoId parameter is present.
       if (!req.params["statusPageSsoId"]) {
         return Response.sendErrorResponse(
           req,
@@ -53,14 +57,16 @@ router.get(
         );
       }
 
+      // Create ObjectID instance from statusPageId parameter.
       const statusPageId: ObjectID = new ObjectID(req.params["statusPageId"]);
 
+      // Find SSO record in the database with specific query parameters.
       const statusPageSSO: StatusPageSSO | null =
         await StatusPageSsoService.findOneBy({
           query: {
-            statusPageId: statusPageId,
-            _id: req.params["statusPageSsoId"],
-            isEnabled: true,
+            statusPageId: statusPageId, // Ensure that statusPageId matches.
+            _id: req.params["statusPageSsoId"], // Ensure SSO ID matches.
+            isEnabled: true, // Ensure the SSO is enabled.
           },
           select: {
             signOnURL: true,
@@ -235,6 +241,7 @@ router.post(
       if (statusPageSSO.issuerURL.toString() !== issuerUrl) {
         return Response.sendErrorResponse(
           req,
+
           res,
           new BadRequestException("Issuer URL does not match"),
         );
@@ -285,6 +292,7 @@ router.post(
         res,
         CookieUtil.getUserTokenKey(alreadySavedUser.statusPageId!),
         token,
+
         {
           httpOnly: true,
           maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),

App/FeatureSet/Identity/Index.ts

@@ -1,8 +1,10 @@
 import AuthenticationAPI from "./API/Authentication";
 import ResellerAPI from "./API/Reseller";
 import SsoAPI from "./API/SSO";
+import SCIMAPI from "./API/SCIM";
 import StatusPageAuthenticationAPI from "./API/StatusPageAuthentication";
 import StatusPageSsoAPI from "./API/StatusPageSSO";
+import StatusPageSCIMAPI from "./API/StatusPageSCIM";
 import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import "ejs";
@@ -19,6 +21,10 @@ const IdentityFeatureSet: FeatureSet = {
 
     app.use([`/${APP_NAME}`, "/"], SsoAPI);
 
+    app.use([`/${APP_NAME}`, "/"], SCIMAPI);
+
+    app.use([`/${APP_NAME}`, "/"], StatusPageSCIMAPI);
+
     app.use([`/${APP_NAME}`, "/"], StatusPageSsoAPI);
 
     app.use(

App/FeatureSet/Identity/Utils/SCIMUtils.ts

@@ -0,0 +1,262 @@
+import { ExpressRequest } from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import { JSONObject } from "Common/Types/JSON";
+import Email from "Common/Types/Email";
+import Name from "Common/Types/Name";
+import ObjectID from "Common/Types/ObjectID";
+
+/**
+ * Shared SCIM utility functions for both Project SCIM and Status Page SCIM
+ */
+
+// Base interface for SCIM user-like objects - compatible with User model
+export interface SCIMUser {
+  id?: ObjectID | null;
+  email?: Email;
+  name?: Name | string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+/**
+ * Parse name information from SCIM user payload
+ */
+export const parseNameFromSCIM: (scimUser: JSONObject) => string = (
+  scimUser: JSONObject,
+): string => {
+  logger.debug(
+    `SCIM - Parsing name from SCIM user: ${JSON.stringify(scimUser, null, 2)}`,
+  );
+
+  const givenName: string =
+    ((scimUser["name"] as JSONObject)?.["givenName"] as string) || "";
+  const familyName: string =
+    ((scimUser["name"] as JSONObject)?.["familyName"] as string) || "";
+  const formattedName: string = (scimUser["name"] as JSONObject)?.[
+    "formatted"
+  ] as string;
+
+  // Construct full name: prefer formatted, then combine given+family, then fallback to displayName
+  if (formattedName) {
+    return formattedName;
+  } else if (givenName || familyName) {
+    return `${givenName} ${familyName}`.trim();
+  } else if (scimUser["displayName"]) {
+    return scimUser["displayName"] as string;
+  }
+  return "";
+};
+
+/**
+ * Parse full name into SCIM name format
+ */
+export const parseNameToSCIMFormat: (fullName: string) => {
+  givenName: string;
+  familyName: string;
+  formatted: string;
+} = (
+  fullName: string,
+): { givenName: string; familyName: string; formatted: string } => {
+  const nameParts: string[] = fullName.trim().split(/\s+/);
+  const givenName: string = nameParts[0] || "";
+  const familyName: string = nameParts.slice(1).join(" ") || "";
+
+  return {
+    givenName,
+    familyName,
+    formatted: fullName,
+  };
+};
+
+/**
+ * Format user object for SCIM response
+ */
+export const formatUserForSCIM: (
+  user: SCIMUser,
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+) => JSONObject = (
+  user: SCIMUser,
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+): JSONObject => {
+  const baseUrl: string = `${req.protocol}://${req.get("host")}`;
+  const userName: string = user.email?.toString() || "";
+  const fullName: string = user.name?.toString() || userName.split("@")[0] || "Unknown User";
+  
+  const nameData: { givenName: string; familyName: string; formatted: string } =
+    parseNameToSCIMFormat(fullName);
+
+  // Determine the correct endpoint path based on SCIM type
+  const endpointPath: string = scimType === "project" 
+    ? `/scim/v2/${scimId}/Users/${user.id?.toString()}`
+    : `/status-page-scim/v2/${scimId}/Users/${user.id?.toString()}`;
+
+  return {
+    schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],
+    id: user.id?.toString(),
+    userName: userName,
+    displayName: nameData.formatted,
+    name: {
+      formatted: nameData.formatted,
+      familyName: nameData.familyName,
+      givenName: nameData.givenName,
+    },
+    emails: [
+      {
+        value: userName,
+        type: "work",
+        primary: true,
+      },
+    ],
+    active: true,
+    meta: {
+      resourceType: "User",
+      created: user.createdAt?.toISOString(),
+      lastModified: user.updatedAt?.toISOString(),
+      location: `${baseUrl}${endpointPath}`,
+    },
+  };
+};
+
+/**
+ * Extract email from SCIM user payload
+ */
+export const extractEmailFromSCIM: (scimUser: JSONObject) => string = (
+  scimUser: JSONObject,
+): string => {
+  return (
+    (scimUser["userName"] as string) ||
+    ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string) ||
+    ""
+  );
+};
+
+/**
+ * Extract active status from SCIM user payload
+ */
+export const extractActiveFromSCIM: (scimUser: JSONObject) => boolean = (
+  scimUser: JSONObject,
+): boolean => {
+  return scimUser["active"] !== false; // Default to true if not specified
+};
+
+/**
+ * Generate SCIM ServiceProviderConfig response
+ */
+export const generateServiceProviderConfig: (
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  documentationUrl?: string,
+) => JSONObject = (
+  req: ExpressRequest,
+  scimId: string,
+  scimType: "project" | "status-page",
+  documentationUrl: string = "https://oneuptime.com/docs/identity/scim",
+): JSONObject => {
+  const baseUrl: string = `${req.protocol}://${req.get("host")}`;
+  const endpointPath: string = scimType === "project" 
+    ? `/scim/v2/${scimId}`
+    : `/status-page-scim/v2/${scimId}`;
+
+  return {
+    schemas: [
+      "urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig",
+    ],
+    documentationUri: documentationUrl,
+    patch: {
+      supported: true,
+    },
+    bulk: {
+      supported: true,
+      maxOperations: 1000,
+      maxPayloadSize: 1048576,
+    },
+    filter: {
+      supported: true,
+      maxResults: 200,
+    },
+    changePassword: {
+      supported: false,
+    },
+    sort: {
+      supported: true,
+    },
+    etag: {
+      supported: false,
+    },
+    authenticationSchemes: [
+      {
+        type: "httpbearer",
+        name: "HTTP Bearer",
+        description: "Authentication scheme using HTTP Bearer Token",
+        primary: true,
+      },
+    ],
+    meta: {
+      location: `${baseUrl}${endpointPath}/ServiceProviderConfig`,
+      resourceType: "ServiceProviderConfig",
+      created: "2023-01-01T00:00:00Z",
+      lastModified: "2023-01-01T00:00:00Z",
+    },
+  };
+};
+
+/**
+ * Generate SCIM ListResponse for users
+ */
+export const generateUsersListResponse: (
+  users: JSONObject[],
+  startIndex: number,
+  totalResults: number,
+) => JSONObject = (
+  users: JSONObject[],
+  startIndex: number,
+  totalResults: number,
+): JSONObject => {
+  return {
+    schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+    totalResults: totalResults,
+    startIndex: startIndex,
+    itemsPerPage: users.length,
+    Resources: users,
+  };
+};
+
+/**
+ * Parse query parameters for SCIM list requests
+ */
+export const parseSCIMQueryParams: (req: ExpressRequest) => {
+  startIndex: number;
+  count: number;
+} = (req: ExpressRequest): { startIndex: number; count: number } => {
+  const startIndex: number = parseInt(req.query["startIndex"] as string) || 1;
+  const count: number = Math.min(
+    parseInt(req.query["count"] as string) || 100,
+    200, // SCIM recommended max
+  );
+  
+  return { startIndex, count };
+};
+
+/**
+ * Log SCIM operation with consistent format
+ */
+export const logSCIMOperation: (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+) => void = (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+): void => {
+  const logPrefix: string = scimType === "project" ? "Project SCIM" : "Status Page SCIM";
+  const message: string = `${logPrefix} ${operation} - scimId: ${scimId}${details ? `, ${details}` : ""}`;
+  logger.debug(message);
+};

App/FeatureSet/Identity/Utils/SSO.ts

@@ -8,6 +8,7 @@ import logger from "Common/Server/Utils/Logger";
 import xmlCrypto, { FileKeyInfo } from "xml-crypto";
 import xmldom from "xmldom";
 import zlib from "zlib";
+import Name from "Common/Types/Name";
 
 export default class SSOUtil {
   public static createSAMLRequestUrl(data: {
@@ -138,6 +139,88 @@ export default class SSOUtil {
     }
   }
 
+  public static getUserFullName(payload: JSONObject): Name | null {
+    if (!payload["saml2p:Response"] && !payload["samlp:Response"]) {
+      return null;
+    }
+
+    payload =
+      (payload["saml2p:Response"] as JSONObject) ||
+      (payload["samlp:Response"] as JSONObject) ||
+      (payload["Response"] as JSONObject);
+
+    const samlAssertion: JSONArray =
+      (payload["saml2:Assertion"] as JSONArray) ||
+      (payload["saml:Assertion"] as JSONArray) ||
+      (payload["Assertion"] as JSONArray);
+
+    if (!samlAssertion || samlAssertion.length === 0) {
+      return null;
+    }
+
+    const samlAttributeStatement: JSONArray =
+      ((samlAssertion[0] as JSONObject)[
+        "saml2:AttributeStatement"
+      ] as JSONArray) ||
+      ((samlAssertion[0] as JSONObject)[
+        "saml:AttributeStatement"
+      ] as JSONArray) ||
+      ((samlAssertion[0] as JSONObject)["AttributeStatement"] as JSONArray);
+
+    if (!samlAttributeStatement || samlAttributeStatement.length === 0) {
+      return null;
+    }
+
+    const samlAttribute: JSONArray =
+      ((samlAttributeStatement[0] as JSONObject)[
+        "saml2:Attribute"
+      ] as JSONArray) ||
+      ((samlAttributeStatement[0] as JSONObject)[
+        "saml:Attribute"
+      ] as JSONArray) ||
+      ((samlAttributeStatement[0] as JSONObject)["Attribute"] as JSONArray);
+
+    if (!samlAttribute || samlAttribute.length === 0) {
+      return null;
+    }
+
+    // get displayName attribute.
+    //   {
+    //     "$": {
+    //         "Name": "http://schemas.microsoft.com/identity/claims/displayname"
+    //     },
+    //     "AttributeValue": [
+    //         "Nawaz Dhandala"
+    //     ]
+    // },
+
+    for (let i: number = 0; i < samlAttribute.length; i++) {
+      const attribute: JSONObject = samlAttribute[i] as JSONObject;
+      if (
+        attribute["$"] &&
+        (attribute["$"] as JSONObject)["Name"]?.toString()
+      ) {
+        const name: string | undefined = (attribute["$"] as JSONObject)[
+          "Name"
+        ]?.toString();
+        if (
+          name &&
+          name === "http://schemas.microsoft.com/identity/claims/displayname" &&
+          attribute["AttributeValue"] &&
+          Array.isArray(attribute["AttributeValue"]) &&
+          attribute["AttributeValue"].length > 0
+        ) {
+          const fullName: Name = new Name(
+            attribute["AttributeValue"][0]!.toString() as string,
+          );
+          return fullName;
+        }
+      }
+    }
+
+    return null;
+  }
+
   public static getEmail(payload: JSONObject): Email {
     if (!payload["saml2p:Response"] && !payload["samlp:Response"]) {
       throw new BadRequestException("SAML Response not found.");

App/FeatureSet/Notification/API/Call.ts

@@ -54,7 +54,8 @@ router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
         _id: true,
         twilioAccountSID: true,
         twilioAuthToken: true,
-        twilioPhoneNumber: true,
+        twilioPrimaryPhoneNumber: true,
+        twilioSecondaryPhoneNumbers: true,
         projectId: true,
       },
     });
@@ -97,11 +98,11 @@ router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
     );
   }
 
-  if (!config.twilioPhoneNumber) {
+  if (!config.twilioPrimaryPhoneNumber) {
     return Response.sendErrorResponse(
       req,
       res,
-      new BadDataException("twilioPhoneNumber is required"),
+      new BadDataException("twilioPrimaryPhoneNumber is required"),
     );
   }
 

App/FeatureSet/Notification/API/SMS.ts

@@ -53,7 +53,8 @@ router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
         _id: true,
         twilioAccountSID: true,
         twilioAuthToken: true,
-        twilioPhoneNumber: true,
+        twilioPrimaryPhoneNumber: true,
+        twilioSecondaryPhoneNumbers: true,
         projectId: true,
       },
     });
@@ -96,11 +97,11 @@ router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
     );
   }
 
-  if (!config.twilioPhoneNumber) {
+  if (!config.twilioPrimaryPhoneNumber) {
     return Response.sendErrorResponse(
       req,
       res,
-      new BadDataException("twilioPhoneNumber is required"),
+      new BadDataException("twilioPrimaryPhoneNumber is required"),
     );
   }
 

App/FeatureSet/Notification/Config.ts

@@ -1,33 +1,14 @@
-import Hostname from "Common/Types/API/Hostname";
 import TwilioConfig from "Common/Types/CallAndSMS/TwilioConfig";
 import Email from "Common/Types/Email";
 import EmailServer from "Common/Types/Email/EmailServer";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import ObjectID from "Common/Types/ObjectID";
-import Port from "Common/Types/Port";
 import { AdminDashboardClientURL } from "Common/Server/EnvironmentConfig";
 import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
 import GlobalConfig, {
   EmailServerType,
 } from "Common/Models/DatabaseModels/GlobalConfig";
-
-export const InternalSmtpPassword: string =
-  process.env["INTERNAL_SMTP_PASSWORD"] || "";
-
-export const InternalSmtpHost: Hostname = new Hostname(
-  process.env["INTERNAL_SMTP_HOST"] || "haraka",
-);
-
-export const InternalSmtpPort: Port = new Port(2525);
-
-export const InternalSmtpSecure: boolean = false;
-
-export const InternalSmtpEmail: Email = new Email(
-  process.env["INTERNAL_SMTP_EMAIL"] || "noreply@oneuptime.com",
-);
-
-export const InternalSmtpFromName: string =
-  process.env["INTERNAL_SMTP_FROM_NAME"] || "OneUptime";
+import Phone from "Common/Types/Phone";
 
 type GetGlobalSMTPConfig = () => Promise<EmailServer | null>;
 
@@ -131,10 +112,10 @@ export const getEmailServerType: GetEmailServerTypeFunction =
       });
 
     if (!globalConfig) {
-      return EmailServerType.Internal;
+      return EmailServerType.CustomSMTP;
     }
 
-    return globalConfig.emailServerType || EmailServerType.Internal;
+    return globalConfig.emailServerType || EmailServerType.CustomSMTP;
   };
 
 export interface SendGridConfig {
@@ -196,7 +177,8 @@ export const getTwilioConfig: GetTwilioConfigFunction =
         select: {
           twilioAccountSID: true,
           twilioAuthToken: true,
-          twilioPhoneNumber: true,
+          twilioPrimaryPhoneNumber: true,
+          twilioSecondaryPhoneNumbers: true,
         },
       });
 
@@ -207,7 +189,7 @@ export const getTwilioConfig: GetTwilioConfigFunction =
     if (
       !globalConfig.twilioAccountSID ||
       !globalConfig.twilioAuthToken ||
-      !globalConfig.twilioPhoneNumber
+      !globalConfig.twilioPrimaryPhoneNumber
     ) {
       return null;
     }
@@ -215,7 +197,16 @@ export const getTwilioConfig: GetTwilioConfigFunction =
     return {
       accountSid: globalConfig.twilioAccountSID,
       authToken: globalConfig.twilioAuthToken,
-      phoneNumber: globalConfig.twilioPhoneNumber,
+      primaryPhoneNumber: globalConfig.twilioPrimaryPhoneNumber,
+      secondaryPhoneNumbers:
+        globalConfig.twilioSecondaryPhoneNumbers &&
+        globalConfig.twilioSecondaryPhoneNumbers.length > 0
+          ? globalConfig.twilioSecondaryPhoneNumbers
+              .split(",")
+              .map((phoneNumber: string) => {
+                return new Phone(phoneNumber.trim());
+              })
+          : [],
     };
   };
 

App/FeatureSet/Notification/Services/CallService.ts

@@ -26,6 +26,7 @@ import CallLog from "Common/Models/DatabaseModels/CallLog";
 import Project from "Common/Models/DatabaseModels/Project";
 import Twilio from "twilio";
 import { CallInstance } from "twilio/lib/rest/api/v2010/account/call";
+import Phone from "Common/Types/Phone";
 
 export default class CallService {
   public static async makeCall(
@@ -71,7 +72,14 @@ export default class CallService {
       );
 
       callLog.toNumber = callRequest.to;
-      callLog.fromNumber = twilioConfig.phoneNumber;
+
+      const fromNumber: Phone = Phone.pickPhoneNumberToSendSMSOrCallFrom({
+        to: callRequest.to,
+        primaryPhoneNumberToPickFrom: twilioConfig.primaryPhoneNumber,
+        seocndaryPhoneNumbersToPickFrom:
+          twilioConfig.secondaryPhoneNumbers || [],
+      });
+      callLog.fromNumber = fromNumber;
       callLog.callData =
         options && options.isSensitive
           ? { message: "This call is sensitive and is not logged" }
@@ -232,7 +240,7 @@ export default class CallService {
       const twillioCall: CallInstance = await client.calls.create({
         twiml: this.generateTwimlForCall(callRequest),
         to: callRequest.to.toString(),
-        from: twilioConfig.phoneNumber.toString(), // From a valid Twilio number
+        from: fromNumber.toString(), // From a valid Twilio number
       });
 
       logger.debug("Call Request sent successfully.");