refactor: clean up code formatting and improve readability in notification rule service and user settings

Add where to find monitor logs

.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
@@ -215,7 +215,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
@@ -231,7 +231,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
@@ -240,20 +240,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 +321,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 +336,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/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,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
+          node-version: latest
       - run: cd Common && npm install
       - run: cd TestServer && npm install && npm run compile && npm run dep-check

.github/workflows/release.yml

@@ -87,9 +87,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 +147,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 +207,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 +267,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 +330,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 +390,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 +452,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 +512,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 +553,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 +562,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 +572,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 +585,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 +603,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 +876,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
@@ -693,9 +937,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
@@ -753,9 +997,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 +1058,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 +1118,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 +1179,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 +1239,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,10 +1290,10 @@ 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
 
   
@@ -1090,9 +1334,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
@@ -1161,9 +1405,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
@@ -1228,9 +1472,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
@@ -1295,9 +1539,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
@@ -1363,9 +1607,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 +1653,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, haraka-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 +1670,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 +1706,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, 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, haraka-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 +1723,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 +1793,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

.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:
@@ -56,9 +60,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 +130,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 +192,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 +253,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 +314,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 +375,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 +436,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 +499,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 +562,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 +603,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 +612,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 +623,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 +636,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 +654,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 +933,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
@@ -741,9 +994,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
@@ -802,9 +1055,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 +1116,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 +1177,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 +1241,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 +1304,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 +1365,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 +1426,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 +1488,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 +1550,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 +1596,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, llm-docker-image-deploy, 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, 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, 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 +1625,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 +1678,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 +1710,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.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

.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/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/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

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/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>

Accounts/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/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

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/Register.tsx

@@ -179,7 +179,7 @@ const RegisterPage: () => JSX.Element = () => {
   ]);
 
   if (error) {
-    return <ErrorMessage error={error} />;
+    return <ErrorMessage message={error} />;
   }
 
   if (isLoading) {

AdminDashboard/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/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

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/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

@@ -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 => {

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

@@ -61,7 +61,7 @@ const Settings: FunctionComponent = (): ReactElement => {
   }
 
   if (error) {
-    return <ErrorMessage error={error} />;
+    return <ErrorMessage message={error} />;
   }
 
   return (

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

@@ -99,7 +99,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             },
             title: "Description",
             fieldType: FormFieldSchemaType.LongText,
-            required: true,
+            required: false,
             placeholder: "This probe is to monitor all the internal services.",
           },
 
@@ -170,6 +170,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             field: {
               description: true,
             },
+            noValueMessage: "-",
             title: "Description",
             type: FieldType.Text,
           },

App/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/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

App/FeatureSet/BaseAPI/Index.ts

@@ -10,7 +10,7 @@ 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";
 
@@ -18,6 +18,7 @@ import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
 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";
@@ -156,9 +157,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";
@@ -180,6 +178,11 @@ import 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";
@@ -376,7 +379,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";
@@ -500,6 +502,50 @@ import ScheduledMaintenanceTemplateOwnerUserService, {
 } 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";
+
 const BaseAPIFeatureSet: FeatureSet = {
   init: async (): Promise<void> => {
     const app: ExpressApplication = Express.getExpressApp();
@@ -522,6 +568,15 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    // monitor feed
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MonitorFeed, MonitorFeedServiceType>(
+        MonitorFeed,
+        MonitorFeedService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<MonitorTest, MonitorTestServiceType>(
@@ -530,6 +585,59 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).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>(
@@ -538,6 +646,26 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).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(),
@@ -673,14 +801,6 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAnalyticsAPI<
-        MonitorMetricsByMinute,
-        MonitorMetricsByMinuteServiceType
-      >(MonitorMetricsByMinute, MonitorMetricsByMinuteService).getRouter(),
-    );
-
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<TelemetryIngestionKey, TelemetryIngestionKeyServiceType>(
@@ -1321,6 +1441,10 @@ const BaseAPIFeatureSet: FeatureSet = {
       `/${APP_NAME.toLocaleLowerCase()}`,
       new StatusPageAPI().getRouter(),
     );
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new WorkspaceNotificationRuleAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new FileAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1340,6 +1464,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(),
@@ -1371,7 +1496,7 @@ 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 ProbeAPI().getRouter());
 
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,

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/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

@@ -10,6 +10,7 @@ import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
 import GlobalConfig, {
   EmailServerType,
 } from "Common/Models/DatabaseModels/GlobalConfig";
+import Phone from "Common/Types/Phone";
 
 export const InternalSmtpPassword: string =
   process.env["INTERNAL_SMTP_PASSWORD"] || "";
@@ -196,7 +197,8 @@ export const getTwilioConfig: GetTwilioConfigFunction =
         select: {
           twilioAccountSID: true,
           twilioAuthToken: true,
-          twilioPhoneNumber: true,
+          twilioPrimaryPhoneNumber: true,
+          twilioSecondaryPhoneNumbers: true,
         },
       });
 
@@ -207,7 +209,7 @@ export const getTwilioConfig: GetTwilioConfigFunction =
     if (
       !globalConfig.twilioAccountSID ||
       !globalConfig.twilioAuthToken ||
-      !globalConfig.twilioPhoneNumber
+      !globalConfig.twilioPrimaryPhoneNumber
     ) {
       return null;
     }
@@ -215,7 +217,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.");

App/FeatureSet/Notification/Services/MailService.ts

@@ -35,6 +35,7 @@ import fsp from "fs/promises";
 import Handlebars from "handlebars";
 import nodemailer, { Transporter } from "nodemailer";
 import Path from "path";
+import * as tls from "tls";
 
 export default class MailService {
   public static isSMTPConfigValid(obj: JSONObject): boolean {
@@ -204,10 +205,19 @@ export default class MailService {
       timeout?: number | undefined;
     },
   ): Transporter {
+    let tlsOptions: tls.ConnectionOptions | undefined = undefined;
+
+    if (!emailServer.secure) {
+      tlsOptions = {
+        rejectUnauthorized: false,
+      };
+    }
+
     const privateMailer: Transporter = nodemailer.createTransport({
       host: emailServer.host.toString(),
       port: emailServer.port.toNumber(),
       secure: emailServer.secure,
+      tls: tlsOptions,
       auth:
         emailServer.username && emailServer.password
           ? {

App/FeatureSet/Notification/Services/SmsService.ts

@@ -83,7 +83,14 @@ export default class SmsService {
         twilioConfig.authToken,
       );
 
-      smsLog.fromNumber = twilioConfig.phoneNumber;
+      const fromNumber: Phone = Phone.pickPhoneNumberToSendSMSOrCallFrom({
+        to: to,
+        primaryPhoneNumberToPickFrom: twilioConfig.primaryPhoneNumber,
+        seocndaryPhoneNumbersToPickFrom:
+          twilioConfig.secondaryPhoneNumbers || [],
+      });
+
+      smsLog.fromNumber = fromNumber;
 
       let project: Project | null = null;
 
@@ -230,7 +237,7 @@ export default class SmsService {
       const twillioMessage: MessageInstance = await client.messages.create({
         body: message,
         to: to.toString(),
-        from: twilioConfig.phoneNumber.toString(), // From a valid Twilio number
+        from: fromNumber.toString(), // From a valid Twilio number
       });
 
       smsLog.status = SmsStatus.Success;

App/FeatureSet/Notification/Templates/ConfirmStatusPageSubscription.hbs

@@ -0,0 +1,17 @@
+{{> Start this}}
+
+{{> CustomLogo this}}
+{{> EmailTitle title=(concat statusPageName " - Please confirm your subscription" ) }}
+
+{{> InfoBlock info="You will be the first to hear from us when there are any incidents, announcements or scheduled maintenance events."}}
+
+{{> ButtonBlock buttonUrl=confirmationUrl buttonText="Confirm Subscription"}}
+
+{{> InfoBlock info="You can also view the status page by visiting this link:"}}
+{{> InfoBlock info=statusPageUrl}}
+
+{{> UnsubscribeBlock this}}
+
+{{> VerticalSpace this}}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/StatusPageSubscriberReport.hbs

@@ -39,7 +39,7 @@
 {{> InfoBlock info="No resources have been added to this status page yet."}}
 {{/ifCond}}
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscribedToStatusPage.hbs

@@ -3,16 +3,15 @@
 {{> CustomLogo this}}
 {{> EmailTitle title=(concat "You have been subscribed to status page - " statusPageName) }}
 
-{{> InfoBlock info=(concat "You have been subscribed to status page - " statusPageName)}}
 {{> InfoBlock info="You will be the first to hear from us when there are any incidents, announcements or scheduled maintenance events."}}
 
 {{> ButtonBlock buttonUrl=statusPageUrl buttonText="Go to Status Page"}}
 
-{{> InfoBlock info="You can also view the status page by visiting these link:"}}
+{{> InfoBlock info="You can also view the status page by visiting this link:"}}
 {{> InfoBlock info=statusPageUrl}}
 
 {{> UnsubscribeBlock this}}
 
 {{> VerticalSpace this}}
 
-{{> End this}}
+{{> End this}}

App/FeatureSet/Notification/Templates/SubscriberAnnouncementCreated.hbs

@@ -10,7 +10,7 @@
 {{> DetailBoxField title="" text=announcementDescription  }}
 {{> DetailBoxEnd this }}
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscriberIncidentCreated.hbs

@@ -17,7 +17,7 @@
 {{> DetailBoxEnd this }}
 
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscriberIncidentNoteCreated.hbs

@@ -14,7 +14,7 @@
 {{> DetailBoxEnd this }}
 
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscriberIncidentStateChanged.hbs

@@ -1,7 +1,7 @@
 {{> Start this}}
 
 {{> CustomLogo this}}
-{{> EmailTitle title=(concat "Incident: " incidentTitle) }}
+{{> EmailTitle title=emailTitle }}
 
 {{> InfoBlock info="Incident state has changed. Here are the details:   "}}
 
@@ -14,7 +14,7 @@
 {{> DetailBoxField title="" text=incidentDescription  }}
 {{> DetailBoxEnd this }}
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 {{> InfoBlock info="You can visit the status page here:"}}
 {{> InfoBlock info=statusPageUrl}}

App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventCreated.hbs

@@ -21,7 +21,7 @@
 {{> DetailBoxEnd this }}
 
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventNoteCreated.hbs

@@ -22,7 +22,7 @@
 
 
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventStateChanged.hbs

@@ -19,7 +19,7 @@
 {{> DetailBoxField title="" text=eventDescription  }}
 {{> DetailBoxEnd this }}
 
-{{> InfoBlock info=(concat "This is an automated email sent to you because you are subscribed to " statusPageName) }}
+{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
 
 
 {{> InfoBlock info="You can visit the status page here:"}}

App/Index.ts

@@ -24,10 +24,42 @@ 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: true,
         checkPostgresStatus: true,
         checkRedisStatus: true,
+        retryCount: 3,
+      });
+    };
+
+    const globalCacheCheck: PromiseVoidFunction = async (): Promise<void> => {
+      // Check the status of cache
+      return await InfrastructureStatus.checkStatusWithRetry({
+        checkClickhouseStatus: false,
+        checkPostgresStatus: false,
+        checkRedisStatus: true,
+        retryCount: 3,
+      });
+    };
+
+    const analyticsDatabaseCheck: PromiseVoidFunction =
+      async (): Promise<void> => {
+        // Check the status of analytics database
+        return await InfrastructureStatus.checkStatusWithRetry({
+          checkClickhouseStatus: true,
+          checkPostgresStatus: false,
+          checkRedisStatus: false,
+          retryCount: 3,
+        });
+      };
+
+    const databaseCheck: PromiseVoidFunction = async (): Promise<void> => {
+      // Check the status of database
+      return await InfrastructureStatus.checkStatusWithRetry({
+        checkClickhouseStatus: false,
+        checkPostgresStatus: true,
+        checkRedisStatus: false,
+        retryCount: 3,
       });
     };
 
@@ -37,6 +69,9 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
       statusOptions: {
         liveCheck: statusCheck,
         readyCheck: statusCheck,
+        globalCacheCheck: globalCacheCheck,
+        analyticsDatabaseCheck: analyticsDatabaseCheck,
+        databaseCheck: databaseCheck,
       },
     });
 

Common/Models/AnalyticsModels/ExceptionInstance.ts

@@ -10,7 +10,7 @@ import { SpanStatus } from "./Span";
 export default class ExceptionInstance extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "ExceptionInstanceTelemetry",
+      tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Exception",
       pluralName: "Exceptions",
@@ -369,8 +369,8 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "fingerprint", "time"],
-      primaryKeys: ["projectId", "serviceId", "fingerprint"],
+      sortKeys: ["projectId", "time", "serviceId", "fingerprint"],
+      primaryKeys: ["projectId", "time", "serviceId", "fingerprint"],
     });
   }
 

Common/Models/AnalyticsModels/Index.ts

@@ -1,7 +1,6 @@
 import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Log from "./Log";
 import Metric from "./Metric";
-import MonitorMetricsByMinute from "./MonitorMetricsByMinute";
 import Span from "./Span";
 import TelemetryAttribute from "./TelemetryAttribute";
 import ExceptionInstance from "./ExceptionInstance";
@@ -10,7 +9,6 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   Log,
   Span,
   Metric,
-  MonitorMetricsByMinute,
   TelemetryAttribute,
   ExceptionInstance,
 ];

Common/Models/AnalyticsModels/Log.ts

@@ -11,7 +11,7 @@ import LogSeverity from "../../Types/Log/LogSeverity";
 export default class Log extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "LogTelemetry",
+      tableName: "LogItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Log",
       enableRealtimeEventsOn: {
@@ -278,8 +278,8 @@ export default class Log extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "time"],
-      primaryKeys: ["projectId", "serviceId"],
+      sortKeys: ["projectId", "time", "serviceId"],
+      primaryKeys: ["projectId", "time", "serviceId"],
     });
   }
 

Common/Models/AnalyticsModels/Metric.ts

@@ -19,10 +19,17 @@ export enum MetricPointType {
   ExponentialHistogram = "ExponentialHistogram",
 }
 
+export enum ServiceType {
+  OpenTelemetry = "OpenTelemetry",
+  Monitor = "Monitor",
+  Alert = "Alert",
+  Incident = "Incident",
+}
+
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "MetricTelemetry",
+      tableName: "MetricItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Metric",
       pluralName: "Metrics",
@@ -78,10 +85,11 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
 
+        // this can also be the monitor id or the telemetry service id.
         new AnalyticsTableColumn({
           key: "serviceId",
           title: "Service ID",
-          description: "ID of the Service which created the log",
+          description: "ID of the Service which created the Metric",
           required: true,
           type: TableColumnType.ObjectID,
           accessControl: {
@@ -101,6 +109,30 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
 
+        // this can also be the monitor id or the telemetry service id.
+        new AnalyticsTableColumn({
+          key: "serviceType",
+          title: "Service Type",
+          description: "Type of the service that this telemetry belongs to",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
         // add name and description
 
         new AnalyticsTableColumn({
@@ -522,8 +554,8 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "time"],
-      primaryKeys: ["projectId", "serviceId"],
+      sortKeys: ["projectId", "time", "serviceId"],
+      primaryKeys: ["projectId", "time", "serviceId"],
     });
   }
 
@@ -539,6 +571,10 @@ export default class Metric extends AnalyticsBaseModel {
     return this.getColumnValue("serviceId") as ObjectID | undefined;
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
   public get name(): string | undefined {
     return this.getColumnValue("name") as string | undefined;
   }
@@ -595,6 +631,10 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get time(): Date | undefined {
     return this.getColumnValue("time") as Date | undefined;
   }

Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts

@@ -1,177 +0,0 @@
-import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
-import Route from "../../Types/API/Route";
-import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
-import BrowserType from "../../Types/BrowserType";
-import { JSONObject } from "../../Types/JSON";
-import { CheckOn } from "../../Types/Monitor/CriteriaFilter";
-import ObjectID from "../../Types/ObjectID";
-import Permission from "../../Types/Permission";
-import ScreenSizeType from "../../Types/ScreenSizeType";
-
-export interface MonitorMetricsMiscData {
-  diskPath?: string;
-  probeId?: string;
-  browserType?: BrowserType;
-  screenSizeType?: ScreenSizeType;
-}
-
-export default class MonitorMetricsByMinute extends AnalyticsBaseModel {
-  public constructor() {
-    super({
-      tableName: "MonitorMetrics",
-      tableEngine: AnalyticsTableEngine.MergeTree,
-      singularName: "Monitor Metric",
-      pluralName: "Monitor Metrics",
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadProjectMonitor,
-        ],
-        create: [],
-        update: [],
-        delete: [],
-      },
-      crudApiPath: new Route("/monitor-metrics"),
-      tableColumns: [
-        new AnalyticsTableColumn({
-          key: "projectId",
-          title: "Project ID",
-          description: "ID of project",
-          required: true,
-          type: TableColumnType.ObjectID,
-          isTenantId: true,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "monitorId",
-          title: "Monitor ID",
-          description: "ID of the Monitor which this metric belongs to",
-          required: true,
-          type: TableColumnType.ObjectID,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "metricType",
-          title: "Metric Type",
-          description: "Type of metric",
-          required: true,
-          type: TableColumnType.Text,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "metricValue",
-          title: "Metric Value",
-          description: "Value of the metric",
-          required: true,
-          type: TableColumnType.Number,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [],
-            update: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "miscData",
-          title: "Misc Data",
-          description: "Misc data for the metric (if any)",
-          required: false,
-          type: TableColumnType.JSON,
-          accessControl: {
-            read: [
-              Permission.ProjectOwner,
-              Permission.ProjectAdmin,
-              Permission.ProjectMember,
-              Permission.ReadProjectMonitor,
-            ],
-            create: [],
-            update: [],
-          },
-        }),
-      ],
-      sortKeys: ["projectId", "monitorId", "createdAt"],
-      primaryKeys: ["projectId", "monitorId"],
-    });
-  }
-
-  public get projectId(): ObjectID | undefined {
-    return this.getColumnValue("projectId") as ObjectID | undefined;
-  }
-
-  public set projectId(v: ObjectID | undefined) {
-    this.setColumnValue("projectId", v);
-  }
-
-  public get monitorId(): ObjectID | undefined {
-    return this.getColumnValue("monitorId") as ObjectID | undefined;
-  }
-
-  public set monitorId(v: ObjectID | undefined) {
-    this.setColumnValue("monitorId", v);
-  }
-
-  public get metricType(): CheckOn | undefined {
-    return this.getColumnValue("metricType") as CheckOn | undefined;
-  }
-
-  public set metricType(v: CheckOn | undefined) {
-    this.setColumnValue("metricType", v);
-  }
-
-  public get metricValue(): number | undefined {
-    return this.getColumnValue("metricValue") as number | undefined;
-  }
-
-  public set metricValue(v: number | undefined) {
-    this.setColumnValue("metricValue", v);
-  }
-
-  public get miscData(): MonitorMetricsMiscData | undefined {
-    return this.getColumnValue("miscData") as
-      | MonitorMetricsMiscData
-      | undefined;
-  }
-
-  public set miscData(v: MonitorMetricsMiscData | undefined) {
-    this.setColumnValue("miscData", v as JSONObject);
-  }
-}

Common/Models/AnalyticsModels/Span.ts

@@ -42,7 +42,7 @@ export interface SpanLink {
 export default class Span extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "SpanTelemetry",
+      tableName: "SpanItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Span",
       pluralName: "Spans",
@@ -492,8 +492,8 @@ export default class Span extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "traceId", "startTime"],
-      primaryKeys: ["projectId", "serviceId", "traceId"],
+      sortKeys: ["projectId", "startTime", "serviceId", "traceId"],
+      primaryKeys: ["projectId", "startTime", "serviceId", "traceId"],
     });
   }
 

Common/Models/AnalyticsModels/TelemetryAttribute.ts

@@ -106,11 +106,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
         }),
 
         new AnalyticsTableColumn({
-          key: "attribute",
-          title: "Attribute",
-          description: "Attribute",
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
           required: true,
-          type: TableColumnType.Text,
+          type: TableColumnType.JSONArray,
           accessControl: {
             read: [
               Permission.ProjectOwner,
@@ -153,11 +153,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
     this.setColumnValue("telemetryType", v);
   }
 
-  public get attribute(): string | undefined {
-    return this.getColumnValue("attribute") as string | undefined;
+  public get attributes(): Array<string> | undefined {
+    return this.getColumnValue("attributes") as Array<string> | undefined;
   }
 
-  public set attribute(v: string | undefined) {
-    this.setColumnValue("attribute", v);
+  public set attributes(v: Array<string> | undefined) {
+    this.setColumnValue("attributes", v);
   }
 }

Common/Models/DatabaseModels/Alert.ts

@@ -36,6 +36,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import { TelemetryQuery } from "../../Types/Telemetry/TelemetryQuery";
+import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
 @AccessControlColumn("labels")
@@ -801,7 +802,6 @@ export default class Alert extends BaseModel {
     ],
     update: [],
   })
-  @Index()
   @TableColumn({
     type: TableColumnType.Markdown,
     required: false,
@@ -1007,4 +1007,52 @@ export default class Alert extends BaseModel {
     nullable: true,
   })
   public telemetryQuery?: TelemetryQuery = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlert,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlert,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.Number,
+    title: "Alert Number",
+    description: "Alert Number",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+  })
+  public alertNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannels?: Array<NotificationRuleWorkspaceChannel> =
+    undefined;
 }

Common/Models/DatabaseModels/AlertFeed.ts

@@ -0,0 +1,526 @@
+import Alert from "./Alert";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import Color from "../../Types/Color";
+
+export enum AlertFeedEventType {
+  PublicNote = "PublicNote",
+  SubscriberNotificationSent = "SubscriberNotificationSent",
+  OwnerNotificationSent = "OwnerNotificationSent",
+  OwnerUserAdded = "OwnerUserAdded",
+  OwnerTeamAdded = "OwnerTeamAdded",
+  AlertCreated = "AlertCreated",
+  AlertStateChanged = "AlertStateChanged",
+  PrivateNote = "PrivateNote",
+  AlertUpdated = "AlertUpdated",
+  RootCause = "RootCause",
+  RemediationNotes = "RemediationNotes",
+  OwnerUserRemoved = "OwnerUserRemoved",
+  OwnerTeamRemoved = "OwnerTeamRemoved",
+  OnCallPolicy = "OnCallPolicy",
+  OnCallNotification = "OnCallNotification",
+}
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("alert")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateAlertFeed,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadAlertFeed,
+  ],
+  delete: [],
+  update: [],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/alert-feed"))
+@Entity({
+  name: "AlertFeed",
+})
+@TableMetadata({
+  tableName: "AlertFeed",
+  singularName: "Alert Feed",
+  pluralName: "Alert Feeds",
+  icon: IconProp.List,
+  tableDescription:
+    "Log of the entire alert state change. This is a log of all the alert state changes, public notes, more etc.",
+})
+export default class AlertFeed extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "alertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Relation to Alert in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "alertId" })
+  public alert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Alert ID",
+    description: "Relation to Alert ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public alertId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: true,
+    title: "Log (in Markdown)",
+    description: "Log of the entire alert state change in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public feedInfoInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    title: "More Information (in Markdown)",
+    description: "More information in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+    unique: false,
+  })
+  public moreInformationInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    title: "Alert Feed Event",
+    description: "Alert Feed Event",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    unique: false,
+  })
+  public alertFeedEventType?: AlertFeedEventType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for the alert log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateAlertFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadAlertFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+}

Common/Models/DatabaseModels/AlertStateTimeline.ts

@@ -514,7 +514,7 @@ export default class AlertStateTimeline extends BaseModel {
   @TableColumn({
     type: TableColumnType.Date,
     title: "Starts At",
-    description: "When did this status change start?",
+    description: "When did this status change?",
   })
   @Column({
     type: ColumnType.Date,

Common/Models/DatabaseModels/GlobalConfig.ts

@@ -232,17 +232,35 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   @TableColumn({
     type: TableColumnType.Phone,
-    title: "Twilio Phone Number",
-    description: "Phone Number for your Twilio account",
+    title: "Twilio Primary Phone Number",
+    description: "Secondary Phone Number for your Twilio account",
   })
   @Column({
     type: ColumnType.Phone,
     length: ColumnLength.Phone,
     nullable: true,
-    unique: true,
+    unique: false,
     transformer: Phone.getDatabaseTransformer(),
   })
-  public twilioPhoneNumber?: Phone = undefined;
+  public twilioPrimaryPhoneNumber?: Phone = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "Twilio Secondary Phone Numbers",
+    description: "Secondary Phone Number for your Twilio account",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    nullable: true,
+    unique: false,
+  })
+  public twilioSecondaryPhoneNumbers?: string = undefined; // phone numbers seperated by comma
 
   @ColumnAccessControl({
     create: [],

Common/Models/DatabaseModels/Incident.ts

@@ -37,6 +37,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import { TelemetryQuery } from "../../Types/Telemetry/TelemetryQuery";
+import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
 @AccessControlColumn("labels")
@@ -853,9 +854,13 @@ export default class Incident extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
   })
-  @Index()
   @TableColumn({
     type: TableColumnType.Markdown,
     required: false,
@@ -1087,4 +1092,85 @@ export default class Incident extends BaseModel {
     nullable: true,
   })
   public telemetryQuery?: TelemetryQuery = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.Number,
+    title: "Incident Number",
+    description: "Incident Number",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+  })
+  public incidentNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannels?: Array<NotificationRuleWorkspaceChannel> =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Should be visible on status page?",
+    description: "Should this incident be visible on the status page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: true,
+  })
+  public isVisibleOnStatusPage?: boolean = undefined;
 }

Common/Models/DatabaseModels/IncidentFeed.ts

@@ -0,0 +1,526 @@
+import Incident from "./Incident";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import Color from "../../Types/Color";
+import ColumnLength from "../../Types/Database/ColumnLength";
+
+export enum IncidentFeedEventType {
+  PublicNote = "PublicNote",
+  SubscriberNotificationSent = "SubscriberNotificationSent",
+  OwnerNotificationSent = "OwnerNotificationSent",
+  OwnerUserAdded = "OwnerUserAdded",
+  OwnerTeamAdded = "OwnerTeamAdded",
+  IncidentCreated = "IncidentCreated",
+  IncidentStateChanged = "IncidentStateChanged",
+  PrivateNote = "PrivateNote",
+  IncidentUpdated = "IncidentUpdated",
+  RootCause = "RootCause",
+  RemediationNotes = "RemediationNotes",
+  OwnerUserRemoved = "OwnerUserRemoved",
+  OwnerTeamRemoved = "OwnerTeamRemoved",
+  OnCallPolicy = "OnCallPolicy",
+  OnCallNotification = "OnCallNotification",
+}
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incident")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateIncidentFeed,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadIncidentFeed,
+  ],
+  delete: [],
+  update: [],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/incident-feed"))
+@Entity({
+  name: "IncidentFeed",
+})
+@TableMetadata({
+  tableName: "IncidentFeed",
+  singularName: "Incident Feed",
+  pluralName: "Incident Feeds",
+  icon: IconProp.List,
+  tableDescription:
+    "Log of the entire incident state change. This is a log of all the incident state changes, public notes, more etc.",
+})
+export default class IncidentFeed extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "incidentId",
+    type: TableColumnType.Entity,
+    modelType: Incident,
+    title: "Incident",
+    description: "Relation to Incident in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Incident;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incidentId" })
+  public incident?: Incident = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Incident ID",
+    description: "Relation to Incident ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incidentId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: true,
+    title: "Log (in Markdown)",
+    description: "Log of the entire incident state change in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public feedInfoInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    title: "More Information (in Markdown)",
+    description: "More information in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+    unique: false,
+  })
+  public moreInformationInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    title: "Incident Feed Event",
+    description: "Incident Feed Event",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    unique: false,
+  })
+  public incidentFeedEventType?: IncidentFeedEventType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateIncidentFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadIncidentFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for the incident log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+}

Common/Models/DatabaseModels/IncidentStateTimeline.ts

@@ -507,7 +507,6 @@ export default class IncidentStateTimeline extends BaseModel {
     ],
     update: [],
   })
-  @Index()
   @TableColumn({
     type: TableColumnType.Markdown,
     required: false,
@@ -568,7 +567,7 @@ export default class IncidentStateTimeline extends BaseModel {
   @TableColumn({
     type: TableColumnType.Date,
     title: "Starts At",
-    description: "When did this status change start?",
+    description: "When did this status change?",
   })
   @Column({
     type: ColumnType.Date,

Common/Models/DatabaseModels/Index.ts

@@ -20,6 +20,7 @@ import GreenlockCertificate from "./GreenlockCertificate";
 import GreenlockChallenge from "./GreenlockChallenge";
 // Incidents
 import Incident from "./Incident";
+import IncidentFeed from "./IncidentFeed";
 import IncidentCustomField from "./IncidentCustomField";
 import IncidentInternalNote from "./IncidentInternalNote";
 import IncidentNoteTemplate from "./IncidentNoteTemplate";
@@ -142,6 +143,7 @@ import ScheduledMaintenanceTemplateOwnerTeam from "./ScheduledMaintenanceTemplat
 import ScheduledMaintenanceTemplateOwnerUser from "./ScheduledMaintenanceTemplateOwnerUser";
 
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+
 import AlertState from "./AlertState";
 import Alert from "./Alert";
 import AlertCustomField from "./AlertCustomField";
@@ -151,15 +153,28 @@ import AlertOwnerTeam from "./AlertOwnerTeam";
 import AlertOwnerUser from "./AlertOwnerUser";
 import AlertSeverity from "./AlertSeverity";
 import AlertNoteTemplate from "./AlertNoteTemplate";
+import AlertFeed from "./AlertFeed";
+
 import TableView from "./TableView";
 import Dashboard from "./Dashboard";
 
 import MonitorTest from "./MonitorTest";
+import ScheduledMaintenanceFeed from "./ScheduledMaintenanceFeed";
+
+import WorkspaceUserAuthToken from "./WorkspaceUserAuthToken";
+import WorkspaceProjectAuthToken from "./WorkspaceProjectAuthToken";
+import WorkspaceSetting from "./WorkspaceSetting";
+import WorkspaceNotificationRule from "./WorkspaceNotificationRule";
+import ProjectUser from "./ProjectUser";
+import OnCallDutyPolicyUserOverride from "./OnCallDutyPolicyUserOverride";
+import MonitorFeed from "./MonitorFeed";
 
 const AllModelTypes: Array<{
   new (): BaseModel;
 }> = [
   User,
+  WorkspaceUserAuthToken,
+  WorkspaceProjectAuthToken,
   Probe,
   Project,
   EmailVerificationToken,
@@ -179,6 +194,7 @@ const AllModelTypes: Array<{
   OnCallDutyPolicyEscalationRuleUser,
   OnCallDutyPolicyExecutionLog,
   OnCallDutyPolicyExecutionLogTimeline,
+  OnCallDutyPolicyUserOverride,
 
   Monitor,
   MonitorSecret,
@@ -187,6 +203,7 @@ const AllModelTypes: Array<{
 
   IncidentState,
   Incident,
+  IncidentFeed,
   IncidentCustomField,
   IncidentStateTimeline,
   IncidentInternalNote,
@@ -201,6 +218,7 @@ const AllModelTypes: Array<{
 
   AlertState,
   Alert,
+  AlertFeed,
   AlertCustomField,
   AlertStateTimeline,
   AlertInternalNote,
@@ -232,6 +250,7 @@ const AllModelTypes: Array<{
   ScheduledMaintenancePublicNote,
   ScheduledMaintenanceInternalNote,
   ScheduledMaintenanceCustomField,
+  ScheduledMaintenanceFeed,
 
   BillingPaymentMethods,
   BillingInvoice,
@@ -335,6 +354,13 @@ const AllModelTypes: Array<{
   Dashboard,
 
   MonitorTest,
+
+  WorkspaceSetting,
+  WorkspaceNotificationRule,
+
+  ProjectUser,
+
+  MonitorFeed,
 ];
 
 const modelTypeMap: { [key: string]: { new (): BaseModel } } = {};

Common/Models/DatabaseModels/Monitor.ts

@@ -34,6 +34,7 @@ import {
   ManyToMany,
   ManyToOne,
 } from "typeorm";
+import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
 @AccessControlColumn("labels")
@@ -1078,4 +1079,23 @@ export default class Monitor extends BaseModel {
     default: false,
   })
   public isNoProbeEnabledOnThisMonitor?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannels?: Array<NotificationRuleWorkspaceChannel> =
+    undefined;
 }

Common/Models/DatabaseModels/MonitorFeed.ts

@@ -0,0 +1,520 @@
+import Monitor from "./Monitor";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import Color from "../../Types/Color";
+import ColumnLength from "../../Types/Database/ColumnLength";
+
+export enum MonitorFeedEventType {
+  OwnerNotificationSent = "OwnerNotificationSent",
+  OwnerUserAdded = "OwnerUserAdded",
+  OwnerTeamAdded = "OwnerTeamAdded",
+  MonitorCreated = "MonitorCreated",
+  MonitorStatusChanged = "MonitorStatusChanged",
+  MonitorUpdated = "MonitorUpdated",
+  OwnerTeamRemoved = "OwnerTeamRemoved",
+  OwnerUserRemoved = "OwnerUserRemoved",
+  SubscriberNotificationSent = "SubscriberNotificationSent",
+}
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("monitor")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateMonitorFeed,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadMonitorFeed,
+  ],
+  delete: [],
+  update: [],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/monitor-feed"))
+@Entity({
+  name: "MonitorFeed",
+})
+@TableMetadata({
+  tableName: "MonitorFeed",
+  singularName: "Monitor Feed",
+  pluralName: "Monitor Feeds",
+  icon: IconProp.List,
+  tableDescription:
+    "Log of the entire monitor state change. This is a log of all the monitor state changes, public notes, more etc.",
+})
+export default class MonitorFeed extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Relation to Monitor in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Monitor ID",
+    description: "Relation to Monitor ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: true,
+    title: "Log (in Markdown)",
+    description: "Log of the entire monitor state change in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public feedInfoInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    title: "More Information (in Markdown)",
+    description: "More information in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+    unique: false,
+  })
+  public moreInformationInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    title: "Monitor Feed Event",
+    description: "Monitor Feed Event",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    unique: false,
+  })
+  public monitorFeedEventType?: MonitorFeedEventType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateMonitorFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadMonitorFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for the monitor log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+}

Common/Models/DatabaseModels/MonitorStatusTimeline.ts

@@ -455,7 +455,6 @@ export default class MonitorStatusTimeline extends BaseModel {
     ],
     update: [],
   })
-  @Index()
   @TableColumn({
     type: TableColumnType.Markdown,
     required: false,
@@ -516,7 +515,7 @@ export default class MonitorStatusTimeline extends BaseModel {
   @TableColumn({
     type: TableColumnType.Date,
     title: "Starts At",
-    description: "When did this status change start?",
+    description: "When did this status change?",
   })
   @Column({
     type: ColumnType.Date,

Common/Models/DatabaseModels/MonitorTest.ts

@@ -442,6 +442,7 @@ export default class MonitorTest extends BaseModel {
   })
   public monitorStepProbeResponse?: MonitorStepProbeResponse = undefined;
 
+  @Index()
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts

@@ -35,7 +35,12 @@ import Alert from "./Alert";
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableAccessControl({
-  create: [],
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+  ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
@@ -58,7 +63,12 @@ import Alert from "./Alert";
 })
 export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -89,7 +99,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public project?: Project = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -114,7 +129,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public projectId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -146,7 +166,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -172,7 +197,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public onCallDutyPolicyId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -204,7 +234,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByIncident?: Incident = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -216,6 +251,7 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     title: "Triggered By Incident ID",
+    required: false,
     description:
       "ID of the incident which triggered this on-call escalation policy.",
   })
@@ -227,7 +263,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByIncidentId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -258,7 +299,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByAlert?: Alert = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -270,6 +316,7 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     title: "Triggered By Alert ID",
+    required: false,
     description:
       "ID of the incident which triggered this on-call escalation policy.",
   })
@@ -281,7 +328,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByAlertId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -305,7 +357,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public status?: OnCallDutyPolicyStatus = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -329,7 +386,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public statusMessage?: string = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -353,7 +415,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public userNotificationEventType?: UserNotificationEventType = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -385,7 +452,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public createdByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -408,7 +480,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public createdByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -435,7 +512,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public deletedByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -458,7 +540,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -491,7 +578,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -514,7 +606,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -533,7 +630,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedAt?: Date = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -560,7 +662,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByTeam?: Team = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -583,7 +690,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByTeamId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -602,7 +714,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastExecutedEscalationRuleOrder?: number = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -621,7 +738,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastEscalationRuleExecutedAt?: Date = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -653,7 +775,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
     undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -678,7 +805,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastExecutedEscalationRuleId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -698,7 +830,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public executeNextEscalationRuleInMinutes?: number = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -717,4 +854,67 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
     default: 1,
   })
   public onCallPolicyExecutionRepeatCount?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Triggered by User",
+    description: "Relation to User who triggered on-clal policy",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByUserId" })
+  public triggeredByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Triggered by User ID",
+    description: "User ID who triggered this on-call policy",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByUserId?: ObjectID = undefined;
 }

Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts

@@ -26,6 +26,7 @@ import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/O
 import Permission from "../../Types/Permission";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import Alert from "./Alert";
 
 @TableBillingAccessControl({
   create: PlanType.Growth,
@@ -216,18 +217,74 @@ export default class OnCallDutyPolicyExecutionLogTimeline extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.ObjectID,
-    required: true,
+    required: false,
     canReadOnRelationQuery: true,
     title: "Incident ID",
     description: "ID of your OneUptime Incident in which this object belongs",
   })
   @Column({
     type: ColumnType.ObjectID,
-    nullable: false,
+    nullable: true,
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public triggeredByIncidentId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLogTimeline,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Relation to Alert Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertId" })
+  public triggeredByAlert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLogTimeline,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert ID",
+    description: "ID of your OneUptime Alert in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [
@@ -723,4 +780,52 @@ export default class OnCallDutyPolicyExecutionLogTimeline extends BaseModel {
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLogTimeline,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "overridedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Overridden by User",
+    description: "Relation to User who overrode this alert",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "overridedByUserId" })
+  public overridedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Overridden by User ID",
+    description: "User ID who overrode this alert",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public overridedByUserId?: ObjectID = undefined;
 }

Common/Models/DatabaseModels/OnCallDutyPolicyUserOverride.ts

@@ -0,0 +1,502 @@
+import OnCallDutyPolicy from "./OnCallDutyPolicy";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
+import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+
+@EnableDocumentation()
+@TableBillingAccessControl({
+  create: PlanType.Growth,
+  read: PlanType.Growth,
+  update: PlanType.Growth,
+  delete: PlanType.Growth,
+})
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateOnCallDutyPolicyUserOverride,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadOnCallDutyPolicyUserOverride,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteOnCallDutyPolicyUserOverride,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditOnCallDutyPolicyUserOverride,
+  ],
+})
+@CrudApiEndpoint(new Route("/on-call-duty-policy-user-override"))
+@Entity({
+  name: "OnCallDutyPolicyUserOverride",
+})
+@TableMetadata({
+  tableName: "OnCallDutyPolicyUserOverride",
+  singularName: "User Override",
+  pluralName: "User Overrides",
+  icon: IconProp.Call,
+  tableDescription:
+    "Manage on-call duty user overrides, for example if the user is on leave you can override the on-call duty policy for that user so all the alerts will be routed to the other user.",
+})
+export default class OnCallDutyPolicyUserOverride extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  // If this is null then it's a global override
+  // If this is set then it's a policy specific override
+  // Policy specifc override will take precedence over global override
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "onCallDutyPolicyId",
+    type: TableColumnType.Entity,
+    modelType: OnCallDutyPolicy,
+    title: "On-Call Policy",
+    description:
+      "Relation to On-Call Policy where this escalation rule belongs.",
+  })
+  @ManyToOne(
+    () => {
+      return OnCallDutyPolicy;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "onCallDutyPolicyId" })
+  public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "On-Call Policy ID",
+    description:
+      "ID of your On-Call Policy where this escalation rule belongs.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public onCallDutyPolicyId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "overrideUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Override User",
+    description:
+      "Relation to User who is being overridden by this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "overrideUserId" })
+  public overrideUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Override User ID",
+    description:
+      "User ID who is being overridden by this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public overrideUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "routeAlertsToUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Route Alerts To User",
+    description:
+      "Relation to User who is being overridden by this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "routeAlertsToUserId" })
+  public routeAlertsToUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Route Alerts To User ID",
+    description:
+      "User ID who is being overridden by this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public routeAlertsToUserId?: ObjectID = undefined;
+
+  @TableColumn({
+    title: "Start At",
+    type: TableColumnType.Date,
+    required: true,
+    description: "When does this start?",
+  })
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Date,
+  })
+  public startsAt?: Date = undefined;
+
+  @TableColumn({
+    title: "Ends At",
+    type: TableColumnType.Date,
+    required: true,
+    description: "When does this end?",
+  })
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateOnCallDutyPolicyUserOverride,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadOnCallDutyPolicyUserOverride,
+    ],
+    update: [],
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Date,
+  })
+  public endsAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Models/DatabaseModels/ProjectCallSMSConfig.ts

@@ -416,15 +416,46 @@ export default class ProjectCallSMSConfig extends BaseModel {
   })
   @TableColumn({
     type: TableColumnType.Phone,
-    title: "Twilio Phone Number",
-    description: "Phone Number for your Twilio account",
+    title: "Twilio Primary Phone Number",
+    description: "Primary Phone Number for your Twilio account",
   })
   @Column({
     type: ColumnType.Phone,
     length: ColumnLength.Phone,
     nullable: true,
-    unique: true,
+    unique: false,
     transformer: Phone.getDatabaseTransformer(),
   })
-  public twilioPhoneNumber?: Phone = undefined;
+  public twilioPrimaryPhoneNumber?: Phone = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateProjectCallSMSConfig,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectCallSMSConfig,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProjectCallSMSConfig,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "Twilio Secondary Phone Numbers",
+    description: "Secondary Phone Number for your Twilio account",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    nullable: true,
+    unique: false,
+  })
+  public twilioSecondaryPhoneNumbers?: string = undefined; // phone numbers seperated by comma
 }

Common/Models/DatabaseModels/ProjectUser.ts

@@ -0,0 +1,335 @@
+import Project from "./Project";
+import Team from "./Team";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import AllowUserQueryWithoutTenant from "../../Types/Database/AllowUserQueryWithoutTenant";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import CurrentUserCanAccessRecordBy from "../../Types/Database/CurrentUserCanAccessRecordBy";
+import MultiTenentQueryAllowed from "../../Types/Database/MultiTenentQueryAllowed";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+} from "typeorm";
+
+@TableAccessControl({
+  create: [],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadProjectTeam,
+    Permission.CurrentUser,
+  ],
+  delete: [],
+  update: [],
+})
+@MultiTenentQueryAllowed(true)
+@AllowUserQueryWithoutTenant(true)
+@CurrentUserCanAccessRecordBy("userId")
+@TenantColumn("projectId")
+@CrudApiEndpoint(new Route("/project-user"))
+@Entity({
+  name: "ProjectUser",
+})
+@TableMetadata({
+  tableName: "ProjectUser",
+  singularName: "User",
+  pluralName: "Users",
+  icon: IconProp.User,
+  tableDescription:
+    "This model connects users and teams. This is an internal table. Its a view on TeamMembers table.",
+})
+export default class ProjectUser extends BaseModel {
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectTeam,
+      Permission.CurrentUser,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: Team,
+    title: "Teams",
+    description: "Teams to which this user belongs.",
+  })
+  @ManyToMany(
+    () => {
+      return Team;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ProjectUserAcceptedTeams",
+    inverseJoinColumn: {
+      name: "teamId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "projectUserId",
+      referencedColumnName: "_id",
+    },
+  })
+  public acceptedTeams?: Array<Team> = undefined; // user is accepted to these teams. This is a view on TeamMembers table.
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectTeam,
+      Permission.CurrentUser,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.EntityArray,
+    modelType: Team,
+    title: "Teams",
+    description: "Teams to which this user belongs.",
+  })
+  @ManyToMany(
+    () => {
+      return Team;
+    },
+    { eager: false },
+  )
+  @JoinTable({
+    name: "ProjectUserInvitedTeams",
+    inverseJoinColumn: {
+      name: "teamId",
+      referencedColumnName: "_id",
+    },
+    joinColumn: {
+      name: "projectUserId",
+      referencedColumnName: "_id",
+    },
+  })
+  public invitedTeams?: Array<Team> = undefined; // user is invited to these teams.
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectTeam,
+      Permission.CurrentUser,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectTeam,
+      Permission.CurrentUser,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadProjectTeam,
+      Permission.ProjectMember,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "User who belongs to this team.",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectTeam,
+      Permission.CurrentUser,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "User ID",
+    description: "ID of User who belongs to this team",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}

Common/Models/DatabaseModels/ScheduledMaintenance.ts

@@ -35,6 +35,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import Recurring from "../../Types/Events/Recurring";
+import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
 @AccessControlColumn("labels")
@@ -917,6 +918,7 @@ export default class ScheduledMaintenance extends BaseModel {
   public sendSubscriberNotificationsOnBeforeTheEvent?: Array<Recurring> =
     undefined;
 
+  @Index()
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -950,4 +952,85 @@ export default class ScheduledMaintenance extends BaseModel {
     nullable: true,
   })
   public nextSubscriberNotificationBeforeTheEventAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.Number,
+    title: "Scheduled Maintenance Number",
+    description: "Scheduled Maintenance Number",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+  })
+  public scheduledMaintenanceNumber?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Post Updates To Workspace Channel Name",
+    description: "Post Updates To Workspace Channel Name",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public postUpdatesToWorkspaceChannels?: Array<NotificationRuleWorkspaceChannel> =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectScheduledMaintenance,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectScheduledMaintenance,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectScheduledMaintenance,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Should be visible on status page?",
+    description: "Should this incident be visible on the status page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: true,
+  })
+  public isVisibleOnStatusPage?: boolean = undefined;
 }

Common/Models/DatabaseModels/ScheduledMaintenanceFeed.ts

@@ -0,0 +1,530 @@
+import ScheduledMaintenance from "./ScheduledMaintenance";
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import Color from "../../Types/Color";
+
+export enum ScheduledMaintenanceFeedEventType {
+  PublicNote = "PublicNote",
+  SubscriberNotificationSent = "SubscriberNotificationSent",
+  OwnerNotificationSent = "OwnerNotificationSent",
+  OwnerUserAdded = "OwnerUserAdded",
+  OwnerTeamAdded = "OwnerTeamAdded",
+  ScheduledMaintenanceCreated = "ScheduledMaintenanceCreated",
+  ScheduledMaintenanceStateChanged = "ScheduledMaintenanceStateChanged",
+  PrivateNote = "PrivateNote",
+  ScheduledMaintenanceUpdated = "ScheduledMaintenanceUpdated",
+  RootCause = "RootCause",
+  RemediationNotes = "RemediationNotes",
+  OwnerUserRemoved = "OwnerUserRemoved",
+  OwnerTeamRemoved = "OwnerTeamRemoved",
+  OnCallPolicy = "OnCallPolicy",
+  OnCallNotification = "OnCallNotification",
+}
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("scheduledMaintenance")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateScheduledMaintenanceFeed,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadScheduledMaintenanceFeed,
+  ],
+  delete: [],
+  update: [],
+})
+@EnableWorkflow({
+  create: true,
+  delete: true,
+  update: true,
+  read: true,
+})
+@CrudApiEndpoint(new Route("/scheduled-maintenance-feed"))
+@Entity({
+  name: "ScheduledMaintenanceFeed",
+})
+@TableMetadata({
+  tableName: "ScheduledMaintenanceFeed",
+  singularName: "Scheduled Maintenance Feed",
+  pluralName: "Scheduled Maintenance Feed",
+  icon: IconProp.List,
+  tableDescription:
+    "Log of the entire scheduled maintenance state change. This is a log of all the scheduled maintenance state changes, public notes, more etc.",
+})
+export default class ScheduledMaintenanceFeed extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "scheduledMaintenanceId",
+    type: TableColumnType.Entity,
+    modelType: ScheduledMaintenance,
+    title: "ScheduledMaintenance",
+    description:
+      "Relation to ScheduledMaintenance in which this resource belongs",
+  })
+  @ManyToOne(
+    () => {
+      return ScheduledMaintenance;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "scheduledMaintenanceId" })
+  public scheduledMaintenance?: ScheduledMaintenance = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "ScheduledMaintenance ID",
+    description:
+      "Relation to ScheduledMaintenance ID in which this resource belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public scheduledMaintenanceId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: true,
+    title: "Log (in Markdown)",
+    description:
+      "Log of the entire scheduled maintenance state change in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: false,
+    unique: false,
+  })
+  public feedInfoInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Markdown,
+    required: false,
+    title: "More Information (in Markdown)",
+    description: "More information in Markdown",
+  })
+  @Column({
+    type: ColumnType.Markdown,
+    nullable: true,
+    unique: false,
+  })
+  public moreInformationInMarkdown?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    required: true,
+    title: "ScheduledMaintenance Log Event",
+    description: "ScheduledMaintenance Log Event",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: false,
+    unique: false,
+  })
+  public scheduledMaintenanceFeedEventType?: ScheduledMaintenanceFeedEventType =
+    undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Color,
+    required: true,
+    title: "Color",
+    description: "Display color for this log",
+  })
+  @Column({
+    type: ColumnType.Color,
+    length: ColumnLength.Color,
+    nullable: false,
+    unique: false,
+    transformer: Color.getDatabaseTransformer(),
+  })
+  public displayColor?: Color = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description:
+      "Relation to User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description:
+      "User who this feed belongs to (if this feed belongs to a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateScheduledMaintenanceFeed,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadScheduledMaintenanceFeed,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Feed Posted At",
+    description: "Date and time when the feed was posted",
+    type: TableColumnType.Date,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+    unique: false,
+  })
+  public postedAt?: Date = undefined;
+}

Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts

@@ -516,7 +516,7 @@ export default class ScheduledMaintenanceStateTimeline extends BaseModel {
   @TableColumn({
     type: TableColumnType.Date,
     title: "Starts At",
-    description: "When did this status change start?",
+    description: "When did this status change?",
   })
   @Column({
     type: ColumnType.Date,

Common/Models/DatabaseModels/ScheduledMaintenanceTemplate.ts

@@ -789,7 +789,12 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceTemplate,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceNoteTemplate,
+    ],
   })
   @TableColumn({
     isDefaultValueColumn: false,
@@ -816,7 +821,12 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceTemplate,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceNoteTemplate,
+    ],
   })
   @TableColumn({
     isDefaultValueColumn: false,
@@ -845,7 +855,12 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceTemplate,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceNoteTemplate,
+    ],
   })
   @TableColumn({
     isDefaultValueColumn: true,
@@ -873,7 +888,12 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceTemplate,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceNoteTemplate,
+    ],
   })
   @TableColumn({
     isDefaultValueColumn: true,
@@ -902,7 +922,12 @@ export default class ScheduledMaintenanceTemplate extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadScheduledMaintenanceTemplate,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditScheduledMaintenanceNoteTemplate,
+    ],
   })
   @TableColumn({
     isDefaultValueColumn: true,

Common/Models/DatabaseModels/StatusPage.ts

@@ -1973,4 +1973,151 @@ export default class StatusPage extends BaseModel {
     default: UptimePrecision.TWO_DECIMAL,
   })
   public overallUptimePercentPrecision?: UptimePrecision = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.VeryLongText,
+    title: "Subscriber Email Notification Footer Text",
+    description: "Text to send to subscribers in the footer of the email.",
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.VeryLongText,
+  })
+  public subscriberEmailNotificationFooterText?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Show Incidents on Status Page",
+    description: "Show Incidents on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showIncidentsOnStatusPage?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Show Announcements on Status Page",
+    description: "Show Announcements on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showAnnouncementsOnStatusPage?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectStatusPage,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Show Scheduled Maintenance Events on Status Page",
+    description: "Show Scheduled Maintenance Events on Status Page?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: true,
+    nullable: false,
+  })
+  @ColumnBillingAccessControl({
+    read: PlanType.Free,
+    update: PlanType.Growth,
+    create: PlanType.Free,
+  })
+  public showScheduledMaintenanceEventsOnStatusPage?: boolean = undefined;
 }

Common/Models/DatabaseModels/StatusPageAnnouncement.ts

@@ -164,7 +164,12 @@ export default class StatusPageAnnouncement extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadStatusPageAnnouncement,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditStatusPageAnnouncement,
+    ],
   })
   @TableColumn({
     required: false,

Common/Models/DatabaseModels/StatusPageSubscriber.ts

@@ -434,6 +434,63 @@ export default class StatusPageSubscriber extends BaseModel {
   })
   public deletedByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateStatusPageSubscriber,
+      Permission.Public,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadStatusPageSubscriber,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditStatusPageSubscriber,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    type: TableColumnType.Boolean,
+    title: "Is Subscription Confirmed",
+    description:
+      "Has subscriber confirmed their subscription? (for example, by clicking on a confirmation link in an email)",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    default: false,
+  })
+  public isSubscriptionConfirmed?: boolean = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateStatusPageSubscriber,
+    ],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    type: TableColumnType.ShortText,
+    title: "Subscription Confirmation Token",
+    description:
+      "Token used to confirm subscription. This is a random token that is sent to the subscriber's email address to confirm their subscription.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: true,
+  })
+  public subscriptionConfirmationToken?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

Common/Models/DatabaseModels/TelemetryException.ts

@@ -221,14 +221,14 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     canReadOnRelationQuery: false,
     title: "Exception Message",
     description: "Exception message that was thrown by the telemetry service",
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
+    type: ColumnType.VeryLongText,
   })
   public message?: string = undefined;
 
@@ -252,7 +252,7 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     canReadOnRelationQuery: false,
     title: "Stack Trace",
     description:
@@ -260,7 +260,7 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
+    type: ColumnType.VeryLongText,
   })
   public stackTrace?: string = undefined;
 
@@ -284,7 +284,7 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     canReadOnRelationQuery: false,
     title: "Exception Type",
     description:
@@ -292,7 +292,7 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
+    type: ColumnType.VeryLongText,
   })
   public exceptionType?: string = undefined;
 

Common/Models/DatabaseModels/UserNotificationRule.ts

@@ -1,4 +1,5 @@
 import IncidentSeverity from "./IncidentSeverity";
+import AlertSeverity from "./AlertSeverity";
 import Project from "./Project";
 import User from "./User";
 import UserCall from "./UserCall";
@@ -450,6 +451,55 @@ class UserNotificationRule extends BaseModel {
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public incidentSeverityId?: ObjectID = undefined;
+
+  // alert severity.
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "alertSeverityId",
+    type: TableColumnType.Entity,
+    modelType: AlertSeverity,
+    title: "Alert Severity",
+    description:
+      "Relation to Alert Severity Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return AlertSeverity;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "alertSeverityId" })
+  public alertSeverity?: AlertSeverity = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert Severity ID",
+    description: "ID of Alert Severity in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public alertSeverityId?: ObjectID = undefined;
 }
 
 export default UserNotificationRule;

Common/Models/DatabaseModels/UserOnCallLog.ts

@@ -28,6 +28,7 @@ import Permission from "../../Types/Permission";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
 import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import Alert from "./Alert";
 
 @EnableDocumentation()
 @TenantColumn("projectId")
@@ -368,16 +369,62 @@ export default class UserOnCallLog extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     title: "Triggered By Incident ID",
+    required: false,
     description:
       "ID of the incident which triggered this on-call escalation policy.",
   })
   @Column({
     type: ColumnType.ObjectID,
-    nullable: false,
+    nullable: true,
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public triggeredByIncidentId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Triggered By Alert",
+    description: "Relation to Alert which triggered this on-call duty policy.",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertId" })
+  public triggeredByAlert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Triggered By Alert ID",
+    required: false,
+    description:
+      "ID of the Alert which triggered this on-call escalation policy.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [Permission.CurrentUser],
@@ -697,4 +744,47 @@ export default class UserOnCallLog extends BaseModel {
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public onCallDutyScheduleId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "overridedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Overridden by User",
+    description: "Relation to User who overrode this alert",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "overridedByUserId" })
+  public overridedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Overridden by User ID",
+    description: "User ID who overrode this alert",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public overridedByUserId?: ObjectID = undefined;
 }

Common/Models/DatabaseModels/UserOnCallLogTimeline.ts

@@ -1,4 +1,5 @@
 import Incident from "./Incident";
+import Alert from "./Alert";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicyExecutionLog from "./OnCallDutyPolicyExecutionLog";
@@ -325,18 +326,64 @@ export default class UserOnCallLogTimeline extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.ObjectID,
-    required: true,
+    required: false,
     canReadOnRelationQuery: true,
     title: "Incident ID",
     description: "ID of your OneUptime Incident in which this object belongs",
   })
   @Column({
     type: ColumnType.ObjectID,
-    nullable: false,
+    nullable: true,
     transformer: ObjectID.getDatabaseTransformer(),
   })
   public triggeredByIncidentId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertId",
+    type: TableColumnType.Entity,
+    modelType: Alert,
+    title: "Alert",
+    description: "Relation to Alert Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Alert;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertId" })
+  public triggeredByAlert?: Alert = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert ID",
+    description: "ID of your OneUptime Alert in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [Permission.CurrentUser],

Common/Models/DatabaseModels/WorkspaceNotificationRule.ts

@@ -0,0 +1,469 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+import BaseNotificationRule from "../../Types/Workspace/NotificationRules/BaseNotificationRule";
+import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
+import Permission from "../../Types/Permission";
+import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
+import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+
+@TenantColumn("projectId")
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [
+    Permission.ProjectAdmin,
+    Permission.ProjectOwner,
+    Permission.ProjectMember,
+    Permission.CreateWorkspaceNotificationRule,
+  ],
+  read: [
+    Permission.ProjectAdmin,
+    Permission.ProjectOwner,
+    Permission.ProjectMember,
+    Permission.ReadWorkspaceNotificationRule,
+  ],
+  delete: [
+    Permission.ProjectAdmin,
+    Permission.ProjectOwner,
+    Permission.ProjectMember,
+    Permission.DeleteWorkspaceNotificationRule,
+  ],
+  update: [
+    Permission.ProjectAdmin,
+    Permission.ProjectOwner,
+    Permission.ProjectMember,
+    Permission.EditWorkspaceNotificationRule,
+  ],
+})
+@TableBillingAccessControl({
+  create: PlanType.Growth,
+  read: PlanType.Growth,
+  update: PlanType.Growth,
+  delete: PlanType.Growth,
+})
+@CrudApiEndpoint(new Route("/workspace-notification-rule"))
+@Entity({
+  name: "WorkspaceNotificationRule",
+})
+@TableMetadata({
+  tableName: "WorkspaceNotificationRule",
+  singularName: "Workspace Notification Rule",
+  pluralName: "Workspace Notification Rules",
+  icon: IconProp.Logs,
+  tableDescription: "Notification Rule for Third Party Workspaces",
+})
+class WorkspaceNotificationRule extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    title: "Rule Name",
+    description: "Name of the Notification Rule",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public name?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    title: "Rule Description",
+    description: "Description of the Notification Rule",
+    required: false,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: true,
+  })
+  public description?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    title: "Workspace Notification Rules",
+    description: "Notification Rules for the Workspace",
+    required: true,
+    unique: false,
+    type: TableColumnType.JSON,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.JSON,
+    unique: false,
+    nullable: false,
+  })
+  public notificationRule?: BaseNotificationRule = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    title: "Workspace Event Type",
+    description:
+      "Event Type for the Workspace like Incident Created, Monitor Status Updated, etc.",
+    required: true,
+    unique: false,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    unique: false,
+    nullable: false,
+  })
+  public eventType?: NotificationRuleEventType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    title: "Workspace Type",
+    description: "Type of Workspace - slack, microsoft teams etc.",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceType?: WorkspaceType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  // deleted by userId
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.CreateWorkspaceNotificationRule,
+    ],
+    read: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationRule,
+    ],
+    update: [
+      Permission.ProjectAdmin,
+      Permission.ProjectOwner,
+      Permission.ProjectMember,
+      Permission.EditWorkspaceNotificationRule,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}
+
+export default WorkspaceNotificationRule;

Common/Models/DatabaseModels/WorkspaceProjectAuthToken.ts

@@ -0,0 +1,379 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+import Permission from "../../Types/Permission";
+
+export interface MiscData {
+  [key: string]: string;
+}
+
+export interface SlackMiscData extends MiscData {
+  teamId: string;
+  teamName: string;
+  botUserId: string;
+}
+
+@TenantColumn("projectId")
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+  delete: [Permission.ProjectOwner, Permission.ProjectAdmin],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+})
+@CrudApiEndpoint(new Route("/workspace-project-auth-token"))
+@Entity({
+  name: "WorkspaceProjectAuthToken",
+})
+@TableMetadata({
+  tableName: "WorkspaceProjectAuthToken",
+  singularName: "Workspace Project Auth Token",
+  pluralName: "Workspace Project Auth Tokens",
+  icon: IconProp.Lock,
+  tableDescription: "Third Party Auth Token for the Project",
+})
+class WorkspaceProjectAuthToken extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    title: "Auth Token",
+    required: true,
+    unique: false,
+    type: TableColumnType.VeryLongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    unique: false,
+    nullable: false,
+  })
+  public authToken?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Workspace Type",
+    description: "Type of Workspace - slack, microsoft teams etc.",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceType?: WorkspaceType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    title: "Project ID in Workspace",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceProjectId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    title: "Misc Data",
+    required: true,
+    unique: false,
+    type: TableColumnType.JSON,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.JSON,
+    unique: false,
+    nullable: false,
+  })
+  public miscData?: MiscData = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}
+
+export default WorkspaceProjectAuthToken;

Common/Models/DatabaseModels/WorkspaceSetting.ts

@@ -0,0 +1,230 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+
+export interface Settings {
+  [key: string]: string;
+}
+
+export interface SlackSettings extends Settings {
+  teamId: string;
+  teamName: string;
+  botUserId: string;
+}
+
+@TenantColumn("projectId")
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [],
+  read: [],
+  delete: [],
+  update: [],
+})
+@CrudApiEndpoint(new Route("/workspace-setting"))
+@Entity({
+  name: "WorkspaceSetting",
+})
+@TableMetadata({
+  tableName: "WorkspaceSetting",
+  singularName: "Workspace Setting",
+  pluralName: "Workspace Settings",
+  icon: IconProp.Settings,
+  tableDescription: "Settings for Third Party Workspaces",
+})
+class WorkspaceSetting extends BaseModel {
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    title: "Workspace Settings",
+    description: "Settings for the Workspace",
+    required: true,
+    unique: false,
+    type: TableColumnType.JSON,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.JSON,
+    unique: false,
+    nullable: false,
+  })
+  public settings?: SlackSettings = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    title: "Workspace Type",
+    description: "Type of Workspace - slack, microsoft teams etc.",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceType?: WorkspaceType = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  // deleted by userId
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}
+
+export default WorkspaceSetting;

Common/Models/DatabaseModels/WorkspaceUserAuthToken.ts

@@ -0,0 +1,312 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import CurrentUserCanAccessRecordBy from "../../Types/Database/CurrentUserCanAccessRecordBy";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+
+export interface MiscData {
+  [key: string]: any;
+}
+
+export interface SlackMiscData extends MiscData {
+  userId: string;
+}
+
+@TenantColumn("projectId")
+@AllowAccessIfSubscriptionIsUnpaid()
+@TableAccessControl({
+  create: [Permission.CurrentUser],
+  read: [Permission.CurrentUser],
+  delete: [Permission.CurrentUser],
+  update: [Permission.CurrentUser],
+})
+@CrudApiEndpoint(new Route("/workspace-user-auth-token"))
+@Entity({
+  name: "WorkspaceUserAuthToken",
+})
+@TableMetadata({
+  tableName: "WorkspaceUserAuthToken",
+  singularName: "Workspace User Auth Token",
+  pluralName: "Workspace User Auth Tokens",
+  icon: IconProp.Lock,
+  tableDescription: "Third Party Auth Token for the User",
+})
+@CurrentUserCanAccessRecordBy("userId")
+class WorkspaceUserAuthToken extends BaseModel {
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to Project Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of your OneUptime Project in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    title: "Auth Token",
+    required: true,
+    unique: false,
+    type: TableColumnType.VeryLongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    unique: false,
+    nullable: false,
+  })
+  public authToken?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    title: "User ID in Service",
+    description: "User ID in the Workspace",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceUserId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    title: "Workspace Type",
+    description: "Type of Workspace - slack, microsoft teams etc.",
+    required: true,
+    unique: false,
+    type: TableColumnType.LongText,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    unique: false,
+    nullable: false,
+  })
+  public workspaceType?: WorkspaceType = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    title: "Misc Data",
+    required: true,
+    unique: false,
+    type: TableColumnType.JSON,
+    canReadOnRelationQuery: true,
+  })
+  @Column({
+    type: ColumnType.JSON,
+    unique: false,
+    nullable: false,
+  })
+  public miscData?: MiscData = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "user",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "User",
+    description: "Relation to User who this email belongs to",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userId" })
+  public user?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "User ID",
+    description: "User ID who this email belongs to",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  @Index()
+  public userId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created by User",
+    description:
+      "Relation to User who created this object (if this object was created by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [Permission.CurrentUser],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created by User ID",
+    description:
+      "User ID who created this object (if this object was created by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    title: "Deleted by User",
+    description:
+      "Relation to User who deleted this object (if this object was deleted by a User)",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      cascade: false,
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted by User ID",
+    description:
+      "User ID who deleted this object (if this object was deleted by a User)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+}
+
+export default WorkspaceUserAuthToken;

Common/Server/API/BaseAPI.ts

@@ -13,6 +13,7 @@ import Express, {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import CommonAPI from "./CommonAPI";
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
@@ -131,6 +132,30 @@ export default class BaseAPI<
       },
     );
 
+    router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/update-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.updateItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
+    router.get(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/update-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.updateItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     // Delete
     router.delete(
       `${new this.entityType().getCrudApiPath()?.toString()}/:id`,
@@ -144,10 +169,35 @@ export default class BaseAPI<
       },
     );
 
+    router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/delete-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.deleteItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
+    router.get(
+      `${new this.entityType().getCrudApiPath()?.toString()}/:id/delete-item`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          await this.deleteItem(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     this.router = router;
     this.service = service;
   }
 
+  @CaptureSpan()
   public async getPermissionsForTenant(
     req: ExpressRequest,
   ): Promise<Array<UserPermission>> {
@@ -178,6 +228,7 @@ export default class BaseAPI<
     return null;
   }
 
+  @CaptureSpan()
   public async getList(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -254,6 +305,7 @@ export default class BaseAPI<
     );
   }
 
+  @CaptureSpan()
   public async count(req: ExpressRequest, res: ExpressResponse): Promise<void> {
     let query: Query<BaseModel> = {};
 
@@ -276,6 +328,7 @@ export default class BaseAPI<
     });
   }
 
+  @CaptureSpan()
   public async getItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -299,6 +352,7 @@ export default class BaseAPI<
     return Response.sendEntityResponse(req, res, item, this.entityType);
   }
 
+  @CaptureSpan()
   public async deleteItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -314,6 +368,7 @@ export default class BaseAPI<
     return Response.sendEmptySuccessResponse(req, res);
   }
 
+  @CaptureSpan()
   public async updateItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -340,6 +395,7 @@ export default class BaseAPI<
     return Response.sendEmptySuccessResponse(req, res);
   }
 
+  @CaptureSpan()
   public async createItem(
     req: ExpressRequest,
     res: ExpressResponse,

Common/Server/API/BaseAnalyticsAPI.ts

@@ -28,6 +28,7 @@ import ObjectID from "Common/Types/ObjectID";
 import { UserPermission } from "Common/Types/Permission";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class BaseAnalyticsAPI<
   TAnalyticsDataModel extends AnalyticsDataModel,
@@ -178,6 +179,7 @@ export default class BaseAnalyticsAPI<
     this.service = service;
   }
 
+  @CaptureSpan()
   public async getPermissionsForTenant(
     req: ExpressRequest,
   ): Promise<Array<UserPermission>> {
@@ -208,6 +210,7 @@ export default class BaseAnalyticsAPI<
     return null;
   }
 
+  @CaptureSpan()
   public async getList(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -277,6 +280,7 @@ export default class BaseAnalyticsAPI<
     );
   }
 
+  @CaptureSpan()
   public async getAggregate(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -291,6 +295,17 @@ export default class BaseAnalyticsAPI<
       ) as any;
     }
 
+    let groupBy: GroupBy<AnalyticsDataModel> | null =
+      req.body["groupBy"] || null;
+
+    if (groupBy && Object.keys(groupBy).length > 0) {
+      groupBy = JSONFunctions.deserialize(groupBy as JSONObject) as any;
+    }
+
+    if (groupBy && Object.keys(groupBy).length === 0) {
+      groupBy = null;
+    }
+
     if (!aggregateBy) {
       throw new BadRequestException("AggregateBy is required");
     }
@@ -308,6 +323,7 @@ export default class BaseAnalyticsAPI<
     });
   }
 
+  @CaptureSpan()
   public async count(req: ExpressRequest, res: ExpressResponse): Promise<void> {
     let query: Query<AnalyticsDataModel> = {};
 
@@ -330,6 +346,7 @@ export default class BaseAnalyticsAPI<
     });
   }
 
+  @CaptureSpan()
   public async getItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -353,6 +370,7 @@ export default class BaseAnalyticsAPI<
     return Response.sendEntityResponse(req, res, item, this.entityType);
   }
 
+  @CaptureSpan()
   public async deleteItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -370,6 +388,7 @@ export default class BaseAnalyticsAPI<
     return Response.sendEmptySuccessResponse(req, res);
   }
 
+  @CaptureSpan()
   public async updateItem(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -400,6 +419,7 @@ export default class BaseAnalyticsAPI<
     return Response.sendEmptySuccessResponse(req, res);
   }
 
+  @CaptureSpan()
   public async createItem(
     req: ExpressRequest,
     res: ExpressResponse,

Common/Server/API/BillingInvoiceAPI.ts

@@ -14,7 +14,6 @@ import {
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import SubscriptionStatus from "Common/Types/Billing/SubscriptionStatus";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import { JSONObject } from "Common/Types/JSON";
 import Permission, { UserPermission } from "Common/Types/Permission";
@@ -127,37 +126,8 @@ export default class UserAPI extends BaseAPI<
             },
           });
 
-          // refresh subscription status.
-          const subscriptionState: SubscriptionStatus =
-            await BillingService.getSubscriptionStatus(
-              project.paymentProviderSubscriptionId as string,
-            );
-
-          const meteredSubscriptionState: SubscriptionStatus =
-            await BillingService.getSubscriptionStatus(
-              project.paymentProviderMeteredSubscriptionId as string,
-            );
-
-          // if subscription is cancelled, create a new subscription and update project.
-
-          if (
-            meteredSubscriptionState === SubscriptionStatus.Canceled ||
-            subscriptionState === SubscriptionStatus.Canceled
-          ) {
-            await ProjectService.reactiveSubscription(project.id!);
-          }
-
-          await ProjectService.updateOneById({
-            id: project.id!,
-            data: {
-              paymentProviderSubscriptionStatus: subscriptionState,
-              paymentProviderMeteredSubscriptionStatus:
-                meteredSubscriptionState,
-            },
-            props: {
-              isRoot: true,
-              ignoreHooks: true,
-            },
+          await BillingInvoiceService.refreshSubscriptionStatus({
+            projectId: project.id!,
           });
 
           return Response.sendEmptySuccessResponse(req, res);

Common/Server/API/CommonAPI.ts

@@ -4,8 +4,10 @@ import { ExpressRequest, OneUptimeRequest } from "../Utils/Express";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import { PlanType } from "Common/Types/Billing/SubscriptionPlan";
 import UserType from "Common/Types/UserType";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class CommonAPI {
+  @CaptureSpan()
   public static async getDatabaseCommonInteractionProps(
     req: ExpressRequest,
   ): Promise<DatabaseCommonInteractionProps> {

Common/Server/API/ProbeAPI.ts

@@ -13,7 +13,7 @@ import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import Probe from "Common/Models/DatabaseModels/Probe";
 
-export default class Ingestor extends BaseAPI<Probe, ProbeServiceType> {
+export default class ProbeAPI extends BaseAPI<Probe, ProbeServiceType> {
   public constructor() {
     super(Probe, ProbeService);
 

Common/Server/API/SlackAPI.ts

@@ -0,0 +1,418 @@
+import Express, {
+  ExpressRequest,
+  ExpressResponse,
+  ExpressRouter,
+} from "../Utils/Express";
+import Response from "../Utils/Response";
+import SlackAuthorization from "../Middleware/SlackAuthorization";
+import BadRequestException from "../../Types/Exception/BadRequestException";
+import logger from "../Utils/Logger";
+import { JSONObject } from "../../Types/JSON";
+import BadDataException from "../../Types/Exception/BadDataException";
+import {
+  AppApiClientUrl,
+  DashboardClientUrl,
+  Host,
+  HttpProtocol,
+  SlackAppClientId,
+  SlackAppClientSecret,
+} from "../EnvironmentConfig";
+import SlackAppManifest from "../Utils/Workspace/Slack/app-manifest.json";
+import URL from "../../Types/API/URL";
+import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
+import HTTPResponse from "../../Types/API/HTTPResponse";
+import API from "../../Utils/API";
+import WorkspaceProjectAuthTokenService from "../Services/WorkspaceProjectAuthTokenService";
+import ObjectID from "../../Types/ObjectID";
+import WorkspaceUserAuthTokenService from "../Services/WorkspaceUserAuthTokenService";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+import SlackAuthAction, {
+  SlackRequest,
+} from "../Utils/Workspace/Slack/Actions/Auth";
+import SlackIncidentActions from "../Utils/Workspace/Slack/Actions/Incident";
+import SlackAlertActions from "../Utils/Workspace/Slack/Actions/Alert";
+import SlackScheduledMaintenanceActions from "../Utils/Workspace/Slack/Actions/ScheduledMaintenance";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import SlackMonitorActions from "../Utils/Workspace/Slack/Actions/Monitor";
+
+export default class SlackAPI {
+  public getRouter(): ExpressRouter {
+    const router: ExpressRouter = Express.getRouter();
+
+    router.get(
+      "/slack/app-manifest",
+      (req: ExpressRequest, res: ExpressResponse) => {
+        // return app manifest for slack app
+
+        let ServerURL: string = new URL(HttpProtocol, Host).toString();
+
+        //remove trailing slash if present.
+        if (ServerURL.endsWith("/")) {
+          ServerURL = ServerURL.slice(0, -1);
+        }
+
+        // replace SERVER_URL in the manifest with the actual server url.
+        const manifestInString: string = JSON.stringify(
+          SlackAppManifest,
+        ).replace(/{{SERVER_URL}}/g, ServerURL.toString());
+
+        // convert it back to json.
+        const manifest: JSONObject = JSON.parse(manifestInString);
+
+        return Response.sendJsonObjectResponse(req, res, manifest);
+      },
+    );
+
+    router.get(
+      "/slack/auth/:projectId/:userId",
+      async (req: ExpressRequest, res: ExpressResponse) => {
+        if (!SlackAppClientId) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Slack App Client ID is not set"),
+          );
+        }
+
+        if (!SlackAppClientSecret) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Slack App Client Secret is not set"),
+          );
+        }
+
+        const projectId: string | undefined =
+          req.params["projectId"]?.toString();
+        const userId: string | undefined = req.params["userId"]?.toString();
+
+        if (!projectId) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Invalid ProjectID in request"),
+          );
+        }
+
+        if (!userId) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Invalid UserID in request"),
+          );
+        }
+
+        // if there's an error query param.
+        const error: string | undefined = req.query["error"]?.toString();
+
+        const slackIntegrationPageUrl: URL = URL.fromString(
+          DashboardClientUrl.toString() +
+            `/${projectId.toString()}/settings/slack-integration`,
+        );
+
+        if (error) {
+          return Response.redirect(
+            req,
+            res,
+            slackIntegrationPageUrl.addQueryParam("error", error),
+          );
+        }
+
+        // slack returns the code on successful auth.
+        const code: string | undefined = req.query["code"]?.toString();
+
+        if (!code) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadRequestException("Invalid request"),
+          );
+        }
+
+        // get access token from slack api.
+
+        const redirectUri: URL = URL.fromString(
+          `${AppApiClientUrl.toString()}/slack/auth/${projectId}/${userId}`,
+        );
+
+        const requestBody: JSONObject = {
+          code: code,
+          client_id: SlackAppClientId,
+          client_secret: SlackAppClientSecret,
+          redirect_uri: redirectUri.toString(),
+        };
+
+        logger.debug("Slack Auth Request Body: ");
+        logger.debug(requestBody);
+
+        // send the request to slack api to get the access token https://slack.com/api/oauth.v2.access
+
+        const response: HTTPErrorResponse | HTTPResponse<JSONObject> =
+          await API.post(
+            URL.fromString("https://slack.com/api/oauth.v2.access"),
+            requestBody,
+            {
+              "Content-Type": "application/x-www-form-urlencoded",
+            },
+          );
+
+        if (response instanceof HTTPErrorResponse) {
+          throw response;
+        }
+
+        const responseBody: JSONObject = response.data;
+
+        logger.debug("Slack Auth Request Body: ");
+        logger.debug(responseBody);
+
+        let slackTeamId: string | undefined = undefined;
+        let slackBotAccessToken: string | undefined = undefined;
+        let slackUserId: string | undefined = undefined;
+        let slackTeamName: string | undefined = undefined;
+        let botUserId: string | undefined = undefined;
+        let slackUserAccessToken: string | undefined = undefined;
+
+        // ReponseBody is in this format.
+        //   {
+        //     "ok": true,
+        //     "access_token": "sample-token",
+        //     "token_type": "bot",
+        //     "scope": "commands,incoming-webhook",
+        //     "bot_user_id": "U0KRQLJ9H",
+        //     "app_id": "A0KRD7HC3",
+        //     "team": {
+        //         "name": "Slack Pickleball Team",
+        //         "id": "T9TK3CUKW"
+        //     },
+        //     "enterprise": {
+        //         "name": "slack-pickleball",
+        //         "id": "E12345678"
+        //     },
+        //     "authed_user": {
+        //         "id": "U1234",
+        //         "scope": "chat:write",
+        //         "access_token": "sample-token",
+        //         "token_type": "user"
+        //     }
+        // }
+
+        if (responseBody["ok"] !== true) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadRequestException("Invalid request"),
+          );
+        }
+
+        if (
+          responseBody["team"] &&
+          (responseBody["team"] as JSONObject)["id"]
+        ) {
+          slackTeamId = (responseBody["team"] as JSONObject)["id"]?.toString();
+        }
+
+        if (responseBody["access_token"]) {
+          slackBotAccessToken = responseBody["access_token"]?.toString();
+        }
+
+        if (
+          responseBody["authed_user"] &&
+          (responseBody["authed_user"] as JSONObject)["id"]
+        ) {
+          slackUserId = (responseBody["authed_user"] as JSONObject)[
+            "id"
+          ]?.toString();
+        }
+
+        if (
+          responseBody["authed_user"] &&
+          (responseBody["authed_user"] as JSONObject)["access_token"]
+        ) {
+          slackUserAccessToken = (responseBody["authed_user"] as JSONObject)[
+            "access_token"
+          ]?.toString();
+        }
+
+        if (
+          responseBody["team"] &&
+          (responseBody["team"] as JSONObject)["name"]
+        ) {
+          slackTeamName = (responseBody["team"] as JSONObject)[
+            "name"
+          ]?.toString();
+        }
+
+        if (responseBody["bot_user_id"]) {
+          botUserId = responseBody["bot_user_id"]?.toString();
+        }
+
+        await WorkspaceProjectAuthTokenService.refreshAuthToken({
+          projectId: new ObjectID(projectId),
+          workspaceType: WorkspaceType.Slack,
+          authToken: slackBotAccessToken || "",
+          workspaceProjectId: slackTeamId || "",
+          miscData: {
+            teamId: slackTeamId || "",
+            teamName: slackTeamName || "",
+            botUserId: botUserId || "",
+          },
+        });
+
+        await WorkspaceUserAuthTokenService.refreshAuthToken({
+          projectId: new ObjectID(projectId),
+          userId: new ObjectID(userId),
+          workspaceType: WorkspaceType.Slack,
+          authToken: slackUserAccessToken || "",
+          workspaceUserId: slackUserId || "",
+          miscData: {
+            userId: slackUserId || "",
+          },
+        });
+
+        // return back to dashboard after successful auth.
+        Response.redirect(req, res, slackIntegrationPageUrl);
+      },
+    );
+
+    router.post(
+      "/slack/interactive",
+      SlackAuthorization.isAuthorizedSlackRequest,
+      async (req: ExpressRequest, res: ExpressResponse) => {
+        logger.debug("Slack Interactive Request: ");
+
+        const authResult: SlackRequest = await SlackAuthAction.isAuthorized({
+          req: req,
+        });
+
+        logger.debug("Slack Interactive Auth Result: ");
+        logger.debug(authResult);
+
+        // if slack uninstall app then,
+        if (authResult.payloadType === "app_uninstall") {
+          logger.debug("Slack App Uninstall Request: ");
+
+          // remove the project auth and user auth.
+
+          // delete all user auth tokens for this project.
+          await WorkspaceUserAuthTokenService.deleteBy({
+            query: {
+              projectId: authResult.projectId,
+              workspaceType: WorkspaceType.Slack,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          await WorkspaceProjectAuthTokenService.deleteBy({
+            query: {
+              projectId: authResult.projectId,
+              workspaceType: WorkspaceType.Slack,
+            },
+            limit: 1,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          logger.debug("Slack App Uninstall Request: Deleted all auth tokens.");
+          // return empty response.
+
+          return Response.sendTextResponse(req, res, "");
+        }
+
+        if (authResult.isAuthorized === false) {
+          // return empty response if not authorized. Do nothing in this case.
+          return Response.sendTextResponse(req, res, "");
+        }
+
+        for (const action of authResult.actions || []) {
+          if (!action.actionType) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadRequestException("Invalid request"),
+            );
+          }
+
+          if (
+            SlackIncidentActions.isIncidentAction({
+              actionType: action.actionType,
+            })
+          ) {
+            return SlackIncidentActions.handleIncidentAction({
+              slackRequest: authResult,
+              action: action,
+              req: req,
+              res: res,
+            });
+          }
+
+          if (
+            SlackAlertActions.isAlertAction({
+              actionType: action.actionType,
+            })
+          ) {
+            return SlackAlertActions.handleAlertAction({
+              slackRequest: authResult,
+              action: action,
+              req: req,
+              res: res,
+            });
+          }
+
+          if (
+            SlackMonitorActions.isMonitorAction({
+              actionType: action.actionType,
+            })
+          ) {
+            return SlackMonitorActions.handleMonitorAction({
+              slackRequest: authResult,
+              action: action,
+              req: req,
+              res: res,
+            });
+          }
+
+          if (
+            SlackScheduledMaintenanceActions.isScheduledMaintenanceAction({
+              actionType: action.actionType,
+            })
+          ) {
+            return SlackScheduledMaintenanceActions.handleScheduledMaintenanceAction(
+              {
+                slackRequest: authResult,
+                action: action,
+                req: req,
+                res: res,
+              },
+            );
+          }
+        }
+
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadRequestException("Invalid request"),
+        );
+      },
+    );
+
+    // options load endpoint.
+
+    router.post(
+      "/slack/options-load",
+      SlackAuthorization.isAuthorizedSlackRequest,
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return Response.sendJsonObjectResponse(req, res, {
+          response_action: "clear",
+        });
+      },
+    );
+
+    return router;
+  }
+}

Common/Server/API/StatusAPI.ts

@@ -1,3 +1,4 @@
+import BadRequestException from "../../Types/Exception/BadRequestException";
 import LocalCache from "../Infrastructure/LocalCache";
 import Express, {
   ExpressRequest,
@@ -6,16 +7,21 @@ import Express, {
 } from "../Utils/Express";
 import logger from "../Utils/Logger";
 import Response from "../Utils/Response";
-import Telemetry, { Span, TelemetryCounter } from "../Utils/Telemetry";
+import Telemetry, { TelemetryCounter } from "../Utils/Telemetry";
 import Exception from "Common/Types/Exception/Exception";
 import ServerException from "Common/Types/Exception/ServerException";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export interface StatusAPIOptions {
   readyCheck: () => Promise<void>;
   liveCheck: () => Promise<void>;
+  globalCacheCheck?: (() => Promise<void>) | undefined;
+  analyticsDatabaseCheck?: (() => Promise<void>) | undefined;
+  databaseCheck?: (() => Promise<void>) | undefined;
 }
 
 export default class StatusAPI {
+  @CaptureSpan()
   public static init(options: StatusAPIOptions): ExpressRouter {
     const statusCheckSuccessCounter: TelemetryCounter = Telemetry.getCounter({
       name: "status.check.success",
@@ -64,65 +70,196 @@ export default class StatusAPI {
     });
 
     //Healthy probe
-    router.get(
-      "/status/ready",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        return Telemetry.startActiveSpan({
-          name: "/status/ready",
-          fn: async (span: Span) => {
-            try {
-              logger.debug("Ready check");
-              await options.readyCheck();
-              logger.info("Ready check: ok");
-              stausReadySuccess.add(1);
+    router.get("/status/ready", (req: ExpressRequest, res: ExpressResponse) => {
+      return this.handleReadyCheck(
+        options,
+        stausReadySuccess,
+        stausReadyFailed,
+        req,
+        res,
+      );
+    });
 
-              Response.sendJsonObjectResponse(req, res, {
-                status: "ok",
-              });
-              span.end();
-            } catch (e) {
-              span.recordException(e as Exception);
-              stausReadyFailed.add(1);
-              Response.sendErrorResponse(
-                req,
-                res,
-                e instanceof Exception
-                  ? e
-                  : new ServerException("Server is not ready"),
-              );
-              span.end();
-            }
-          },
-        });
+    //Liveness probe
+    router.get("/status/live", (req: ExpressRequest, res: ExpressResponse) => {
+      return this.handleLiveCheck(
+        options,
+        stausLiveSuccess,
+        stausLiveFailed,
+        req,
+        res,
+      );
+    });
+
+    // Global cache check
+    router.get(
+      "/status/global-cache",
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleGlobalCacheCheck(options, req, res);
       },
     );
 
-    //Liveness probe
+    // Analytics database check
     router.get(
-      "/status/live",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Live check");
-          await options.readyCheck();
-          logger.info("Live check: ok");
-          stausLiveSuccess.add(1);
+      "/status/analytics-database",
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleAnalyticsDatabaseCheck(options, req, res);
+      },
+    );
 
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          stausLiveFailed.add(1);
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Server is not ready"),
-          );
-        }
+    // Database check
+    router.get(
+      "/status/database",
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleDatabaseCheck(options, req, res);
       },
     );
 
     return router;
   }
+
+  @CaptureSpan()
+  private static async handleReadyCheck(
+    options: StatusAPIOptions,
+    stausReadySuccess: TelemetryCounter,
+    stausReadyFailed: TelemetryCounter,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Ready check");
+      await options.readyCheck();
+      logger.info("Ready check: ok");
+      stausReadySuccess.add(1);
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      stausReadyFailed.add(1);
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception ? e : new ServerException("Server is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleLiveCheck(
+    options: StatusAPIOptions,
+    stausLiveSuccess: TelemetryCounter,
+    stausLiveFailed: TelemetryCounter,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Live check");
+      await options.liveCheck();
+      logger.info("Live check: ok");
+      stausLiveSuccess.add(1);
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      stausLiveFailed.add(1);
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception ? e : new ServerException("Server is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleGlobalCacheCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Global cache check");
+      if (options.globalCacheCheck) {
+        await options.globalCacheCheck();
+      } else {
+        throw new BadRequestException("Global cache check not implemented");
+      }
+      logger.info("Global cache check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Global cache is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleAnalyticsDatabaseCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Analytics database check");
+      if (options.analyticsDatabaseCheck) {
+        await options.analyticsDatabaseCheck();
+      } else {
+        throw new BadRequestException(
+          "Analytics database check not implemented",
+        );
+      }
+      logger.info("Analytics database check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Analytics database is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleDatabaseCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Database check");
+
+      if (options.databaseCheck) {
+        await options.databaseCheck();
+      } else {
+        throw new BadRequestException("Database check not implemented");
+      }
+
+      logger.info("Database check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Database is not ready"),
+      );
+    }
+  }
 }

Common/Server/API/TelemetryAPI.ts

@@ -11,7 +11,6 @@ import CommonAPI from "./CommonAPI";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 import TelemetryAttributeService from "../Services/TelemetryAttributeService";
-import ArrayUtil from "Common/Utils/Array";
 
 const router: ExpressRouter = Express.getRouter();
 
@@ -72,12 +71,11 @@ const getAttributes: GetAttributesFunction = async (
       );
     }
 
-    const attributes: string[] = ArrayUtil.removeDuplicates(
+    const attributes: string[] =
       await TelemetryAttributeService.fetchAttributes({
         projectId: databaseProps.tenantId,
         telemetryType,
-      }),
-    );
+      });
 
     return Response.sendJsonObjectResponse(req, res, {
       attributes: attributes,

Common/Server/API/UserOnCallLogTimelineAPI.ts

@@ -10,7 +10,7 @@ import {
 } from "../Utils/Express";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
-import { DashboardRoute } from "Common/ServiceRoute";
+import { AppApiRoute, DashboardRoute } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
 import URL from "Common/Types/API/URL";
@@ -20,6 +20,7 @@ import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
 import UserNotificationStatus from "Common/Types/UserNotification/UserNotificationStatus";
 import UserOnCallLogTimeline from "Common/Models/DatabaseModels/UserOnCallLogTimeline";
+import Route from "../../Types/API/Route";
 
 export default class UserNotificationLogTimelineAPI extends BaseAPI<
   UserOnCallLogTimeline,
@@ -55,6 +56,7 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
               _id: true,
               projectId: true,
               triggeredByIncidentId: true,
+              triggeredByAlertId: true,
             },
             props: {
               isRoot: true,
@@ -91,6 +93,84 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
       },
     );
 
+    // We have this ack page to show the user a confirmation page before acknowledging the notification.
+    // this is because email clients automatically make a get request to the url in the email and ack the notification automatically which is not what we want.
+    // so we need to create this page for the user to confirm that they want to acknowledge the notification.
+    this.router.get(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/acknowledge-page/:itemId`,
+      async (req: ExpressRequest, res: ExpressResponse) => {
+        req = req as OneUptimeRequest;
+
+        if (!req.params["itemId"]) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Item ID is required"),
+          );
+        }
+
+        const itemId: ObjectID = new ObjectID(req.params["itemId"]);
+
+        const timelineItem: UserOnCallLogTimeline | null =
+          await this.service.findOneById({
+            id: itemId,
+            select: {
+              _id: true,
+              projectId: true,
+              triggeredByIncidentId: true,
+              triggeredByIncident: {
+                title: true,
+                description: true,
+              },
+              triggeredByAlertId: true,
+              triggeredByAlert: {
+                title: true,
+                description: true,
+              },
+            },
+            props: {
+              isRoot: true,
+            },
+          });
+
+        if (!timelineItem) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Invalid item Id"),
+          );
+        }
+
+        const notificationType: string = timelineItem.triggeredByIncidentId
+          ? "Incident"
+          : "Alert";
+
+        const host: Hostname = await DatabaseConfig.getHost();
+        const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
+
+        return Response.render(
+          req,
+          res,
+          "/usr/src/Common/Server/Views/AcknowledgeUserOnCallNotification.ejs",
+          {
+            title: `Acknowledge ${notificationType} - ${timelineItem.triggeredByIncident?.title || timelineItem.triggeredByAlert?.title}`,
+            message: `Do you want to acknowledge this ${notificationType}?`,
+            acknowledgeText: `Acknowledge ${notificationType}`,
+            acknowledgeUrl: new URL(
+              httpProtocol,
+              host,
+              new Route(AppApiRoute.toString())
+                .addRoute(new UserOnCallLogTimeline().crudApiPath!)
+                .addRoute("/acknowledge/" + itemId.toString()),
+            ).toString(),
+          },
+        );
+      },
+    );
+
+    // This is the link that actually acknowledges the notification.
     this.router.get(
       `${new this.entityType()
         .getCrudApiPath()
@@ -115,6 +195,15 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
               _id: true,
               projectId: true,
               triggeredByIncidentId: true,
+              triggeredByAlertId: true,
+              triggeredByAlert: {
+                title: true,
+              },
+              triggeredByIncident: {
+                title: true,
+              },
+              acknowledgedAt: true,
+              isAcknowledged: true,
             },
             props: {
               isRoot: true,
@@ -129,6 +218,33 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
           );
         }
 
+        const host: Hostname = await DatabaseConfig.getHost();
+        const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
+
+        if (timelineItem.isAcknowledged) {
+          // already acknowledged. Then show already acknowledged page with view details button.
+
+          const viewDetailsUrl: URL = new URL(
+            httpProtocol,
+            host,
+            DashboardRoute.addRoute(
+              `/${timelineItem.projectId?.toString()}/${timelineItem.triggeredByIncidentId ? "incidents" : "alerts"}/${timelineItem.triggeredByIncidentId ? timelineItem.triggeredByIncidentId!.toString() : timelineItem.triggeredByAlertId!.toString()}`,
+            ),
+          );
+
+          return Response.render(
+            req,
+            res,
+            "/usr/src/Common/Server/Views/ViewMessage.ejs",
+            {
+              title: `Notification Already Acknowledged - ${timelineItem.triggeredByIncident?.title || timelineItem.triggeredByAlert?.title}`,
+              message: `This notification has already been acknowledged.`,
+              viewDetailsText: `View ${timelineItem.triggeredByIncidentId ? "Incident" : "Alert"}`,
+              viewDetailsUrl: viewDetailsUrl.toString(),
+            },
+          );
+        }
+
         await this.service.updateOneById({
           id: itemId,
           data: {
@@ -144,19 +260,38 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
 
         // redirect to dashboard to incidents page.
 
-        const host: Hostname = await DatabaseConfig.getHost();
-        const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
+        if (timelineItem.triggeredByIncidentId) {
+          return Response.redirect(
+            req,
+            res,
+            new URL(
+              httpProtocol,
+              host,
+              DashboardRoute.addRoute(
+                `/${timelineItem.projectId?.toString()}/incidents/${timelineItem.triggeredByIncidentId!.toString()}`,
+              ),
+            ),
+          );
+        }
 
-        return Response.redirect(
+        if (timelineItem.triggeredByAlertId) {
+          return Response.redirect(
+            req,
+            res,
+            new URL(
+              httpProtocol,
+              host,
+              DashboardRoute.addRoute(
+                `/${timelineItem.projectId?.toString()}/alerts/${timelineItem.triggeredByAlertId!.toString()}`,
+              ),
+            ),
+          );
+        }
+
+        return Response.sendErrorResponse(
           req,
           res,
-          new URL(
-            httpProtocol,
-            host,
-            DashboardRoute.addRoute(
-              `/${timelineItem.projectId?.toString()}/incidents/${timelineItem.triggeredByIncidentId!.toString()}`,
-            ),
-          ),
+          new BadDataException("Invalid item Id"),
         );
       },
     );