refactor: rename 'type' columns to 'fileType', 'paymentMethodType', and 'customFieldType' in migration files for clarity; update related code references

- Implemented a comprehensive bash script to automate the publishing process of the OneUptime Terraform provider to the Terraform Registry.
- Included functionalities for version specification, testing mode, dependency installation, provider generation, GitHub repository interaction, release creation, and asset uploading.
- Added error handling, prerequisite validation, and detailed logging for better user experience.
- Integrated GPG signing for release assets and SHA256 checksum generation.
- Provided usage instructions and examples for ease of use.

.github/workflows/build.yml

@@ -255,6 +255,21 @@ jobs:
       - name: build docker image
         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:

.github/workflows/codeql-analysis.yml

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

.github/workflows/compile.yml

@@ -217,6 +217,18 @@ jobs:
       - run: cd Common && npm install
       - 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:

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

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

.github/workflows/release.yml

@@ -613,6 +613,69 @@ jobs:
             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
@@ -1236,8 +1299,6 @@ jobs:
   
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
       
@@ -1321,8 +1382,6 @@ jobs:
         
   docs-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1388,8 +1447,6 @@ jobs:
 
   worker-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1455,8 +1512,6 @@ jobs:
   
   workflow-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1518,13 +1573,71 @@ jobs:
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
             
   
-  
+
+  publish-terraform-provider:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number]
+    env: 
+      CI_PIPELINE_ID: ${{github.run_number}}
+      GITHUB_TOKEN: ${{ secrets.SIMLARSEN_GITHUB_PAT }}
+      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY: ${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+          cache: 'npm'
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          install-only: true
+
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing Terraform provider version: $VERSION"
+
+      - name: Install dependencies
+        run: |
+          npm install
+          if [ -d "Common" ]; then cd Common && npm install && cd ..; fi
+          if [ -d "Scripts" ]; then cd Scripts && npm install && cd ..; fi
+
+      - name:  Import GPG key
+        run: |
+          echo '${{ secrets.GPG_PRIVATE_KEY }}' > private.key
+          gpg --import private.key || true
+          rm private.key
+          echo "GPG key imported successfully"
+          gpg --export-secret-keys >~/.gnupg/secring.gpg 
+          echo "GPG key exported successfully"
+
+      - name: Generate Terraform provider
+        run: npm run publish-terraform-provider -- --version "${{ steps.version.outputs.version }}" --github-token "${{ secrets.SIMLARSEN_GITHUB_PAT }}" --github-repo-deploy-key "${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}"
+
   
 
   api-reference-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1590,7 +1703,7 @@ jobs:
 
   test-e2e-release-saas: 
     runs-on: ubuntu-latest
-    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, 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]
+    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:
@@ -1643,7 +1756,7 @@ jobs:
   test-e2e-release-self-hosted: 
     runs-on: ubuntu-latest
     # After all the jobs runs
-    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, 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:
@@ -1761,4 +1874,3 @@ jobs:
           prerelease: false
           tag_name: 7.0.${{needs.generate-build-number.outputs.build_number}}
 
-

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

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

.github/workflows/test-release.yaml

@@ -23,10 +23,71 @@ jobs:
         token: ${{secrets.github_token}}
     - run: echo "Build number is ${{ steps.buildnumber.outputs.build_number }}"
 
+
+  publish-terraform-provider:
+    runs-on: ubuntu-latest
+    needs: [generate-build-number]
+    env: 
+      CI_PIPELINE_ID: ${{github.run_number}}
+      GITHUB_TOKEN: ${{ secrets.SIMLARSEN_GITHUB_PAT }}
+      GPG_PRIVATE_KEY: ${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}
+      TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY: ${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}
+    permissions:
+      contents: write  # For creating releases
+      packages: write  # For publishing packages
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for changelog generation
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+          cache: 'npm'
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: true
+
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          install-only: true
+
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="7.0.${{needs.generate-build-number.outputs.build_number}}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing Terraform provider version: $VERSION"
+
+      - name: Install dependencies
+        run: |
+          npm install
+          if [ -d "Common" ]; then cd Common && npm install && cd ..; fi
+          if [ -d "Scripts" ]; then cd Scripts && npm install && cd ..; fi
+
+      - name:  Import GPG key
+        run: |
+          echo '${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}' > private.key
+          gpg --import private.key || true
+          rm private.key
+          echo "GPG key imported successfully"
+          gpg --export-secret-keys >~/.gnupg/secring.gpg 
+          echo "GPG key exported successfully"
+
+      - name: Generate Terraform provider
+        run: npm run publish-terraform-provider -- --version "${{ steps.version.outputs.version }}" --github-token "${{ secrets.SIMLARSEN_GITHUB_PAT }}" --github-repo-deploy-key "${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}"
+
+  
+
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -664,6 +725,72 @@ jobs:
             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
@@ -1530,7 +1657,7 @@ jobs:
 
   test-helm-chart:
     runs-on: ubuntu-latest
-    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, 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]
+    needs: [infrastructure-agent-deploy, llm-docker-image-deploy, publish-terraform-provider, open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, 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:

.gitignore

@@ -112,3 +112,13 @@ App/greenlock/greenlock.d/config.json
 App/greenlock/greenlock.d/config.json.bak
 Examples/otel-dotnet/bin/Debug/net6.0/Grpc.Core.Api.dll.txt
 InfrastructureAgent/oneuptime-infrastructure-agent
+
+# ESLint cache
+.eslintcache*
+
+# Terraform generated files
+openapi.json
+
+Terraform/**
+
+terraform-provider-example/** 

.vscode/launch.json

@@ -175,6 +175,20 @@
             "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",

APIReference/CodeExamples/DataTypes/GreaterThanOrNull.md

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

APIReference/CodeExamples/DataTypes/LessThanOrNull.md

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

APIReference/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM 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/Routes.ts

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

APIReference/Service/Authentication.ts

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

APIReference/Service/DataType.ts

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

APIReference/Service/Errors.ts

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

APIReference/Service/Introduction.ts

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

APIReference/Service/Model.ts

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

APIReference/Service/OpenAPI.ts

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

APIReference/Service/PageNotFound.ts

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

APIReference/Service/Pagination.ts

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

APIReference/Service/Permissions.ts

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

APIReference/Service/Status.ts

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

APIReference/package.json

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

APIReference/views/main/authentication.ejs

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

APIReference/views/main/openapi.ejs

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

APIReference/views/pages/index.ejs

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

APIReference/views/partials/head.ejs

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

APIReference/views/partials/nav.ejs

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

Accounts/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM 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
@@ -69,12 +69,11 @@ RUN npm install
 #   - 3003:  accounts
 EXPOSE 3003
 
-RUN npm i -D webpack-cli
+
 
 {{ if eq .Env.ENVIRONMENT "development" }}
-RUN mkdir /usr/src/app/dev-env
-RUN touch /usr/src/app/dev-env/.env
-RUN npm i -D webpack-dev-server
+
+
 
 #Run the app
 CMD [ "npm", "run", "dev" ]

Accounts/README.md

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

Accounts/Serve.ts

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

Accounts/esbuild.config.js

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

Accounts/nodemon.json

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

Accounts/package.json

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

Accounts/src/App.tsx

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

Accounts/src/Index.tsx

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

Accounts/src/Pages/Forbidden.tsx

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

Accounts/src/Pages/ForgotPassword.tsx

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

Accounts/src/Pages/Login.tsx

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

Accounts/src/Pages/LoginWithSSO.tsx

@@ -196,6 +196,7 @@ const LoginPage: () => JSX.Element = () => {
                 required: true,
                 title: "Email",
                 dataTestId: "email",
+                disableSpellCheck: true,
               },
             ]}
             maxPrimaryButtonWidth={true}

Accounts/src/Pages/Register.tsx

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

Accounts/src/Pages/ResetPassword.tsx

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

Accounts/views/index.ejs

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

Accounts/webpack.config.js

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

AdminDashboard/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM 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
@@ -67,13 +67,12 @@ RUN npm install
 #   - 3158:  AdminDashboard
 EXPOSE 3158
 
-RUN npm i -D webpack-cli
+
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
-RUN mkdir /usr/src/app/dev-env
-RUN touch /usr/src/app/dev-env/.env
-RUN npm i -D webpack-dev-server
+
+
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source

AdminDashboard/README.md

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

AdminDashboard/Serve.ts

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

AdminDashboard/esbuild.config.js

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

AdminDashboard/nodemon.json

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

AdminDashboard/package.json

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

AdminDashboard/src/Components/Header/Logo.tsx

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

AdminDashboard/src/Index.tsx

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

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -16,7 +16,7 @@ const Logout: FunctionComponent = (): ReactElement => {
 
   const logout: PromiseVoidFunction = async (): Promise<void> => {
     UiAnalytics.logout();
-    await UserUtil.logout();
+    UserUtil.logout();
     Navigation.navigate(ACCOUNTS_URL);
   };
 

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -243,6 +243,7 @@ const Projects: FunctionComponent = (): ReactElement => {
             type: FieldType.DateTime,
           },
         ]}
+        userPreferencesKey="admin-projects-table"
       />
     </Page>
   );

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

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

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

@@ -106,6 +106,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             title: "Admin Notification Email",
             fieldType: FormFieldSchemaType.Email,
             required: false,
+            disableSpellCheck: true,
           },
         ]}
         modelDetailProps={{
@@ -199,6 +200,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.Hostname,
               required: true,
               placeholder: "smtp.server.com",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -229,6 +231,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.Text,
               required: false,
               placeholder: "emailuser",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -239,6 +242,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               fieldType: FormFieldSchemaType.EncryptedText,
               required: false,
               placeholder: "Password",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -251,6 +255,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description:
                 "Email used to log in to this SMTP Server. This is also the email your customers will see. ",
               placeholder: "email@company.com",
+              disableSpellCheck: true,
             },
             {
               field: {
@@ -263,6 +268,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description:
                 "This is the display name your team and customers see, when they receive emails from OneUptime.",
               placeholder: "Company, Inc.",
+              disableSpellCheck: true,
             },
           ]}
           modelDetailProps={{

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

@@ -57,6 +57,7 @@ const Settings: FunctionComponent = (): ReactElement => {
       />
 
       <ModelTable<Probe>
+        userPreferencesKey={"admin-probes-table"}
         modelType={Probe}
         id="probes-table"
         name="Settings > Global Probes"
@@ -151,7 +152,7 @@ const Settings: FunctionComponent = (): ReactElement => {
               description: true,
             },
             title: "Description",
-            type: FieldType.Text,
+            type: FieldType.LongText,
           },
         ]}
         columns={[
@@ -172,7 +173,7 @@ const Settings: FunctionComponent = (): ReactElement => {
             },
             noValueMessage: "-",
             title: "Description",
-            type: FieldType.Text,
+            type: FieldType.LongText,
           },
           {
             field: {

AdminDashboard/src/Pages/Users/Index.tsx

@@ -26,6 +26,7 @@ const Users: FunctionComponent = (): ReactElement => {
     >
       <ModelTable<User>
         modelType={User}
+        userPreferencesKey="admin-users-table"
         id="users-table"
         isDeleteable={false}
         isEditable={false}
@@ -47,6 +48,7 @@ const Users: FunctionComponent = (): ReactElement => {
             fieldType: FormFieldSchemaType.Email,
             required: true,
             placeholder: "email@company.com",
+            disableSpellCheck: true,
           },
           {
             field: {
@@ -56,6 +58,7 @@ const Users: FunctionComponent = (): ReactElement => {
             fieldType: FormFieldSchemaType.Password,
             required: true,
             placeholder: "Password",
+            disableSpellCheck: true,
           },
           {
             field: {

AdminDashboard/views/index.ejs

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

AdminDashboard/webpack.config.js

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

App/Dockerfile.tpl

@@ -3,7 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM 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

@@ -16,8 +16,10 @@ import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
 
 // Import API
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
+import MonitorAPI from "Common/Server/API/MonitorAPI";
 import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
 import StatusPageAPI from "Common/Server/API/StatusPageAPI";
+import WorkspaceNotificationRuleAPI from "Common/Server/API/WorkspaceNotificationRuleAPI";
 import StatusPageDomainAPI from "Common/Server/API/StatusPageDomainAPI";
 import StatusPageSubscriberAPI from "Common/Server/API/StatusPageSubscriberAPI";
 import UserCallAPI from "Common/Server/API/UserCallAPI";
@@ -168,15 +170,17 @@ import MonitorProbeService, {
 import MonitorSecretService, {
   Service as MonitorSecretServiceType,
 } from "Common/Server/Services/MonitorSecretService";
-import MonitorService, {
-  Service as MonitorServiceType,
-} from "Common/Server/Services/MonitorService";
 import MonitorStatusService, {
   Service as MonitorStatusServiceType,
 } from "Common/Server/Services/MonitorStatusService";
 import MonitorTimelineStatusService, {
   Service as MonitorTimelineStatusServiceType,
 } from "Common/Server/Services/MonitorStatusTimelineService";
+// user override
+import OnCallDutyPolicyUserOverrideService, {
+  Service as OnCallDutyPolicyUserOverrideServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyUserOverrideService";
+import OnCallDutyPolicyUserOverride from "Common/Models/DatabaseModels/OnCallDutyPolicyUserOverride";
 import OnCallDutyPolicyCustomFieldService, {
   Service as OnCallDutyPolicyCustomFieldServiceType,
 } from "Common/Server/Services/OnCallDutyPolicyCustomFieldService";
@@ -207,9 +211,6 @@ import OnCallDutyPolicyScheduleLayerUserService, {
 import OnCallDutyPolicyScheduleService, {
   Service as OnCallDutyPolicyScheduleServiceType,
 } from "Common/Server/Services/OnCallDutyPolicyScheduleService";
-import OnCallDutyPolicyService, {
-  Service as OnCallDutyPolicyServiceType,
-} from "Common/Server/Services/OnCallDutyPolicyService";
 import ProjectCallSMSConfigService, {
   Service as ProjectCallSMSConfigServiceType,
 } from "Common/Server/Services/ProjectCallSMSConfigService";
@@ -407,7 +408,6 @@ import IncidentTemplateOwnerTeam from "Common/Models/DatabaseModels/IncidentTemp
 import IncidentTemplateOwnerUser from "Common/Models/DatabaseModels/IncidentTemplateOwnerUser";
 
 import Label from "Common/Models/DatabaseModels/Label";
-import Monitor from "Common/Models/DatabaseModels/Monitor";
 import MonitorCustomField from "Common/Models/DatabaseModels/MonitorCustomField";
 import MonitorGroupOwnerTeam from "Common/Models/DatabaseModels/MonitorGroupOwnerTeam";
 import MonitorGroupOwnerUser from "Common/Models/DatabaseModels/MonitorGroupOwnerUser";
@@ -418,7 +418,6 @@ import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe";
 import MonitorSecret from "Common/Models/DatabaseModels/MonitorSecret";
 import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus";
 import MonitorTimelineStatus from "Common/Models/DatabaseModels/MonitorStatusTimeline";
-import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy";
 import OnCallDutyPolicyCustomField from "Common/Models/DatabaseModels/OnCallDutyPolicyCustomField";
 import OnCallDutyPolicyEscalationRule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicyEscalationRuleSchedule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule";
@@ -530,10 +529,61 @@ import WorkspaceSettingService, {
   Service as WorkspaceSettingServiceType,
 } from "Common/Server/Services/WorkspaceSettingService";
 
-import WorkspaceNotificationRule from "Common/Models/DatabaseModels/WorkspaceNotificationRule";
-import WorkspaceNotificationRuleService, {
-  Service as WorkspaceNotificationRuleServiceType,
-} from "Common/Server/Services/WorkspaceNotificationRuleService";
+import ProjectUser from "Common/Models/DatabaseModels/ProjectUser";
+import ProjectUserService, {
+  Service as ProjectUserServiceType,
+} from "Common/Server/Services/ProjectUserService";
+
+import MonitorFeed from "Common/Models/DatabaseModels/MonitorFeed";
+import MonitorFeedService, {
+  Service as MonitorFeedServiceType,
+} from "Common/Server/Services/MonitorFeedService";
+
+// MetricType.
+import MetricTypeService, {
+  Service as MetricTypeServiceType,
+} from "Common/Server/Services/MetricTypeService";
+import MetricType from "Common/Models/DatabaseModels/MetricType";
+
+import OnCallDutyPolicyAPI from "Common/Server/API/OnCallDutyPolicyAPI";
+
+// OnCallDutyPolicyOwnerTeam
+// OnCallDutyPolicyOwnerUser
+// OnCallDutyPolicyFeed
+
+import OnCallDutyPolicyFeed from "Common/Models/DatabaseModels/OnCallDutyPolicyFeed";
+import OnCallDutyPolicyFeedService, {
+  Service as OnCallDutyPolicyFeedServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyFeedService";
+
+import OnCallDutyPolicyOwnerTeam from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerTeam";
+import OnCallDutyPolicyOwnerTeamService, {
+  Service as OnCallDutyPolicyOwnerTeamServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyOwnerTeamService";
+
+import OnCallDutyPolicyOwnerUser from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerUser";
+import OnCallDutyPolicyOwnerUserService, {
+  Service as OnCallDutyPolicyOwnerUserServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyOwnerUserService";
+import MonitorLog from "Common/Models/AnalyticsModels/MonitorLog";
+import MonitorLogService, {
+  Service as MonitorLogServiceType,
+} from "Common/Server/Services/MonitorLogService";
+
+//OnCallDutyPolicyTimeLog
+import OnCallDutyPolicyTimeLog from "Common/Models/DatabaseModels/OnCallDutyPolicyTimeLog";
+import OnCallDutyPolicyTimeLogService, {
+  Service as OnCallDutyPolicyTimeLogServiceType,
+} from "Common/Server/Services/OnCallDutyPolicyTimeLogService";
+
+// statu spage announcement templates
+import StatusPageAnnouncementTemplate from "Common/Models/DatabaseModels/StatusPageAnnouncementTemplate";
+import StatusPageAnnouncementTemplateService, {
+  Service as StatusPageAnnouncementTemplateServiceType,
+} from "Common/Server/Services/StatusPageAnnouncementTemplateService";
+
+// Open API Spec
+import OpenAPI from "Common/Server/API/OpenAPI";
 
 const BaseAPIFeatureSet: FeatureSet = {
   init: async (): Promise<void> => {
@@ -549,6 +599,16 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, OpenAPI.getRouter());
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAnalyticsAPI<MonitorLog, MonitorLogServiceType>(
+        MonitorLog,
+        MonitorLogService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<AlertState, AlertStateServiceType>(
@@ -557,16 +617,75 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    // notification rule
-
+    // status page announcement templates
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<
-        WorkspaceNotificationRule,
-        WorkspaceNotificationRuleServiceType
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateServiceType
       >(
-        WorkspaceNotificationRule,
-        WorkspaceNotificationRuleService,
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateService,
+      ).getRouter(),
+    );
+
+    // OnCallDutyPolicyTimeLogService
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<OnCallDutyPolicyTimeLog, OnCallDutyPolicyTimeLogServiceType>(
+        OnCallDutyPolicyTimeLog,
+        OnCallDutyPolicyTimeLogService,
+      ).getRouter(),
+    );
+
+    // on-call policy owner user.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyOwnerUser,
+        OnCallDutyPolicyOwnerUserServiceType
+      >(
+        OnCallDutyPolicyOwnerUser,
+        OnCallDutyPolicyOwnerUserService,
+      ).getRouter(),
+    );
+
+    // on-call policy owner team.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyOwnerTeam,
+        OnCallDutyPolicyOwnerTeamServiceType
+      >(
+        OnCallDutyPolicyOwnerTeam,
+        OnCallDutyPolicyOwnerTeamService,
+      ).getRouter(),
+    );
+
+    // on-call policy feed.
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<OnCallDutyPolicyFeed, OnCallDutyPolicyFeedServiceType>(
+        OnCallDutyPolicyFeed,
+        OnCallDutyPolicyFeedService,
+      ).getRouter(),
+    );
+
+    // monitor feed
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MonitorFeed, MonitorFeedServiceType>(
+        MonitorFeed,
+        MonitorFeedService,
+      ).getRouter(),
+    );
+
+    // MetricType
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<MetricType, MetricTypeServiceType>(
+        MetricType,
+        MetricTypeService,
       ).getRouter(),
     );
 
@@ -578,6 +697,14 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectUser, ProjectUserServiceType>(
+        ProjectUser,
+        ProjectUserService,
+      ).getRouter(),
+    );
+
     //service provider setting
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -595,6 +722,18 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    // user override
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        OnCallDutyPolicyUserOverride,
+        OnCallDutyPolicyUserOverrideServiceType
+      >(
+        OnCallDutyPolicyUserOverride,
+        OnCallDutyPolicyUserOverrideService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<AlertFeed, AlertFeedServiceType>(
@@ -1356,14 +1495,6 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<Monitor, MonitorServiceType>(
-        Monitor,
-        MonitorService,
-      ).getRouter(),
-    );
-
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<SmsLog, SmsLogServiceType>(SmsLog, SmsLogService).getRouter(),
@@ -1410,10 +1541,22 @@ const BaseAPIFeatureSet: FeatureSet = {
     );
 
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ShortLinkAPI().getRouter());
+    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new MonitorAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new StatusPageAPI().getRouter(),
     );
+
+    // OnCallDutyPolicyAPI
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new OnCallDutyPolicyAPI().getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new WorkspaceNotificationRuleAPI().getRouter(),
+    );
     app.use(`/${APP_NAME.toLocaleLowerCase()}`, new FileAPI().getRouter());
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1522,14 +1665,6 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<OnCallDutyPolicy, OnCallDutyPolicyServiceType>(
-        OnCallDutyPolicy,
-        OnCallDutyPolicyService,
-      ).getRouter(),
-    );
-
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAPI<

App/FeatureSet/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/ManageExistingStatusPageSubscriberSubscription.hbs

@@ -0,0 +1,15 @@
+{{> Start this}}
+
+{{> CustomLogo this}}
+{{> EmailTitle title=(concat statusPageName " - Manage Subscription" ) }}
+
+{{> InfoBlock info="Please click on the link below to manage or unsubscribe from status page notifications."}}
+
+{{> ButtonBlock buttonUrl=manageSubscriptionUrl buttonText="Manage Subscription"}} 
+
+{{> InfoBlock info="You can also view the status page by visiting this link:"}}
+{{> InfoBlock info=statusPageUrl}}
+
+{{> VerticalSpace this}}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/ProjectSubscriptionOverdue.hbs

@@ -0,0 +1,28 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=("Your OneUptime Project Subscription is overdue") }}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="Project Name:" text=projectName }}
+{{> DetailBoxField title="Project ID:" text=projectId }}
+{{> DetailBoxField title="Subscription Status:" text="Overdue" }}
+{{> DetailBoxField title="Details:" text="Some of your invoices are unpaid. Please pay the invoices to avoid deactivation of this project." }}
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can pay the outstanding invoices by clicking on the link below - "}}
+
+{{> ButtonBlock buttonUrl=dashboardLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=dashboardLink}}
+
+{{> InfoBlock info="You have been sent this email because you are the owner of this project."}}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/SubscriberIncidentStateChanged.hbs

@@ -10,8 +10,6 @@
 {{> DetailBoxField title="Resources Affected: " text=resourcesAffected  }}
 {{> DetailBoxField title="Severity: " text=incidentSeverity  }}
 {{> DetailBoxField title="State: " text=incidentState  }}
-{{> DetailBoxField title="Description: " text=""  }}
-{{> DetailBoxField title="" text=incidentDescription  }}
 {{> DetailBoxEnd this }}
 
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}

App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventStateChanged.hbs

@@ -15,8 +15,6 @@
 {{#if resourcesAffected}}
 {{> DetailBoxField title="Resources Affected: " text=resourcesAffected  }}
 {{/if}}
-{{> DetailBoxField title="Event Description: " text=""  }}
-{{> DetailBoxField title="" text=eventDescription  }}
 {{> DetailBoxEnd this }}
 
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}

App/FeatureSet/Notification/Templates/UserAddedToOnCallPolicy.hbs

@@ -0,0 +1,34 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "You have been ADDED to On-Call Policy: " onCallPolicyName) }}
+
+{{> InfoBlock info=description}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="On Call Policy:" text=onCallPolicyName }}
+{{> DetailBoxField title="Escalation Rule: " text=escalationRuleName  }}
+{{> DetailBoxField title="Escalation Order: " text=escalationRuleOrder  }}
+{{> DetailBoxField title="More Information:" text=reason  }}
+
+
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this on-call policy by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=onCallPolicyViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=onCallPolicyViewLink}}
+
+{{> InfoBlock info="You will be notified when your on-call status changes."}}
+
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/UserCurrentlyOnOnCallRoster.hbs

@@ -0,0 +1,36 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "You are CURRENTLY ON-CALL for this policy: " onCallPolicyName) }}
+
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="On Call Policy:" text=onCallPolicyName }}
+{{> DetailBoxField title="Escalation Rule: " text=escalationRuleName  }}
+{{> DetailBoxField title="Escalation Order: " text=escalationRuleOrder  }}
+{{> DetailBoxField title="More Information:" text=reason  }}
+{{> DetailBoxField title="Your On-Call Roster Starts At: " text=rosterStartsAt  }}
+{{> DetailBoxField title="Your On-Call Roster Ends At: " text=rosterEndsAt  }}
+
+
+
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this on-call policy by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=onCallPolicyViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=onCallPolicyViewLink}}
+
+{{> InfoBlock info="You will be notified when your on-call status changes."}}
+
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/UserNextOnOnCallRoster.hbs

@@ -0,0 +1,37 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "You are NEXT ON-CALL for this policy: " onCallPolicyName) }}
+
+{{> InfoBlock info=description}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="On Call Policy:" text=onCallPolicyName }}
+{{> DetailBoxField title="Escalation Rule: " text=escalationRuleName  }}
+{{> DetailBoxField title="Escalation Order: " text=escalationRuleOrder  }}
+{{> DetailBoxField title="More Information:" text=reason  }}
+{{> DetailBoxField title="Your On-Call Roster Starts At: " text=rosterStartsAt  }}
+{{> DetailBoxField title="Your On-Call Roster Ends At: " text=rosterEndsAt  }}
+
+
+
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this on-call policy by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=onCallPolicyViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=onCallPolicyViewLink}}
+
+{{> InfoBlock info="You will be notified when your on-call status changes."}}
+
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/UserNoLongerActiveOnOnCallRoster.hbs

@@ -0,0 +1,33 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "Your on-call roster has ENDED for this policy: " onCallPolicyName) }}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="On Call Policy:" text=onCallPolicyName }}
+{{> DetailBoxField title="Escalation Rule: " text=escalationRuleName  }}
+{{> DetailBoxField title="Escalation Order: " text=escalationRuleOrder  }}
+{{> DetailBoxField title="More Information:" text=reason  }}
+{{> DetailBoxField title="Your On-Call Roster Started At: " text=rosterStartsAt  }}
+{{> DetailBoxField title="Your On-Call Roster Ended At: " text=rosterEndsAt  }}
+
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this on-call policy by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=onCallPolicyViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=onCallPolicyViewLink}}
+
+{{> InfoBlock info="You will be notified when your on-call status changes."}}
+
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/FeatureSet/Notification/Templates/UserRemovedFromOnCallPolicy.hbs

@@ -0,0 +1,34 @@
+{{> Start this}}
+
+
+{{> Logo this}}
+{{> EmailTitle title=(concat "You have been REMOVED from On-Call Policy: " onCallPolicyName) }}
+
+{{> InfoBlock info=description}}
+
+{{> InfoBlock info="Here are the details: "}}
+
+{{> DetailBoxStart this }}
+{{> DetailBoxField title="On Call Policy:" text=onCallPolicyName }}
+{{> DetailBoxField title="Escalation Rule: " text=escalationRuleName  }}
+{{> DetailBoxField title="Escalation Order: " text=escalationRuleOrder  }}
+{{> DetailBoxField title="More Information:" text=reason  }}
+
+
+{{> DetailBoxEnd this }}
+
+
+{{> InfoBlock info="You can view this on-call policy by clicking on the button below - "}}
+
+{{> ButtonBlock buttonUrl=onCallPolicyViewLink buttonText="View on Dashboard"}}
+
+{{> InfoBlock info="You can also copy and paste this link:"}}
+{{> InfoBlock info=onCallPolicyViewLink}}
+
+{{> InfoBlock info="You will be notified when your on-call status changes."}}
+
+{{> UnsubscribeOwnerEmail this }}
+
+{{> Footer this }}
+
+{{> End this}}

App/Index.ts

@@ -12,6 +12,7 @@ import Realtime from "Common/Server/Utils/Realtime";
 import App from "Common/Server/Utils/StartServer";
 import Telemetry from "Common/Server/Utils/Telemetry";
 import "ejs";
+import OpenAPIUtil from "Common/Server/Utils/OpenAPI";
 
 const APP_NAME: string = "api";
 
@@ -96,6 +97,9 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
 
     // Add default routes to the app
     await App.addDefaultRoutes();
+
+    // Generate OpenAPI spec (this automatically saves it to cache)
+    OpenAPIUtil.generateOpenAPISpec();
   } catch (err) {
     logger.error("App Init Failed:");
     logger.error(err);

App/package.json

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

Clickhouse/config.xml

@@ -370,7 +370,7 @@
     <concurrent_threads_soft_limit_ratio_to_cores>2</concurrent_threads_soft_limit_ratio_to_cores>
 
     <!-- Maximum number of concurrent queries. -->
-    <max_concurrent_queries>1000</max_concurrent_queries>
+    <max_concurrent_queries>10000</max_concurrent_queries>
 
     <!-- Maximum memory usage (resident set size) for server process.
          Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.

Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -39,6 +39,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     sortKeys: Array<string>; // this should be the subset of tableColumns
     enableWorkflowOn?: EnableWorkflowOn | undefined;
     enableRealtimeEventsOn?: EnableRealtimeEventsOn | undefined;
+    partitionKey: string;
   }) {
     super({
       tableColumns: data.tableColumns,
@@ -138,13 +139,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.enableWorkflowOn = data.enableWorkflowOn;
     this.crudApiPath = data.crudApiPath;
     this.enableRealtimeEventsOn = data.enableRealtimeEventsOn;
-
-    // initialize Arrays.
-    for (const column of this.tableColumns) {
-      if (column.type === TableColumnType.NestedModel) {
-        this.setColumnValue(column.key, []);
-      }
-    }
+    this.partitionKey = data.partitionKey;
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;
@@ -187,6 +182,14 @@ export default class AnalyticsBaseModel extends CommonModel {
     this._primaryKeys = v;
   }
 
+  private _partitionKey: string = "";
+  public get partitionKey(): string {
+    return this._partitionKey;
+  }
+  public set partitionKey(v: string) {
+    this._partitionKey = v;
+  }
+
   private _sortKeys: Array<string> = [];
   public get sortKeys(): Array<string> {
     return this._sortKeys;

Common/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts

@@ -3,10 +3,12 @@ import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
 import GreaterThan from "../../../Types/BaseDatabase/GreaterThan";
 import GreaterThanOrEqual from "../../../Types/BaseDatabase/GreaterThanOrEqual";
+import GreaterThanOrNull from "../../../Types/BaseDatabase/GreaterThanOrNull";
 import InBetween from "../../../Types/BaseDatabase/InBetween";
 import Includes from "../../../Types/BaseDatabase/Includes";
 import LessThan from "../../../Types/BaseDatabase/LessThan";
 import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
+import LessThanOrNull from "../../../Types/BaseDatabase/LessThanOrNull";
 import NotEqual from "../../../Types/BaseDatabase/NotEqual";
 import Search from "../../../Types/BaseDatabase/Search";
 import { CompareType } from "../../../Types/Database/CompareBase";
@@ -31,6 +33,8 @@ export type RecordValue =
   | LessThan<CompareType>
   | LessThanOrEqual<CompareType>
   | GreaterThanOrEqual<CompareType>
+  | GreaterThanOrNull<CompareType>
+  | LessThanOrNull<CompareType>
   | Array<number>
   | Array<string>
   | Array<ObjectID>
@@ -72,7 +76,7 @@ export default class CommonModel {
       if (column.type === TableColumnType.JSON && typeof value === "string") {
         try {
           value = JSONFunctions.parse(value);
-        } catch (e) {
+        } catch {
           value = {};
         }
       }
@@ -87,7 +91,7 @@ export default class CommonModel {
           if (!Array.isArray(value)) {
             throw new BadDataException("Not an array");
           }
-        } catch (e) {
+        } catch {
           value = [];
         }
       }
@@ -203,19 +207,6 @@ export default class CommonModel {
         return;
       }
 
-      if (recordValue instanceof Array) {
-        if (recordValue.length > 0 && column.nestedModelType) {
-          json[column.key] = CommonModel.toJSONArray(
-            recordValue as Array<CommonModel>,
-            column.nestedModelType,
-          );
-        } else {
-          json[column.key] = recordValue;
-        }
-
-        return;
-      }
-
       json[column.key] = recordValue;
     });
 

Common/Models/AnalyticsModels/AnalyticsBaseModel/NestedModel.ts

@@ -1,8 +0,0 @@
-import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
-import CommonModel from "./CommonModel";
-
-export default class NestedModel extends CommonModel {
-  public constructor(data: { tableColumns: Array<AnalyticsTableColumn> }) {
-    super(data);
-  }
-}

Common/Models/AnalyticsModels/ExceptionInstance.ts

@@ -10,10 +10,10 @@ import { SpanStatus } from "./Span";
 export default class ExceptionInstance extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "ExceptionInstanceTelemetry",
+      tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
-      singularName: "Exception",
-      pluralName: "Exceptions",
+      singularName: "Exception Instance",
+      pluralName: "Exception Instances",
       enableRealtimeEventsOn: {
         create: true,
       },
@@ -369,8 +369,9 @@ 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"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

Common/Models/AnalyticsModels/Index.ts

@@ -4,6 +4,7 @@ import Metric from "./Metric";
 import Span from "./Span";
 import TelemetryAttribute from "./TelemetryAttribute";
 import ExceptionInstance from "./ExceptionInstance";
+import MonitorLog from "./MonitorLog";
 
 const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   Log,
@@ -11,6 +12,7 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   Metric,
   TelemetryAttribute,
   ExceptionInstance,
+  MonitorLog,
 ];
 
 const modelTypeMap: { [key: string]: { new (): AnalyticsBaseModel } } = {};

Common/Models/AnalyticsModels/Log.ts

@@ -11,12 +11,9 @@ 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: {
-        create: true,
-      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -278,8 +275,9 @@ export default class Log extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "time"],
-      primaryKeys: ["projectId", "serviceId"],
+      sortKeys: ["projectId", "time", "serviceId"],
+      primaryKeys: ["projectId", "time", "serviceId"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

Common/Models/AnalyticsModels/Metric.ts

@@ -29,7 +29,7 @@ export enum ServiceType {
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
     super({
-      tableName: "MetricTelemetry",
+      tableName: "MetricItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Metric",
       pluralName: "Metrics",
@@ -158,52 +158,6 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
 
-        new AnalyticsTableColumn({
-          key: "description",
-          title: "Description",
-          description: "Description of the Metric",
-          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: [],
-          },
-        }),
-
-        new AnalyticsTableColumn({
-          key: "unit",
-          title: "Unit",
-          description: "Unit of the Metric",
-          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: [],
-          },
-        }),
-
         new AnalyticsTableColumn({
           key: "aggregationTemporality",
           title: "Aggregation Temporality",
@@ -554,8 +508,9 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
       ],
-      sortKeys: ["projectId", "serviceId", "time"],
-      primaryKeys: ["projectId", "serviceId"],
+      sortKeys: ["projectId", "time", "serviceId"],
+      primaryKeys: ["projectId", "time", "serviceId"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 
@@ -603,22 +558,6 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("metricPointType", v);
   }
 
-  public get description(): string | undefined {
-    return this.getColumnValue("description") as string | undefined;
-  }
-
-  public set description(v: string | undefined) {
-    this.setColumnValue("description", v);
-  }
-
-  public get unit(): string | undefined {
-    return this.getColumnValue("unit") as string | undefined;
-  }
-
-  public set unit(v: string | undefined) {
-    this.setColumnValue("unit", v);
-  }
-
   public get isMonotonic(): boolean | undefined {
     return this.getColumnValue("isMonotonic") as boolean | undefined;
   }

Common/Models/AnalyticsModels/MonitorLog.ts

@@ -0,0 +1,173 @@
+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 { JSONObject } from "../../Types/JSON";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+
+export default class MonitorLog extends AnalyticsBaseModel {
+  public constructor() {
+    super({
+      tableName: "MonitorLog",
+      tableEngine: AnalyticsTableEngine.MergeTree,
+      singularName: "Monitor Log",
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadProjectMonitor,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateProjectMonitor,
+        ],
+        update: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.EditProjectMonitor,
+        ],
+        delete: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.DeleteProjectMonitor,
+        ],
+      },
+      pluralName: "Monitor Logs",
+      crudApiPath: new Route("/monitor-log"),
+      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: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "monitorId",
+          title: "Monitor ID",
+          description: "ID of the monitor which this logs belongs to",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "time",
+          title: "Time",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "logBody",
+          title: "Log Body",
+          description: "The body of the log",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+      ],
+      sortKeys: ["projectId", "time", "monitorId"],
+      primaryKeys: ["projectId", "time", "monitorId"],
+      partitionKey: "sipHash64(projectId) % 16",
+    });
+  }
+
+  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 time(): Date | undefined {
+    return this.getColumnValue("time") as Date | undefined;
+  }
+  public set time(v: Date | undefined) {
+    this.setColumnValue("time", v);
+  }
+  public get logBody(): JSONObject | undefined {
+    return this.getColumnValue("logBody") as JSONObject | undefined;
+  }
+  public set logBody(v: JSONObject | undefined) {
+    this.setColumnValue("logBody", v);
+  }
+}

Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts

@@ -1,59 +0,0 @@
-import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
-import NestedModel from "../AnalyticsBaseModel/NestedModel";
-
-export default class KeyValueNestedModel extends NestedModel {
-  public constructor() {
-    super({
-      tableColumns: [
-        new AnalyticsTableColumn({
-          key: "key",
-          title: "Key",
-          description: "Key of the attribute",
-          required: true,
-          type: TableColumnType.Text,
-        }),
-
-        new AnalyticsTableColumn({
-          key: "stringValue",
-          title: "String Value",
-          description: "Key of the attribute",
-          required: false,
-          type: TableColumnType.Text,
-        }),
-
-        new AnalyticsTableColumn({
-          key: "numberValue",
-          title: "Number Value",
-          description: "Value of the attribute",
-          required: false,
-          type: TableColumnType.Number,
-        }),
-      ],
-    });
-  }
-
-  public get key(): string | undefined {
-    return this.getColumnValue("key");
-  }
-
-  public set key(v: string | undefined) {
-    this.setColumnValue("key", v);
-  }
-
-  public get stringValue(): string | undefined {
-    return this.getColumnValue("stringValue");
-  }
-
-  public set stringValue(v: string | undefined) {
-    this.setColumnValue("stringValue", v);
-  }
-
-  public get numberValue(): number | undefined {
-    return this.getColumnValue("numberValue");
-  }
-
-  public set numberValue(v: number | undefined) {
-    this.setColumnValue("numberValue", v);
-  }
-}

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,9 @@ 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"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

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,
@@ -134,6 +134,7 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
       ],
       sortKeys: ["projectId", "telemetryType"],
       primaryKeys: ["projectId", "telemetryType"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 
@@ -153,11 +154,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,7 +36,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import { TelemetryQuery } from "../../Types/Telemetry/TelemetryQuery";
-import { WorkspaceChannel } from "../../Server/Utils/Workspace/WorkspaceBase";
+import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
 @AccessControlColumn("labels")
@@ -217,7 +217,7 @@ export default class Alert extends BaseModel {
     type: TableColumnType.Markdown,
     title: "Description",
     description:
-      "Short description of this alert. This is in markdown and will be visible on the status page.",
+      "Short description of this alert. This will be visible on the status page. This is in markdown.",
   })
   @Column({
     nullable: true,
@@ -1053,5 +1053,6 @@ export default class Alert extends BaseModel {
     type: ColumnType.JSON,
     nullable: true,
   })
-  public postUpdatesToWorkspaceChannels?: Array<WorkspaceChannel> = undefined;
+  public postUpdatesToWorkspaceChannels?: Array<NotificationRuleWorkspaceChannel> =
+    undefined;
 }

Common/Models/DatabaseModels/AlertCustomField.ts

@@ -218,7 +218,7 @@ export default class AlertCustomField extends BaseModel {
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
   })
-  public type?: CustomFieldType = undefined;
+  public customFieldType?: CustomFieldType = undefined;
 
   @ColumnAccessControl({
     create: [

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/BillingPaymentMethod.ts

@@ -234,7 +234,7 @@ export default class BillingPaymentMethod extends BaseModel {
     nullable: false,
     unique: false,
   })
-  public type?: string = undefined;
+  public paymentMethodType?: string = undefined;
 
   @ColumnAccessControl({
     create: [],

Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts

@@ -61,7 +61,7 @@ export default class DatabaseBaseModel extends BaseEntity {
   public _id?: string = undefined;
 
   @TableColumn({
-    title: "Created",
+    title: "Created At",
     type: TableColumnType.Date,
     description: "Date and Time when the object was created.",
   })
@@ -71,7 +71,7 @@ export default class DatabaseBaseModel extends BaseEntity {
   public createdAt?: Date = undefined;
 
   @TableColumn({
-    title: "Updated",
+    title: "Updated At",
     type: TableColumnType.Date,
     description: "Date and Time when the object was updated.",
   })
@@ -81,7 +81,7 @@ export default class DatabaseBaseModel extends BaseEntity {
   public updatedAt?: Date = undefined;
 
   @TableColumn({
-    title: "Deleted",
+    title: "Deleted At",
     type: TableColumnType.Date,
     description: "Date and Time when the object was deleted.",
   })
@@ -92,8 +92,9 @@ export default class DatabaseBaseModel extends BaseEntity {
 
   @TableColumn({
     title: "Version",
-    type: TableColumnType.Version,
+    type: TableColumnType.Number,
     description: "Object version",
+    hideColumnInDocumentation: true,
   })
   @VersionColumn()
   public version?: number = undefined;

Common/Models/DatabaseModels/DatabaseBaseModel/FileModel.ts

@@ -70,7 +70,7 @@ export default class FileModel extends BaseModel {
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
   })
-  public type?: MimeType = undefined;
+  public fileType?: MimeType = undefined;
 
   @ColumnAccessControl({
     create: [Permission.CurrentUser],