feat: Add EnableDocumentation decorator to File model for improved documentation generation

- Enhanced package.json with detailed description, keywords, and repository information.
- Updated scripts for building and starting the server.
- Added new dependencies for axios and dotenv.
- Modified tsconfig.json for improved TypeScript settings.
- Introduced MCPServerGenerator class to automate server file generation.
- Implemented methods to generate essential files: package.json, Index.ts, MCPService, APIClient, configuration utilities, README, tsconfig, nodemon config, and Dockerfile.
- Ensured proper error handling and environment variable validation in the generated code.

.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/mcp-server-generation.yml

@@ -0,0 +1,100 @@
+name: MCP Server Generation
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+  workflow_dispatch: # Allow manual trigger
+
+jobs:
+  generate-mcp-server:
+    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 MCP server
+        run: npm run generate-mcp-server
+
+      - name: Verify MCP server generation
+        run: |
+          MCP_DIR="./MCP"
+          
+          # Check if MCP server directory was created
+          if [ ! -d "$MCP_DIR" ]; then
+            echo "❌ MCP server directory not created"
+            exit 1
+          fi
+          echo "✅ MCP server directory created: $MCP_DIR"
+          
+          # Count generated files
+          TS_FILES=$(find "$MCP_DIR" -name "*.ts" | wc -l)
+          echo "📊 Generated TypeScript files: $TS_FILES"
+          
+          if [ "$TS_FILES" -eq 0 ]; then
+            echo "❌ No TypeScript files were generated"
+            exit 1
+          fi
+          
+          # Check for essential files
+          if [ -f "$MCP_DIR/package.json" ]; then
+            echo "✅ Package.json file created"
+          fi
+          
+          if [ -f "$MCP_DIR/README.md" ]; then
+            echo "✅ Documentation created"
+          fi
+          
+          if [ -f "$MCP_DIR/Index.ts" ]; then
+            echo "✅ Main entry point created"
+          fi
+          
+          # Show directory structure for debugging
+          echo "📁 MCP server directory structure:"
+          ls -la "$MCP_DIR" || true
+
+      - name: Test MCP server build
+        run: |
+          MCP_DIR="./MCP"
+          if [ -d "$MCP_DIR" ] && [ -f "$MCP_DIR/package.json" ]; then
+            cd "$MCP_DIR"
+            echo "🔨 Installing dependencies..."
+            npm install
+            echo "🔨 Testing TypeScript build..."
+            npm run build
+            echo "✅ MCP server build successful"
+            
+            # Show build output
+            echo "📦 Build output:"
+            ls -la build/ || true
+          else
+            echo "⚠️ Cannot test build - missing package.json or MCP server directory"
+          fi
+
+      - name: Upload MCP server as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: MCP
+          path: ./MCP/
+          retention-days: 30

.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/publish-mcp-server.yml

@@ -0,0 +1,248 @@
+name: Publish MCP Server
+
+on:
+  push:
+    branches:
+      - main
+      - master
+    paths:
+      - 'Common/**'
+      - 'Scripts/MCPProvider/**'
+      - 'Scripts/OpenAPI/**'
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (e.g., 1.0.0)'
+        required: true
+        type: string
+      dry_run:
+        description: 'Run in dry-run mode (no actual publishing)'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  publish-mcp-server:
+    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'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Common dependencies
+        run: cd Common && npm install
+
+      - name: Install root dependencies
+        run: npm install
+
+      - name: Install Script dependencies
+        run: cd Scripts && npm install
+
+      - name: Determine version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            VERSION="${{ github.event.inputs.version }}"
+          elif [ "${{ github.event_name }}" = "release" ]; then
+            VERSION="${{ github.event.release.tag_name }}"
+            # Remove 'v' prefix if present
+            VERSION=${VERSION#v}
+            # Extract version if it's mcp-v1.0.0 format
+            if [[ $VERSION == mcp-* ]]; then
+              VERSION=${VERSION#mcp-v}
+            fi
+          else
+            # For push events, generate a pre-release version
+            VERSION="0.0.0-dev.${GITHUB_SHA:0:7}"
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Publishing version: $VERSION"
+
+      - name: Generate MCP server
+        run: npm run generate-mcp-server
+
+      - name: Verify MCP server generation
+        run: |
+          MCP_DIR="./MCP"
+          
+          if [ ! -d "$MCP_DIR" ]; then
+            echo "❌ MCP server directory not created"
+            exit 1
+          fi
+          
+          echo "✅ MCP server generated successfully"
+          echo "📊 Generated files:"
+          find "$MCP_DIR" -type f -name "*.ts" -o -name "*.js" -o -name "*.json" | wc -l
+          echo "📁 Directory structure:"
+          ls -la "$MCP_DIR"
+
+      - name: Update package version
+        run: |
+          cd MCP
+          npm version ${{ steps.version.outputs.version }} --no-git-tag-version
+
+      - name: Install dependencies and build
+        run: |
+          cd MCP
+          npm install
+          npm run build
+
+      - name: Run tests
+        run: |
+          cd MCP
+          npm test || echo "No tests found or tests failed, continuing..."
+
+      - name: Publish to npm (dry run)
+        if: ${{ github.event.inputs.dry_run == 'true' || github.event_name == 'push' }}
+        run: |
+          cd MCP
+          npm pack --dry-run
+          echo "✅ Dry run completed successfully"
+
+      - name: Publish to npm
+        if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
+        run: |
+          cd MCP
+          npm publish --access public
+          echo "✅ Published @oneuptime/mcp-server@${{ steps.version.outputs.version }} to npm"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Create Docker image
+        if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
+        run: |
+          cd MCP
+          docker build -t oneuptime/mcp-server:${{ steps.version.outputs.version }} .
+          docker tag oneuptime/mcp-server:${{ steps.version.outputs.version }} oneuptime/mcp-server:latest
+          echo "✅ Created Docker image"
+
+      - name: Login to Docker Hub
+        if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Push Docker image
+        if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
+        run: |
+          docker push oneuptime/mcp-server:${{ steps.version.outputs.version }}
+          docker push oneuptime/mcp-server:latest
+          echo "✅ Pushed Docker images to Docker Hub"
+
+      - name: Upload MCP server artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcp-server-${{ steps.version.outputs.version }}
+          path: ./MCP/
+          retention-days: 90
+
+      - name: Create GitHub Release Assets
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          cd MCP
+          npm pack
+          PACKAGE_FILE=$(ls *.tgz)
+          mv "$PACKAGE_FILE" "../oneuptime-mcp-server-${{ steps.version.outputs.version }}.tgz"
+
+      - name: Upload Release Assets
+        if: ${{ github.event_name == 'release' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./oneuptime-mcp-server-${{ steps.version.outputs.version }}.tgz
+          asset_name: oneuptime-mcp-server-${{ steps.version.outputs.version }}.tgz
+          asset_content_type: application/gzip
+
+      - name: Update release notes
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          # Count generated tools
+          TOOL_COUNT=$(grep -c "server.tool(" MCP/Service/MCP.ts || echo "0")
+          
+          # Create enhanced release notes
+          cat > enhanced-release-notes.md << EOF
+          # OneUptime MCP Server v${{ steps.version.outputs.version }}
+
+          ## What's New
+
+          This release includes the OneUptime Model Context Protocol (MCP) Server, automatically generated from the OneUptime OpenAPI specification.
+
+          ### 🚀 Features
+          - **$TOOL_COUNT MCP Tools**: Complete API coverage for OneUptime operations
+          - **Type-safe**: Full TypeScript support with comprehensive type definitions
+          - **Docker Support**: Available as \`oneuptime/mcp-server:${{ steps.version.outputs.version }}\`
+          - **NPM Package**: Install with \`npm install -g @oneuptime/mcp-server@${{ steps.version.outputs.version }}\`
+
+          ### 📦 Installation Options
+
+          #### NPM
+          \`\`\`bash
+          npm install -g @oneuptime/mcp-server@${{ steps.version.outputs.version }}
+          \`\`\`
+
+          #### Docker
+          \`\`\`bash
+          docker run -e ONEUPTIME_API_KEY=your-key oneuptime/mcp-server:${{ steps.version.outputs.version }}
+          \`\`\`
+
+          #### Download Package
+          Download the attached \`oneuptime-mcp-server-${{ steps.version.outputs.version }}.tgz\` file.
+
+          ### 🔧 Quick Start
+
+          1. Set your OneUptime API key:
+             \`\`\`bash
+             export ONEUPTIME_API_KEY=your-api-key-here
+             \`\`\`
+
+          2. Run the MCP server:
+             \`\`\`bash
+             oneuptime-mcp
+             \`\`\`
+
+          ### 📚 Documentation
+
+          For detailed usage instructions, API documentation, and examples, see the [README](https://github.com/OneUptime/oneuptime/blob/main/MCP/README.md).
+
+          ### 🔗 Links
+
+          - **NPM Package**: https://www.npmjs.com/package/@oneuptime/mcp-server
+          - **Docker Hub**: https://hub.docker.com/r/oneuptime/mcp-server
+          - **Documentation**: https://oneuptime.com/docs/
+          EOF
+
+          echo "Enhanced release notes created"
+
+      - name: Summary
+        run: |
+          echo "## 🎉 MCP Server Publishing Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version**: ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Event**: ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Dry Run**: ${{ github.event.inputs.dry_run || 'false' }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [ "${{ github.event.inputs.dry_run }}" != "true" ] && [ "${{ github.event_name }}" != "push" ]; then
+            echo "### ✅ Published Successfully" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "- 📦 **NPM**: [@oneuptime/mcp-server@${{ steps.version.outputs.version }}](https://www.npmjs.com/package/@oneuptime/mcp-server)" >> $GITHUB_STEP_SUMMARY
+            echo "- 🐳 **Docker**: [oneuptime/mcp-server:${{ steps.version.outputs.version }}](https://hub.docker.com/r/oneuptime/mcp-server)" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### 🧪 Dry Run Completed" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "No actual publishing was performed." >> $GITHUB_STEP_SUMMARY
+          fi

.github/workflows/release.yml

@@ -1299,8 +1299,6 @@ jobs:
   
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
       
@@ -1384,8 +1382,6 @@ jobs:
         
   docs-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1451,8 +1447,6 @@ jobs:
 
   worker-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1518,8 +1512,6 @@ jobs:
   
   workflow-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1581,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:
 
@@ -1653,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, 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]
+    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:
@@ -1706,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, 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]
+    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:
@@ -1824,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 }}" --test-release
+
+  
+
   llm-docker-image-deploy: 
     needs: generate-build-number
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     steps:
 
@@ -1596,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, 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]
+    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,18 @@ App/greenlock/greenlock.d/config.json
 App/greenlock/greenlock.d/config.json.bak
 Examples/otel-dotnet/bin/Debug/net6.0/Grpc.Core.Api.dll.txt
 InfrastructureAgent/oneuptime-infrastructure-agent
+
+# ESLint cache
+.eslintcache*
+
+# Terraform generated files
+openapi.json
+
+Terraform/**
+
+TerraformTest/**
+
+terraform-provider-example/** 
+
+MCP/**
+MCP/**

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

@@ -88,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",

APIReference/Service/Model.ts

@@ -77,6 +77,11 @@ export default class ServiceHandler {
         continue;
       }
 
+      if (tableColumns[key].hideColumnInDocumentation) {
+        delete tableColumns[key];
+        continue;
+      }
+
       tableColumns[key].permissions = accessControl;
     }
 

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

@@ -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/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,15 +1,14 @@
 {
-    "watch": ["./","../Common/Server", "../Common/Types", "../Common/Utils", "../Common/Models"],
+    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
     "ext": "ts,json,tsx,env,js,jsx,hbs",
     "ignore": [
         "./public/**",
         "./public/dist/**",
-        "./dev-env/*",
-        "./dev-env/.env",
         "./build/*",
         "./build/**",
         "./build/dist/*",
-        "./build/dist/**"
+        "./build/dist/**",
+        "../Common/Server/**"
     ],
-    "exec": "printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && npm run dev-build && npm run start"
+    "exec": "npm run dev-build && npm run start"
 }

Accounts/package.json

@@ -3,9 +3,10 @@
     "version": "0.1.0",
     "private": false,
     "scripts": {
-        "dev-build": "webpack build --mode=development",
+        "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",
@@ -28,16 +29,11 @@
     },
     "dependencies": {
         "Common": "file:../Common",
-        "css-loader": "^6.11.0",
-        "dotenv": "^16.4.5",
+        
         "ejs": "^3.1.10",
-        "file-loader": "^6.2.0",
         "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": {
@@ -46,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/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

@@ -106,7 +106,7 @@
   <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,70 +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");
-require('ejs');
-
-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",
-      },
-    ],
-  },
-  devtool: "eval-source-map",
-};

AdminDashboard/Dockerfile.tpl

@@ -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/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,15 +1,14 @@
 {
-    "watch": ["./","../Common/Server", "../Common/Types", "../Common/Utils", "../Common/Models"],
+    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
     "ext": "ts,json,tsx,env,js,jsx,hbs",
     "ignore": [
         "./public/**",
         "./public/dist/**",
-        "./dev-env/*",
-        "./dev-env/.env",
         "./build/*",
         "./build/**",
         "./build/dist/*",
-        "./build/dist/**"
+        "./build/dist/**",
+        "../Common/Server/**"
     ],
-    "exec": "printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && npm run dev-build && npm run start"
+    "exec": " npm run dev-build && npm run start"
 }

AdminDashboard/package.json

@@ -4,20 +4,19 @@
     "private": false,
     "dependencies": {
         "Common": "file:../Common",
-        "dotenv": "^16.4.5",
+        
         "ejs": "^3.1.10",
-        "file-loader": "^6.2.0",
         "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": "webpack build --mode=development",
+        "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",
@@ -42,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/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/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

@@ -100,7 +100,7 @@
     <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,70 +0,0 @@
-require("ts-loader");
-require("file-loader");
-require("style-loader");
-require("css-loader");
-require("sass-loader");
-require('ejs');
-const path = require("path");
-const webpack = require("webpack");
-const dotenv = require("dotenv");
-
-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",
-      },
-    ],
-  },
-  devtool: "eval-source-map",
-};

App/FeatureSet/BaseAPI/Index.ts

@@ -16,6 +16,7 @@ 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";
@@ -169,9 +170,6 @@ 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";
@@ -410,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";
@@ -568,6 +565,25 @@ import OnCallDutyPolicyOwnerUser from "Common/Models/DatabaseModels/OnCallDutyPo
 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> => {
@@ -583,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>(
@@ -591,6 +617,27 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    // status page announcement templates
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateServiceType
+      >(
+        StatusPageAnnouncementTemplate,
+        StatusPageAnnouncementTemplateService,
+      ).getRouter(),
+    );
+
+    // OnCallDutyPolicyTimeLogService
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<OnCallDutyPolicyTimeLog, OnCallDutyPolicyTimeLogServiceType>(
+        OnCallDutyPolicyTimeLog,
+        OnCallDutyPolicyTimeLogService,
+      ).getRouter(),
+    );
+
     // on-call policy owner user.
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1448,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(),
@@ -1502,6 +1541,7 @@ 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(),

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

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

@@ -12,8 +12,8 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
     super({
       tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
-      singularName: "Exception",
-      pluralName: "Exceptions",
+      singularName: "Exception Instance",
+      pluralName: "Exception Instances",
       enableRealtimeEventsOn: {
         create: true,
       },
@@ -371,6 +371,7 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       ],
       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

@@ -14,9 +14,6 @@ export default class Log extends AnalyticsBaseModel {
       tableName: "LogItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
       singularName: "Log",
-      enableRealtimeEventsOn: {
-        create: true,
-      },
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -280,6 +277,7 @@ export default class Log extends AnalyticsBaseModel {
       ],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

Common/Models/AnalyticsModels/Metric.ts

@@ -510,6 +510,7 @@ export default class Metric extends AnalyticsBaseModel {
       ],
       sortKeys: ["projectId", "time", "serviceId"],
       primaryKeys: ["projectId", "time", "serviceId"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

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

@@ -494,6 +494,7 @@ export default class Span extends AnalyticsBaseModel {
       ],
       sortKeys: ["projectId", "startTime", "serviceId", "traceId"],
       primaryKeys: ["projectId", "startTime", "serviceId", "traceId"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

Common/Models/AnalyticsModels/TelemetryAttribute.ts

@@ -134,6 +134,7 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
       ],
       sortKeys: ["projectId", "telemetryType"],
       primaryKeys: ["projectId", "telemetryType"],
+      partitionKey: "sipHash64(projectId) % 16",
     });
   }
 

Common/Models/DatabaseModels/Alert.ts

@@ -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,
@@ -570,11 +570,13 @@ export default class Alert extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
+    isDefaultValueColumn: true,
     title: "Current Alert State ID",
     description: "Current Alert State ID",
   })
   @Column({
     type: ColumnType.ObjectID,
+    
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
@@ -758,12 +760,7 @@ export default class Alert extends BaseModel {
   public customFields?: JSONObject = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlert,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -775,10 +772,13 @@ export default class Alert extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified Of Alert Creation?",
     description: "Are owners notified of when this alert is created?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -936,6 +936,7 @@ export default class Alert extends BaseModel {
     title: "Is created automatically?",
     description:
       "Is this alert created by OneUptime Probe or Workers automatically (and not created manually by a user)?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -1028,6 +1029,7 @@ export default class Alert extends BaseModel {
     isDefaultValueColumn: false,
     required: false,
     type: TableColumnType.Number,
+    computed: true,
     title: "Alert Number",
     description: "Alert Number",
   })

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

@@ -340,12 +340,7 @@ export default class AlertInternalNote extends BaseModel {
   public note?: string = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlertInternalNote,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -357,10 +352,13 @@ export default class AlertInternalNote extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/AlertOwnerTeam.ts

@@ -406,6 +406,7 @@ export default class AlertOwnerTeam extends BaseModel {
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/AlertOwnerUser.ts

@@ -405,6 +405,7 @@ export default class AlertOwnerUser extends BaseModel {
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/AlertSeverity.ts

@@ -192,6 +192,7 @@ export default class AlertSeverity extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/AlertStateTimeline.ts

@@ -387,12 +387,7 @@ export default class AlertStateTimeline extends BaseModel {
   public alertStateId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlertStateTimeline,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -404,10 +399,13 @@ export default class AlertStateTimeline extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of state change?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/ApiKey.ts

@@ -201,6 +201,7 @@ export default class ApiKey extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })
@@ -348,9 +349,7 @@ export default class ApiKey extends BaseModel {
 
   @ColumnAccessControl({
     create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ReadProjectApiKey,
+
     ],
     read: [
       Permission.ProjectOwner,
@@ -368,6 +367,7 @@ export default class ApiKey extends BaseModel {
     type: TableColumnType.ObjectID,
     isDefaultValueColumn: false,
     title: "API Key",
+    computed: true,
     description: "Secret API Key",
   })
   @Column({

Common/Models/DatabaseModels/ApiKeyPermission.ts

@@ -425,7 +425,11 @@ export default class APIKeyPermission extends BaseModel {
       Permission.EditProjectApiKey,
     ],
   })
-  @TableColumn({ isDefaultValueColumn: true, type: TableColumnType.Boolean })
+  @TableColumn({ 
+    isDefaultValueColumn: true, 
+    type: TableColumnType.Boolean,
+    defaultValue: false,
+  })
   @Column({
     type: ColumnType.Boolean,
     default: false,

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

@@ -247,6 +247,7 @@ export default class CallLog extends BaseModel {
     description: "Call Cost in USD Cents",
     canReadOnRelationQuery: false,
     isDefaultValueColumn: true,
+    defaultValue: 0,
   })
   @Column({
     nullable: false,

Common/Models/DatabaseModels/CopilotCodeRepository.ts

@@ -208,6 +208,7 @@ export default class CopilotCodeRepository extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })
@@ -425,12 +426,7 @@ export default class CopilotCodeRepository extends BaseModel {
   public labels?: Array<Label> = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateCopilotCodeRepository,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -449,6 +445,7 @@ export default class CopilotCodeRepository extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     isDefaultValueColumn: false,
+    computed: true,
     title: "Secret Token",
     description:
       "Secret Token for this code repository. This is used to connect this code repository to OneUptime.",

Common/Models/DatabaseModels/Dashboard.ts

@@ -188,6 +188,7 @@ export default class Dashboard extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

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

@@ -21,8 +21,8 @@ export default class FileModel extends BaseModel {
   }
 
   @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
     update: [],
   })
   @TableColumn({
@@ -37,8 +37,8 @@ export default class FileModel extends BaseModel {
   public file?: Buffer = undefined;
 
   @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
     update: [],
   })
   @TableColumn({
@@ -56,8 +56,8 @@ export default class FileModel extends BaseModel {
   public name?: string = undefined;
 
   @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
     update: [],
   })
   @TableColumn({
@@ -70,11 +70,11 @@ export default class FileModel extends BaseModel {
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
   })
-  public type?: MimeType = undefined;
+  public fileType?: MimeType = undefined;
 
   @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
     update: [],
   })
   @TableColumn({
@@ -91,8 +91,8 @@ export default class FileModel extends BaseModel {
   public slug?: string = undefined;
 
   @ColumnAccessControl({
-    create: [Permission.CurrentUser],
-    read: [Permission.CurrentUser],
+    create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+    read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
     update: [],
   })
   @TableColumn({

Common/Models/DatabaseModels/Domain.ts

@@ -170,6 +170,7 @@ export default class Domain extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })
@@ -317,6 +318,7 @@ export default class Domain extends BaseModel {
     type: TableColumnType.Boolean,
     title: "Verified",
     description: "Is this domain verified?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/File.ts

@@ -2,11 +2,13 @@ import FileModel from "./DatabaseBaseModel/FileModel";
 import Route from "../../Types/API/Route";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import IconProp from "../../Types/Icon/IconProp";
 import Permission from "../../Types/Permission";
 import { Entity } from "typeorm";
 
+@EnableDocumentation()
 @TableMetadata({
   tableName: "File",
   singularName: "File",
@@ -19,8 +21,8 @@ import { Entity } from "typeorm";
 })
 @CrudApiEndpoint(new Route("/file"))
 @TableAccessControl({
-  create: [Permission.CurrentUser],
-  read: [Permission.CurrentUser],
+  create: [Permission.CurrentUser, Permission.AuthenticatedRequest],
+  read: [Permission.CurrentUser, Permission.AuthenticatedRequest],
   delete: [],
   update: [],
 })

Common/Models/DatabaseModels/GlobalConfig.ts

@@ -355,6 +355,7 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   @TableColumn({
     type: TableColumnType.ObjectID,
+    computed: true,
     title: "Master API Key",
     description:
       "This API key has root access to all the resources in all the projects on OneUptime.",

Common/Models/DatabaseModels/GreenlockCertificate.ts

@@ -61,7 +61,7 @@ export default class GreenlockCertificate extends BaseModel {
     read: [],
     update: [],
   })
-  @TableColumn({ type: TableColumnType.Boolean })
+  @TableColumn({ type: TableColumnType.Boolean, defaultValue: false })
   @Column({
     type: ColumnType.Boolean,
     nullable: false,

Common/Models/DatabaseModels/Incident.ts

@@ -229,12 +229,7 @@ export default class Incident extends BaseModel {
 
   @Index()
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -247,6 +242,7 @@ export default class Incident extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })
@@ -509,7 +505,7 @@ export default class Incident extends BaseModel {
 
   @ColumnAccessControl({
     create: [
-      Permission.ProjectOwner,
+       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.CreateProjectIncident,
@@ -530,6 +526,7 @@ export default class Incident extends BaseModel {
   @TableColumn({
     manyToOneRelationColumn: "currentIncidentStateId",
     type: TableColumnType.Entity,
+    computed: true,
     modelType: IncidentState,
     title: "Current Incident State",
     description:
@@ -550,7 +547,7 @@ export default class Incident extends BaseModel {
 
   @ColumnAccessControl({
     create: [
-      Permission.ProjectOwner,
+       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.CreateProjectIncident,
@@ -571,6 +568,7 @@ export default class Incident extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.ObjectID,
+    isDefaultValueColumn: true,
     required: true,
     title: "Current Incident State ID",
     description: "Current Incident State ID",
@@ -670,7 +668,12 @@ export default class Incident extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadProjectIncident,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
   })
   @TableColumn({
     manyToOneRelationColumn: "changeMonitorStatusToId",
@@ -740,9 +743,12 @@ export default class Incident extends BaseModel {
   })
   @TableColumn({
     isDefaultValueColumn: true,
+    computed: true,
+    hideColumnInDocumentation: true,
     type: TableColumnType.Boolean,
     title: "Are subscribers notified?",
     description: "Are subscribers notified about this incident?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -770,6 +776,7 @@ export default class Incident extends BaseModel {
     type: TableColumnType.Boolean,
     title: "Should subscribers be notified?",
     description: "Should subscribers be notified about this incident?",
+    defaultValue: true,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -812,12 +819,7 @@ export default class Incident extends BaseModel {
   public customFields?: JSONObject = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -829,10 +831,13 @@ export default class Incident extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified Of Resource Creation?",
     description: "Are owners notified of when this resource is created?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -1020,6 +1025,7 @@ export default class Incident extends BaseModel {
     title: "Is created automatically?",
     description:
       "Is this incident created by OneUptime Probe or Workers automatically (and not created manually by a user)?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -1095,10 +1101,7 @@ export default class Incident extends BaseModel {
 
   @ColumnAccessControl({
     create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectIncident,
+     
     ],
     read: [
       Permission.ProjectOwner,
@@ -1115,6 +1118,7 @@ export default class Incident extends BaseModel {
     type: TableColumnType.Number,
     title: "Incident Number",
     description: "Incident Number",
+    computed: true,
   })
   @Column({
     type: ColumnType.Number,
@@ -1166,6 +1170,7 @@ export default class Incident extends BaseModel {
     type: TableColumnType.Boolean,
     title: "Should be visible on status page?",
     description: "Should this incident be visible on the status page?",
+    defaultValue: true,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentCustomField.ts

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

Common/Models/DatabaseModels/IncidentInternalNote.ts

@@ -340,12 +340,7 @@ export default class IncidentInternalNote extends BaseModel {
   public note?: string = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentInternalNote,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -357,10 +352,13 @@ export default class IncidentInternalNote extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentOwnerTeam.ts

@@ -385,12 +385,7 @@ export default class IncidentOwnerTeam extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentOwnerTeam,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -402,10 +397,13 @@ export default class IncidentOwnerTeam extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentOwnerUser.ts

@@ -405,6 +405,7 @@ export default class IncidentOwnerUser extends BaseModel {
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentPublicNote.ts

@@ -351,9 +351,12 @@ export default class IncidentPublicNote extends BaseModel {
   })
   @TableColumn({
     isDefaultValueColumn: true,
+    computed: true,
+    hideColumnInDocumentation: true,
     type: TableColumnType.Boolean,
     title: "Are subscribers notified?",
     description: "Are subscribers notified about this note?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -381,6 +384,7 @@ export default class IncidentPublicNote extends BaseModel {
     type: TableColumnType.Boolean,
     title: "Should subscribers be notified?",
     description: "Should subscribers be notified about this note?",
+    defaultValue: true,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -390,12 +394,7 @@ export default class IncidentPublicNote extends BaseModel {
     undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentPublicNote,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -407,10 +406,13 @@ export default class IncidentPublicNote extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentSeverity.ts

@@ -192,6 +192,7 @@ export default class IncidentSeverity extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/IncidentState.ts

@@ -192,6 +192,7 @@ export default class IncidentState extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/IncidentStateTimeline.ts

@@ -387,12 +387,7 @@ export default class IncidentStateTimeline extends BaseModel {
   public incidentStateId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentStateTimeline,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -403,9 +398,12 @@ export default class IncidentStateTimeline extends BaseModel {
   })
   @TableColumn({
     isDefaultValueColumn: true,
+    computed: true,
+    hideColumnInDocumentation: true,
     type: TableColumnType.Boolean,
     title: "Are subscribers notified?",
     description: "Are subscribers notified about this incident state change?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -441,12 +439,7 @@ export default class IncidentStateTimeline extends BaseModel {
   public shouldStatusPageSubscribersBeNotified?: boolean = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentStateTimeline,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -458,6 +451,8 @@ export default class IncidentStateTimeline extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",

Common/Models/DatabaseModels/IncidentTemplate.ts

@@ -295,12 +295,7 @@ export default class IncidentTemplate extends BaseModel {
 
   @Index()
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplate,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -313,6 +308,7 @@ export default class IncidentTemplate extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts

@@ -387,12 +387,7 @@ export default class IncidentTemplateOwnerTeam extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplateOwnerTeam,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -404,10 +399,13 @@ export default class IncidentTemplateOwnerTeam extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts

@@ -397,12 +397,7 @@ export default class IncidentTemplateOwnerUser extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateIncidentTemplateOwnerUser,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -415,10 +410,13 @@ export default class IncidentTemplateOwnerUser extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/Index.ts

@@ -68,6 +68,8 @@ import OnCallDutyPolicyFeed from "./OnCallDutyPolicyFeed";
 import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
 import OnCallDutyPolicyScheduleLayer from "./OnCallDutyPolicyScheduleLayer";
 import OnCallDutyPolicyScheduleLayerUser from "./OnCallDutyPolicyScheduleLayerUser";
+import OnCallDutyPolicyTimeLog from "./OnCallDutyPolicyTimeLog";
+
 import Probe from "./Probe";
 import ProbeOwnerTeam from "./ProbeOwnerTeam";
 import ProbeOwnerUser from "./ProbeOwnerUser";
@@ -101,6 +103,7 @@ import SmsLog from "./SmsLog";
 // Status Page
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
+import StatusPageAnnouncementTemplate from "./StatusPageAnnouncementTemplate";
 import StatusPageCustomField from "./StatusPageCustomField";
 import StatusPageDomain from "./StatusPageDomain";
 import StatusPageFooterLink from "./StatusPageFooterLink";
@@ -245,6 +248,7 @@ const AllModelTypes: Array<{
   StatusPageResource,
 
   StatusPageAnnouncement,
+  StatusPageAnnouncementTemplate,
   StatusPageSubscriber,
   StatusPageFooterLink,
   StatusPageHeaderLink,
@@ -372,6 +376,8 @@ const AllModelTypes: Array<{
   MonitorFeed,
 
   MetricType,
+
+  OnCallDutyPolicyTimeLog,
 ];
 
 const modelTypeMap: { [key: string]: { new (): BaseModel } } = {};

Common/Models/DatabaseModels/Label.ts

@@ -186,6 +186,7 @@ export default class Label extends AccessControlModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/Monitor.ts

@@ -221,12 +221,7 @@ export default class Monitor extends BaseModel {
 
   @Index()
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -239,6 +234,7 @@ export default class Monitor extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })
@@ -477,10 +473,10 @@ export default class Monitor extends BaseModel {
 
   @ColumnAccessControl({
     create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
+       Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectIncident,
     ],
     read: [
       Permission.ProjectOwner,
@@ -499,6 +495,7 @@ export default class Monitor extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
+    isDefaultValueColumn: true, 
     title: "Current Monitor Status ID",
     description: "Whats the current status ID of this monitor?",
     canReadOnRelationQuery: true,
@@ -531,7 +528,7 @@ export default class Monitor extends BaseModel {
     ],
   })
   @TableColumn({
-    type: TableColumnType.JSON,
+    type: TableColumnType.MonitorSteps,
     required: false,
     title: "Monitor Steps",
     description: "What would you like to monitor and what is the criteria?",
@@ -611,12 +608,7 @@ export default class Monitor extends BaseModel {
   public customFields?: JSONObject = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -628,10 +620,13 @@ export default class Monitor extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified Of Resource Creation?",
     description: "Are owners notified of when this resource is created?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -667,6 +662,7 @@ export default class Monitor extends BaseModel {
     isDefaultValueColumn: true,
     title: "Disable Monitoring",
     description: "Disable active monitoring for this resource?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -784,6 +780,7 @@ export default class Monitor extends BaseModel {
     title: "Disable Monitoring because of Ongoing Scheduled Maintenance Event",
     description:
       "Disable Monitoring because of Ongoing Scheduled Maintenance Event",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -811,6 +808,7 @@ export default class Monitor extends BaseModel {
     title: "Disable Monitoring because of Manual Incident",
     description:
       "Disable Monitoring because of Incident which is creeated manually by user.",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -850,12 +848,7 @@ export default class Monitor extends BaseModel {
   public serverMonitorRequestReceivedAt?: Date = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -874,6 +867,7 @@ export default class Monitor extends BaseModel {
     type: TableColumnType.ObjectID,
     required: false,
     isDefaultValueColumn: false,
+    computed: true,
     title: "Server Monitor Secret Key",
     description:
       "This field is for Server Monitor only. Secret Key to authenticate the request.",
@@ -886,12 +880,7 @@ export default class Monitor extends BaseModel {
   public serverMonitorSecretKey?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateProjectMonitor,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -910,6 +899,7 @@ export default class Monitor extends BaseModel {
     type: TableColumnType.ObjectID,
     required: false,
     isDefaultValueColumn: false,
+    computed: true,
     title: "Incoming Request Secret Key",
     description:
       "This field is for Incoming Request Monitor only. Secret Key to authenticate the request.",
@@ -993,6 +983,7 @@ export default class Monitor extends BaseModel {
     title: "All Probes Disconnected From This Monitor",
     description:
       "All Probes Disconnected From This Monitor. Is this monitor not being monitored?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,
@@ -1017,6 +1008,7 @@ export default class Monitor extends BaseModel {
     title: "No Probe Enabled On This Monitor",
     description:
       "No Probe Enabled On This Monitor. Is this monitor not being monitored?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,

Common/Models/DatabaseModels/MonitorCustomField.ts

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

Common/Models/DatabaseModels/MonitorGroup.ts

@@ -222,12 +222,7 @@ export default class MonitorGroup extends BaseModel {
 
   @Index()
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateMonitorGroup,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -240,6 +235,7 @@ export default class MonitorGroup extends BaseModel {
     required: true,
     unique: true,
     type: TableColumnType.Slug,
+    computed: true,
     title: "Slug",
     description: "Friendly globally unique name for your object",
   })

Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts

@@ -395,12 +395,7 @@ export default class MonitorGroupOwnerTeam extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateMonitorGroupOwnerTeam,
-    ],
+    create: [],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -412,10 +407,13 @@ export default class MonitorGroupOwnerTeam extends BaseModel {
   @Index()
   @TableColumn({
     type: TableColumnType.Boolean,
+    computed: true,
+    hideColumnInDocumentation: true,
     required: true,
     isDefaultValueColumn: true,
     title: "Are Owners Notified",
     description: "Are owners notified of this resource ownership?",
+    defaultValue: false,
   })
   @Column({
     type: ColumnType.Boolean,