Refactor HelmChart templates to use emptyDir volumes for haraka.yaml

[Snyk] Upgrade @types/lodash from 4.14.202 to 4.17.0

.eslintrc.json

@@ -82,15 +82,20 @@
         "@typescript-eslint/no-empty-interface": [
             "error",
             {
-              "allowSingleExtends": true
+                "allowSingleExtends": true
             }
-          ],
+        ],
         // https://www.npmjs.com/package/eslint-plugin-unused-imports
         "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_"
+            }
+        ],
         "@typescript-eslint/no-extra-non-null-assertion": "error",
-        "@typescript-eslint/no-floating-promises":"error",
-        "@typescript-eslint/await-thenable":"error",
+        "@typescript-eslint/no-floating-promises": "error",
+        "@typescript-eslint/await-thenable": "error",
         "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
         "unused-imports/no-unused-imports": "error",
         "unused-imports/no-unused-vars": [
@@ -180,8 +185,27 @@
             }
         ],
         "no-var": "error",
-        "object-curly-spacing": ["error", "always"],
-        "no-unneeded-ternary": "error"
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "no-unneeded-ternary": "error",
+        "@typescript-eslint/ban-types": [
+            "error",
+            {
+                "types": {
+                    "String": true,
+                    "Boolean": true,
+                    "Number": true,
+                    "Symbol": false,
+                    "{}": true,
+                    "Object": true,
+                    "object": true,
+                    "Function": true
+                },
+                "extendDefaults": true
+            }
+        ]
     },
     "settings": {
         "react": {

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name:  Docker Build
+name: Build
 
 on:
   pull_request:
@@ -25,6 +25,21 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Accounts/Dockerfile .
 
+  docker-build-isolated-vm:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+      
+      # build image for accounts service
+      - name: build docker image
+        run: sudo docker build -f ./IsolatedVM/Dockerfile .
+
 
   docker-build-otel-collector:
     runs-on: ubuntu-latest
@@ -148,6 +163,20 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./StatusPage/Dockerfile .
 
+  docker-build-infrastructure-agent:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+
+      # build image for mail service
+      - name: build docker image
+        run: sudo docker build -f ./InfrastructureAgent/Dockerfile .
 
   docker-build-test-server:
     runs-on: ubuntu-latest
@@ -162,4 +191,4 @@ jobs:
 
       # build image for mail service
       - name: build docker image
-        run: sudo docker build -f ./TestServer/Dockerfile .
+        run: sudo docker build -f ./TestServer/Dockerfile .

.github/workflows/compile.yml

@@ -25,6 +25,19 @@ jobs:
       - run: cd CommonUI && npm install --force
       - run: cd Accounts && npm install && npm run compile && npm run dep-check
 
+  compile-isolated-vm:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd CommonServer && npm install
+      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
+
   compile-common-server:
     runs-on: ubuntu-latest
     env:
@@ -77,6 +90,35 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd App && npm install && npm run compile && npm run dep-check
+
+  compile-nginx:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd Model && npm install
+      - run: cd CommonServer && npm install
+      - run: cd CommonUI && npm install --force
+      - run: cd Nginx && npm install && npm run compile && npm run dep-check
+
+  compile-infrastructure-agent:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd Model && npm install
+      - run: cd CommonServer && npm install
+      - run: cd InfrastructureAgent && npm install && npm run compile && npm run dep-check
   
 
   compile-admin-dashboard:

.github/workflows/release.yml

@@ -31,7 +31,11 @@ jobs:
       - run: echo "${{needs.generate-build-number.outputs.build_number}}"
       - name: "Build Changelog"
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v3.7.1
+        uses: mikepenz/release-changelog-builder-action@v4.2.0
+        with:
+          configuration: "./Scripts/Release/ChangelogConfig.json"
+      - run: echo "Changelog:"    
+      - run: echo "${{steps.build_changelog.outputs.changelog}}"
       - uses: ncipollo/release-action@v1
         with:
           tag: "7.0.${{needs.generate-build-number.outputs.build_number}}"
@@ -147,6 +151,66 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+  isolated-vm-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy isolated-vm.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IsolatedVM/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   test-server-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -810,3 +874,108 @@ jobs:
           build-args: |
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+    # We dont need any of this because we are using the npm package  
+  # infrastructure-agent-macos-binary-release:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && bash Scripts/Build/Mac.sh
+
+  # We dont need any of this because we are using the npm package    
+  # infrastructure-agent-windows-binary-release:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && ./Scripts/Build/Windows.ps1
+
+  # We dont need any of this because we are using the npm package  
+  # infrastructure-agent-linux-binary-release:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 21.6.2
+  #     - run: cd InfrastructureAgent && bash ./Scripts/Build/Linux.sh
+
+  publish-npm-packages:
+    runs-on: ubuntu-latest
+    needs: generate-build-number
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+      NPM_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
+      PACKAGE_VERSION: 7.0.${{needs.generate-build-number.outputs.build_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+      - name: Preinstall 
+        run: npm run prerun
+      - name: Publish Infrastructure Agent
+        run: bash ./Scripts/NPM/PublishAllPackages.sh
+        
+  infrastructure-agent-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/infrastructure-agent
+            ghcr.io/oneuptime/infrastructure-agent
+          tags: |
+            type=raw,value=release,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy infrastructure-agent.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./InfrastructureAgent/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}

.github/workflows/test-release.yaml

@@ -202,6 +202,67 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+  isolated-vm-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/isolated-vm
+            ghcr.io/oneuptime/isolated-vm
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy isolated-vm.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./IsolatedVM/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
   status-page-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
@@ -753,9 +814,73 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
+          
+  infrastructure-agent-docker-image-deploy:
+    needs: generate-build-number
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            oneuptime/infrastructure
+            ghcr.io/oneuptime/infrastructure
+          tags: |
+            type=raw,value=test,enable=true
+            type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
+            
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Generate Dockerfile from Dockerfile.tpl
+        run: npm run prerun
+
+      # Build and deploy infrastructure.
+
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: ./InfrastructureAgent/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
+            APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
+
+  
+
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [test-server-docker-image-deploy, test-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy]
+    needs: [ infrastructure-agent-docker-image-deploy, isolated-vm-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -763,4 +888,4 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd HelmChart && cd Tests && bash index.sh
+      - run: cd HelmChart && cd Tests && bash index.sh

.github/workflows/test.probe.yaml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   test:
-    runs-on: self-hosted # this needs to be self-hosted because ICMP checks are disbled in hosted runners
+    runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

.gitignore

@@ -98,4 +98,13 @@ Llama/Models/llama*
 
 Llama/__pycache__/*
 
-Examples/otel-dotnet/obj
+Examples/otel-dotnet/obj/*
+
+InfrastructureAgent/sea-prep.blob
+InfrastructureAgent/InfrastructureAgent
+InfrastructureAgent/build/*
+
+
+InfrastructureAgent/err.log
+InfrastructureAgent/out.log
+InfrastructureAgent/daemon.pid

.vscode/launch.json

@@ -83,6 +83,20 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/IsolatedVM",
+            "name": "Isolated VM: Debug with Docker",
+            "port": 9974,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Workflow",
@@ -139,34 +153,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Ingestor",
-            "name": "Probe API: Debug with Docker",
-            "port": 9251,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Identity",
-            "name": "File: Debug with Docker",
-            "port": 9012,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/HttpTestServer",

Accounts/Dockerfile.tpl

@@ -3,8 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.6-alpine3.18
-USER root
+FROM node:21.7.2-alpine3.18
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -26,6 +29,8 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
@@ -33,6 +38,8 @@ COPY ./Common /usr/src/Common
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -40,6 +47,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -50,6 +59,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 

Accounts/Serve.ts

@@ -1,5 +1,5 @@
 import App from 'CommonServer/Utils/StartServer';
-
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
 import logger from 'CommonServer/Utils/Logger';
 
@@ -7,7 +7,7 @@ export const APP_NAME: string = 'accounts';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: () => Promise<void> = async (): Promise<void> => {
+const init: PromiseVoidFunction = async (): Promise<void> => {
     try {
         // init the app
         await App(APP_NAME, undefined, true);

Accounts/package-lock.json

@@ -1,26 +1,26 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "accounts",
+            "name": "@oneuptime/accounts",
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
                 "CommonUI": "file:../CommonUI",
-                "css-loader": "^6.8.1",
-                "dotenv": "^16.3.1",
-                "express": "^4.18.2",
+                "css-loader": "^6.10.0",
+                "dotenv": "^16.4.5",
+                "express": "^4.19.2",
                 "file-loader": "^6.2.0",
                 "Model": "file:../Model",
                 "react": "^18.2.0",
                 "react-dom": "^18.1.0",
-                "react-router-dom": "^6.21.1",
+                "react-router-dom": "^6.22.2",
                 "sass-loader": "^13.3.3",
-                "style-loader": "^3.3.3",
+                "style-loader": "^3.3.4",
                 "ts-loader": "^9.5.1",
                 "use-async-effect": "^2.2.7"
             },
@@ -39,17 +39,17 @@
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
-                "@types/crypto-js": "^4.1.1",
+                "@types/crypto-js": "^4.2.2",
                 "@types/uuid": "^8.3.4",
-                "axios": "^1.6.2",
+                "axios": "^1.6.7",
                 "crypto-js": "^4.1.1",
                 "json5": "^2.2.3",
-                "moment": "^2.29.2",
-                "moment-timezone": "^0.5.40",
-                "posthog-js": "^1.77.0",
-                "reflect-metadata": "^0.1.13",
+                "moment": "^2.30.1",
+                "moment-timezone": "^0.5.45",
+                "posthog-js": "^1.104.4",
+                "reflect-metadata": "^0.2.1",
                 "slugify": "^1.6.5",
-                "typeorm": "^0.3.6",
+                "typeorm": "^0.3.20",
                 "uuid": "^8.3.2"
             },
             "devDependencies": {
@@ -65,20 +65,29 @@
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
-                "@clickhouse/client": "^0.2.1",
-                "@elastic/elasticsearch": "^8.1.0",
+                "@clickhouse/client": "^0.2.7",
+                "@elastic/elasticsearch": "^8.11.0",
                 "@opentelemetry/api": "^1.7.0",
-                "@opentelemetry/auto-instrumentations-node": "^0.40.1",
-                "@opentelemetry/sdk-node": "^0.45.1",
+                "@opentelemetry/api-logs": "^0.48.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.48.0",
+                "@opentelemetry/exporter-metrics-otlp-proto": "^0.48.0",
+                "@opentelemetry/exporter-trace-otlp-proto": "^0.48.0",
+                "@opentelemetry/id-generator-aws-xray": "^1.2.1",
+                "@opentelemetry/instrumentation-express": "^0.35.0",
+                "@opentelemetry/instrumentation-http": "^0.48.0",
+                "@opentelemetry/sdk-logs": "^0.48.0",
+                "@opentelemetry/sdk-metrics": "^1.21.0",
+                "@opentelemetry/sdk-node": "^0.48.0",
+                "@opentelemetry/sdk-trace-node": "^1.21.0",
                 "@socket.io/redis-adapter": "^8.2.1",
                 "airtable": "^0.12.2",
-                "axios": "^1.6.2",
-                "bullmq": "^3.6.6",
+                "axios": "^1.6.4",
+                "bullmq": "^5.3.3",
                 "Common": "file:../Common",
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
-                "dotenv": "^16.0.0",
+                "dotenv": "^16.4.1",
                 "ejs": "^3.1.8",
                 "express": "^4.17.3",
                 "ioredis": "^5.3.2",
@@ -86,15 +95,15 @@
                 "jsonwebtoken": "^9.0.0",
                 "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
-                "nodemailer": "^6.7.3",
+                "node-cron": "^3.0.3",
+                "nodemailer": "^6.9.9",
                 "pg": "^8.7.3",
                 "socket.io": "^4.7.2",
                 "stripe": "^10.17.0",
                 "twilio": "^4.19.3",
-                "typeorm": "^0.3.10",
+                "typeorm": "^0.3.20",
                 "typeorm-extension": "^2.2.13",
-                "vm2": "^3.9.14",
-                "winston": "^3.6.0"
+                "vm2": "^3.9.14"
             },
             "devDependencies": {
                 "@faker-js/faker": "^6.3.1",
@@ -107,6 +116,7 @@
                 "@types/jsonwebtoken": "^8.5.9",
                 "@types/markdown-it": "^12.2.3",
                 "@types/node": "^17.0.22",
+                "@types/node-cron": "^3.0.7",
                 "@types/nodemailer": "^6.4.7",
                 "jest": "^27.5.1",
                 "jest-mock-extended": "^3.0.5",
@@ -119,29 +129,38 @@
             "license": "MIT",
             "dependencies": {
                 "@monaco-editor/react": "^4.4.6",
+                "@opentelemetry/api": "^1.7.0",
+                "@opentelemetry/context-zone": "^1.21.0",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
+                "@opentelemetry/instrumentation": "^0.48.0",
+                "@opentelemetry/instrumentation-fetch": "^0.48.0",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.48.0",
+                "@opentelemetry/resources": "^1.21.0",
+                "@opentelemetry/sdk-trace-web": "^1.21.0",
+                "@opentelemetry/semantic-conventions": "^1.21.0",
                 "@tippyjs/react": "^4.2.6",
                 "Common": "file:../Common",
                 "formik": "^2.2.9",
                 "history": "^5.3.0",
                 "lodash": "^4.17.21",
                 "Model": "file:../Model",
-                "moment-timezone": "^0.5.43",
+                "moment-timezone": "^0.5.44",
                 "prop-types": "^15.8.1",
                 "react": "^18.2.0",
                 "react-beautiful-dnd": "^13.1.1",
-                "react-big-calendar": "^1.8.5",
+                "react-big-calendar": "^1.8.7",
                 "react-color": "^2.19.3",
                 "react-dom": "^18.1.0",
                 "react-dropzone": "^14.2.2",
-                "react-error-boundary": "^4.0.11",
+                "react-error-boundary": "^4.0.12",
                 "react-markdown": "^8.0.3",
-                "react-router-dom": "^6.3.0",
+                "react-router-dom": "^6.21.3",
                 "react-select": "^5.4.0",
                 "react-spinners": "^0.13.6",
                 "react-toggle": "^4.1.3",
-                "reactflow": "^11.5.3",
+                "reactflow": "^11.10.3",
                 "remark-gfm": "^3.0.1",
-                "socket.io-client": "^4.7.2",
+                "socket.io-client": "^4.7.4",
                 "tippy.js": "^6.3.7",
                 "universal-cookie": "^4.0.4",
                 "use-async-effect": "^2.2.6"
@@ -172,7 +191,7 @@
             "license": "ISC",
             "dependencies": {
                 "Common": "file:../Common",
-                "typeorm": "^0.3.17"
+                "typeorm": "^0.3.20"
             },
             "devDependencies": {
                 "@types/jest": "^27.4.1",
@@ -246,9 +265,9 @@
             }
         },
         "node_modules/@remix-run/router": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.1.tgz",
-            "integrity": "sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.2.tgz",
+            "integrity": "sha512-+Rnav+CaoTE5QJc4Jcwh5toUpnVLKYbpU6Ys0zqbakqbaLQHeglLVHPfxOiQqdNmUy5C2lXz5dwC6tQNX2JW2Q==",
             "engines": {
                 "node": ">=14.0.0"
             }
@@ -641,12 +660,12 @@
             }
         },
         "node_modules/body-parser": {
-            "version": "1.20.1",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-            "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+            "version": "1.20.2",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
             "dependencies": {
                 "bytes": "3.1.2",
-                "content-type": "~1.0.4",
+                "content-type": "~1.0.5",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
                 "destroy": "1.2.0",
@@ -654,7 +673,7 @@
                 "iconv-lite": "0.4.24",
                 "on-finished": "2.4.1",
                 "qs": "6.11.0",
-                "raw-body": "2.5.1",
+                "raw-body": "2.5.2",
                 "type-is": "~1.6.18",
                 "unpipe": "1.0.0"
             },
@@ -742,13 +761,18 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
             "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
-                "get-intrinsic": "^1.2.1",
-                "set-function-length": "^1.1.1"
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -901,9 +925,9 @@
             }
         },
         "node_modules/cookie": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+            "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -920,18 +944,18 @@
             "dev": true
         },
         "node_modules/css-loader": {
-            "version": "6.8.1",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-            "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+            "version": "6.10.0",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
+            "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
             "dependencies": {
                 "icss-utils": "^5.1.0",
-                "postcss": "^8.4.21",
+                "postcss": "^8.4.33",
                 "postcss-modules-extract-imports": "^3.0.0",
-                "postcss-modules-local-by-default": "^4.0.3",
-                "postcss-modules-scope": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.4",
+                "postcss-modules-scope": "^3.1.1",
                 "postcss-modules-values": "^4.0.0",
                 "postcss-value-parser": "^4.2.0",
-                "semver": "^7.3.8"
+                "semver": "^7.5.4"
             },
             "engines": {
                 "node": ">= 12.13.0"
@@ -941,7 +965,16 @@
                 "url": "https://opencollective.com/webpack"
             },
             "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
                 "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
             }
         },
         "node_modules/cssesc": {
@@ -971,16 +1004,19 @@
             }
         },
         "node_modules/define-data-property": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
             "dependencies": {
-                "get-intrinsic": "^1.2.1",
-                "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.0"
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
             },
             "engines": {
                 "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/depd": {
@@ -1010,14 +1046,14 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "16.3.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-            "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+            "version": "16.4.5",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+            "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
             "engines": {
                 "node": ">=12"
             },
             "funding": {
-                "url": "https://github.com/motdotla/dotenv?sponsor=1"
+                "url": "https://dotenvx.com"
             }
         },
         "node_modules/ee-first": {
@@ -1058,6 +1094,25 @@
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/es-module-lexer": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
@@ -1132,16 +1187,16 @@
             }
         },
         "node_modules/express": {
-            "version": "4.18.2",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+            "version": "4.19.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
             "dependencies": {
                 "accepts": "~1.3.8",
                 "array-flatten": "1.1.1",
-                "body-parser": "1.20.1",
+                "body-parser": "1.20.2",
                 "content-disposition": "0.5.4",
                 "content-type": "~1.0.4",
-                "cookie": "0.5.0",
+                "cookie": "0.6.0",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
@@ -1294,15 +1349,19 @@
             }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-            "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
             "dependencies": {
+                "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2",
                 "has-proto": "^1.0.1",
                 "has-symbols": "^1.0.3",
                 "hasown": "^2.0.0"
             },
+            "engines": {
+                "node": ">= 0.4"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -1350,20 +1409,20 @@
             }
         },
         "node_modules/has-property-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-            "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
             "dependencies": {
-                "get-intrinsic": "^1.2.2"
+                "es-define-property": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/has-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-            "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -1383,9 +1442,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-            "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
             "dependencies": {
                 "function-bind": "^1.1.2"
             },
@@ -1834,9 +1893,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.32",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-            "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+            "version": "8.4.35",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+            "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -1872,9 +1931,9 @@
             }
         },
         "node_modules/postcss-modules-local-by-default": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-            "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
+            "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
             "dependencies": {
                 "icss-utils": "^5.0.0",
                 "postcss-selector-parser": "^6.0.2",
@@ -1888,9 +1947,9 @@
             }
         },
         "node_modules/postcss-modules-scope": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-            "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
+            "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
             "dependencies": {
                 "postcss-selector-parser": "^6.0.4"
             },
@@ -1989,9 +2048,9 @@
             }
         },
         "node_modules/raw-body": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
             "dependencies": {
                 "bytes": "3.1.2",
                 "http-errors": "2.0.0",
@@ -2026,11 +2085,11 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.21.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.1.tgz",
-            "integrity": "sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==",
+            "version": "6.22.2",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.2.tgz",
+            "integrity": "sha512-YD3Dzprzpcq+tBMHBS822tCjnWD3iIZbTeSXMY9LPSG541EfoBGyZ3bS25KEnaZjLcmQpw2AVLkFyfgXY8uvcw==",
             "dependencies": {
-                "@remix-run/router": "1.14.1"
+                "@remix-run/router": "1.15.2"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -2040,12 +2099,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.21.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.1.tgz",
-            "integrity": "sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==",
+            "version": "6.22.2",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.2.tgz",
+            "integrity": "sha512-WgqxD2qySEIBPZ3w0sHH+PUAiamDeszls9tzqMPBDA1YYVucTBXLU7+gtRfcSnhe92A3glPnvSxK2dhNoAVOIQ==",
             "dependencies": {
-                "@remix-run/router": "1.14.1",
-                "react-router": "6.21.1"
+                "@remix-run/router": "1.15.2",
+                "react-router": "6.22.2"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -2225,14 +2284,16 @@
             }
         },
         "node_modules/set-function-length": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-            "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
             "dependencies": {
-                "define-data-property": "^1.1.1",
-                "get-intrinsic": "^1.2.1",
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
                 "gopd": "^1.0.1",
-                "has-property-descriptors": "^1.0.0"
+                "has-property-descriptors": "^1.0.2"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -2244,13 +2305,17 @@
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
         "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -2319,9 +2384,9 @@
             }
         },
         "node_modules/style-loader": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-            "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+            "version": "3.3.4",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+            "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
             "engines": {
                 "node": ">= 12.13.0"
             },

Accounts/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "private": false,
     "scripts": {
@@ -29,16 +29,16 @@
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
-        "css-loader": "^6.8.1",
-        "dotenv": "^16.3.1",
-        "express": "^4.18.2",
+        "css-loader": "^6.10.0",
+        "dotenv": "^16.4.5",
+        "express": "^4.19.2",
         "file-loader": "^6.2.0",
         "Model": "file:../Model",
         "react": "^18.2.0",
         "react-dom": "^18.1.0",
-        "react-router-dom": "^6.21.1",
+        "react-router-dom": "^6.22.3",
         "sass-loader": "^13.3.3",
-        "style-loader": "^3.3.3",
+        "style-loader": "^3.3.4",
         "ts-loader": "^9.5.1",
         "use-async-effect": "^2.2.7"
     },

Accounts/src/Index.tsx

@@ -3,6 +3,12 @@ import ReactDOM from 'react-dom/client';
 import App from './App';
 import { BrowserRouter } from 'react-router-dom';
 
+import Telemetry from 'CommonUI/src/Utils/Telemetry';
+
+Telemetry.init({
+    serviceName: 'Accounts',
+});
+
 const root: any = ReactDOM.createRoot(
     document.getElementById('root') as HTMLElement
 );

Accounts/src/Pages/Register.tsx

@@ -40,7 +40,9 @@ const RegisterPage: () => JSX.Element = () => {
         Navigation.navigate(DASHBOARD_URL);
     }
 
-    const fetchReseller: Function = async (
+    type FetchResellerFunction = (resellerId: string) => Promise<void>;
+
+    const fetchReseller: FetchResellerFunction = async (
         resellerId: string
     ): Promise<void> => {
         setIsLoading(true);

Accounts/src/Pages/VerifyEmail.tsx

@@ -11,13 +11,14 @@ import Navigation from 'CommonUI/src/Utils/Navigation';
 import ObjectID from 'Common/Types/ObjectID';
 import URL from 'Common/Types/API/URL';
 import API from 'CommonUI/src/Utils/API/API';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const VerifyEmail: () => JSX.Element = () => {
     const apiUrl: URL = VERIFY_EMAIL_API_URL;
     const [error, setError] = useState<string>('');
     const [isLoading, setIsLoading] = useState<boolean>(true);
 
-    const init: () => Promise<void> = async (): Promise<void> => {
+    const init: PromiseVoidFunction = async (): Promise<void> => {
         // Ping an API here.
         setError('');
         setIsLoading(true);

Accounts/tsconfig.json

@@ -3,7 +3,8 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
@@ -105,6 +106,7 @@
 
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
 }

AdminDashboard/Dockerfile.tpl

@@ -3,8 +3,7 @@
 #
 
 # Pull base image nodejs image.
-FROM node:21.6-alpine3.18
-USER root
+FROM node:21.7.2-alpine3.18
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -26,12 +29,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -39,6 +46,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -49,6 +58,8 @@ COPY ./CommonServer /usr/src/CommonServer
 
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
+# Set version in ./CommonUI/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 

AdminDashboard/Serve.ts

@@ -1,12 +1,13 @@
 import App from 'CommonServer/Utils/StartServer';
 import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
 import logger from 'CommonServer/Utils/Logger';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 export const APP_NAME: string = 'admin';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: () => Promise<void> = async (): Promise<void> => {
+const init: PromiseVoidFunction = async (): Promise<void> => {
     try {
         // init the app
         await App(APP_NAME, undefined, true);

AdminDashboard/package-lock.json

@@ -1,22 +1,22 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "admin-dashboard",
+            "name": "@oneuptime/admin-dashboard",
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
                 "CommonUI": "file:../CommonUI",
-                "dotenv": "^16.3.1",
+                "dotenv": "^16.4.5",
                 "file-loader": "^6.2.0",
                 "Model": "file:../Model",
                 "react": "^18.2.0",
                 "react-dom": "^18.1.0",
-                "react-router-dom": "^6.21.1",
+                "react-router-dom": "^6.22.2",
                 "style-loader": "^3.3.4"
             },
             "devDependencies": {
@@ -4009,9 +4009,9 @@
             }
         },
         "node_modules/@remix-run/router": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.1.tgz",
-            "integrity": "sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.2.tgz",
+            "integrity": "sha512-+Rnav+CaoTE5QJc4Jcwh5toUpnVLKYbpU6Ys0zqbakqbaLQHeglLVHPfxOiQqdNmUy5C2lXz5dwC6tQNX2JW2Q==",
             "engines": {
                 "node": ">=14.0.0"
             }
@@ -7915,14 +7915,14 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "16.3.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-            "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+            "version": "16.4.5",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+            "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
             "engines": {
                 "node": ">=12"
             },
             "funding": {
-                "url": "https://github.com/motdotla/dotenv?sponsor=1"
+                "url": "https://dotenvx.com"
             }
         },
         "node_modules/dotenv-expand": {
@@ -16936,11 +16936,11 @@
             }
         },
         "node_modules/react-router": {
-            "version": "6.21.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.1.tgz",
-            "integrity": "sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==",
+            "version": "6.22.2",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.2.tgz",
+            "integrity": "sha512-YD3Dzprzpcq+tBMHBS822tCjnWD3iIZbTeSXMY9LPSG541EfoBGyZ3bS25KEnaZjLcmQpw2AVLkFyfgXY8uvcw==",
             "dependencies": {
-                "@remix-run/router": "1.14.1"
+                "@remix-run/router": "1.15.2"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -16950,12 +16950,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "6.21.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.1.tgz",
-            "integrity": "sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==",
+            "version": "6.22.2",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.2.tgz",
+            "integrity": "sha512-WgqxD2qySEIBPZ3w0sHH+PUAiamDeszls9tzqMPBDA1YYVucTBXLU7+gtRfcSnhe92A3glPnvSxK2dhNoAVOIQ==",
             "dependencies": {
-                "@remix-run/router": "1.14.1",
-                "react-router": "6.21.1"
+                "@remix-run/router": "1.15.2",
+                "react-router": "6.22.2"
             },
             "engines": {
                 "node": ">=14.0.0"

AdminDashboard/package.json

@@ -1,17 +1,17 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "private": false,
     "dependencies": {
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
-        "dotenv": "^16.3.1",
+        "dotenv": "^16.4.5",
         "file-loader": "^6.2.0",
         "Model": "file:../Model",
         "react": "^18.2.0",
         "react-dom": "^18.1.0",
-        "react-router-dom": "^6.21.1",
+        "react-router-dom": "^6.22.3",
         "style-loader": "^3.3.4"
     },
     "scripts": {

AdminDashboard/src/App.tsx

@@ -19,7 +19,7 @@ import Users from './Pages/Users/Index';
 import Logout from './Pages/Logout/Logout';
 
 // Settings Pages.
-import SettingsEmail from './Pages/Settings/SMTP/Index';
+import SettingsEmail from './Pages/Settings/Email/Index';
 import SettingsCallSMS from './Pages/Settings/CallSMS/Index';
 import SettingsProbes from './Pages/Settings/Probes/Index';
 import SettingsAuthentication from './Pages/Settings/Authentication/Index';

AdminDashboard/src/Components/Footer/Footer.tsx

@@ -8,6 +8,7 @@ import BadDataException from 'Common/Types/Exception/BadDataException';
 import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
 import Dictionary from 'Common/Types/Dictionary';
 import HTTPResponse from 'Common/Types/API/HTTPResponse';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const DashboardFooter: () => JSX.Element = () => {
     const [showAboutModal, setShowAboutModal] = React.useState<boolean>(false);
@@ -17,7 +18,7 @@ const DashboardFooter: () => JSX.Element = () => {
         {}
     );
 
-    const fetchVersions: () => Promise<void> = async (): Promise<void> => {
+    const fetchVersions: PromiseVoidFunction = async (): Promise<void> => {
         setIsAboutModalLoading(true);
 
         try {

AdminDashboard/src/Components/Header/ProjectPicker.tsx

@@ -16,6 +16,7 @@ import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
 import Field from 'CommonUI/src/Components/Forms/Types/Field';
 import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
 import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
+import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
 
 export interface ComponentProps {
     projects: Array<Project>;
@@ -32,7 +33,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         null
     );
 
-    const getFooter: Function = (): ReactElement => {
+    const getFooter: GetReactElementFunction = (): ReactElement => {
         if (!BILLING_ENABLED) {
             return <></>;
         }
@@ -40,7 +41,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);
@@ -109,7 +110,7 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
         refreshFields();
     }, [isSubscriptionPlanYearly]);
 
-    const refreshFields: Function = (): void => {
+    const refreshFields: VoidFunction = (): void => {
         let formFields: Array<Field<Project>> = [
             {
                 field: {

AdminDashboard/src/Index.tsx

@@ -2,7 +2,11 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
 import { BrowserRouter } from 'react-router-dom';
-// import 'the-new-css-reset/css/reset.css';
+import Telemetry from 'CommonUI/src/Utils/Telemetry';
+
+Telemetry.init({
+    serviceName: 'AdminDashboard',
+});
 
 const root: any = ReactDOM.createRoot(
     document.getElementById('root') as HTMLElement

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -10,11 +10,12 @@ import Navigation from 'CommonUI/src/Utils/Navigation';
 import { ACCOUNTS_URL } from 'CommonUI/src/Config';
 import UiAnalytics from 'CommonUI/src/Utils/Analytics';
 import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const Logout: FunctionComponent = (): ReactElement => {
     const [error, setError] = React.useState<string | null>(null);
 
-    const logout: Function = async () => {
+    const logout: PromiseVoidFunction = async (): Promise<void> => {
         UiAnalytics.logout();
         await UserUtil.logout();
         Navigation.navigate(ACCOUNTS_URL);

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -20,6 +20,7 @@ import SubscriptionPlan from 'Common/Types/Billing/SubscriptionPlan';
 import { RadioButton } from 'CommonUI/src/Components/RadioButtons/GroupRadioButtons';
 import Toggle from 'CommonUI/src/Components/Toggle/Toggle';
 import AdminModelAPI from '../../Utils/ModelAPI';
+import { GetReactElementFunction } from 'CommonUI/src/Types/FunctionTypes';
 
 const Projects: FunctionComponent = (): ReactElement => {
     const [isSubscriptionPlanYearly, setIsSubscriptionPlanYearly] =
@@ -29,7 +30,7 @@ const Projects: FunctionComponent = (): ReactElement => {
         refreshFields();
     }, [isSubscriptionPlanYearly]);
 
-    const refreshFields: Function = (): void => {
+    const refreshFields: VoidFunction = (): void => {
         let formFields: Array<Field<Project>> = [
             {
                 field: {
@@ -155,7 +156,7 @@ const Projects: FunctionComponent = (): ReactElement => {
 
     const [fields, setFields] = useState<Array<Field<Project>>>([]);
 
-    const getFooter: Function = (): ReactElement => {
+    const getFooter: GetReactElementFunction = (): ReactElement => {
         if (!BILLING_ENABLED) {
             return <></>;
         }
@@ -163,7 +164,7 @@ const Projects: FunctionComponent = (): ReactElement => {
         return (
             <Toggle
                 title="Yearly Plan"
-                initialValue={isSubscriptionPlanYearly}
+                value={isSubscriptionPlanYearly}
                 description="(Save 20%)"
                 onChange={(value: boolean) => {
                     setIsSubscriptionPlanYearly(value);
@@ -221,16 +222,30 @@ const Projects: FunctionComponent = (): ReactElement => {
                 noItemsMessage={'No projects found.'}
                 formFields={fields}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
+                    },
+                ]}
+                columns={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -238,7 +253,6 @@ const Projects: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
                     },
                 ]}
             />

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

@@ -15,7 +15,8 @@ import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
 import { JSONObject } from 'Common/Types/JSON';
 import DropdownUtil from 'CommonUI/src/Utils/Dropdown';
 import Pill from 'CommonUI/src/Components/Pill/Pill';
-import { Green, Red } from 'Common/Types/BrandColors';
+import { Green500, Red500 } from 'Common/Types/BrandColors';
+import { PromiseVoidFunction } from 'Common/Types/FunctionTypes';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [emailServerType, setemailServerType] =
@@ -25,7 +26,7 @@ const Settings: FunctionComponent = (): ReactElement => {
 
     const [error, setError] = React.useState<string>('');
 
-    const fetchItem: Function = async (): Promise<void> => {
+    const fetchItem: PromiseVoidFunction = async (): Promise<void> => {
         setIsLoading(true);
 
         const globalConfig: GlobalConfig | null =
@@ -88,6 +89,42 @@ const Settings: FunctionComponent = (): ReactElement => {
         >
             {/* Project Settings View  */}
 
+            <CardModelDetail
+                name="Admin Notification Email"
+                cardProps={{
+                    title: 'Admin Notification Email',
+                    description:
+                        'Enter the email address where you would like to receive admin-level notifications.',
+                }}
+                isEditable={true}
+                editButtonText="Edit Email"
+                formFields={[
+                    {
+                        field: {
+                            adminNotificationEmail: true,
+                        },
+                        title: 'Admin Notification Email',
+                        fieldType: FormFieldSchemaType.Email,
+                        required: false,
+                    },
+                ]}
+                modelDetailProps={{
+                    modelType: GlobalConfig,
+                    id: 'model-detail-global-config',
+                    fields: [
+                        {
+                            field: {
+                                adminNotificationEmail: true,
+                            },
+                            title: 'Admin Notification Email',
+                            fieldType: FieldType.Email,
+                            placeholder: 'None',
+                        },
+                    ],
+                    modelId: ObjectID.getZeroObjectID(),
+                }}
+            />
+
             <CardModelDetail
                 name="Internal SMTP Settings"
                 cardProps={{
@@ -182,7 +219,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                             title: 'Use SSL / TLS',
                             stepId: 'server-info',
                             fieldType: FormFieldSchemaType.Toggle,
-                            description: 'Make email communication secure?',
+                            description:
+                                'If you use port 465, please enable this. Do not enable this if you use port 587.',
                         },
                         {
                             field: {
@@ -347,28 +385,28 @@ const Settings: FunctionComponent = (): ReactElement => {
                                         return (
                                             <Pill
                                                 text="Enabled"
-                                                color={Green}
+                                                color={Green500}
                                             />
                                         );
                                     } else if (!item['sendgridApiKey']) {
                                         return (
                                             <Pill
                                                 text="Not Enabled. Please add the API key."
-                                                color={Red}
+                                                color={Red500}
                                             />
                                         );
                                     } else if (!item['sendgridFromEmail']) {
                                         return (
                                             <Pill
                                                 text="Not Enabled. Please add the From Email."
-                                                color={Red}
+                                                color={Red500}
                                             />
                                         );
                                     } else if (!item['sendgridFromName']) {
                                         return (
                                             <Pill
                                                 text="Not Enabled. Please add the From Name."
-                                                color={Red}
+                                                color={Red500}
                                             />
                                         );
                                     }

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

@@ -9,16 +9,16 @@ import Probe from 'Model/Models/Probe';
 import FieldType from 'CommonUI/src/Components/Types/FieldType';
 import { JSONObject } from 'Common/Types/JSON';
 import OneUptimeDate from 'Common/Types/Date';
-import { Green, Red } from 'Common/Types/BrandColors';
+import { Green500, Red500 } from 'Common/Types/BrandColors';
 import Statusbubble from 'CommonUI/src/Components/StatusBubble/StatusBubble';
 import ProbeElement from 'CommonUI/src/Components/Probe/Probe';
 import IsNull from 'Common/Types/BaseDatabase/IsNull';
 import Banner from 'CommonUI/src/Components/Banner/Banner';
-import URL from 'Common/Types/API/URL';
 import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
 import { ButtonStyleType } from 'CommonUI/src/Components/Button/Button';
 import ConfirmModal from 'CommonUI/src/Components/Modal/ConfirmModal';
 import AdminModelAPI from '../../../Utils/ModelAPI';
+import { ErrorFunction, VoidFunction } from 'Common/Types/FunctionTypes';
 
 const Settings: FunctionComponent = (): ReactElement => {
     const [showKeyModal, setShowKeyModal] = useState<boolean>(false);
@@ -56,9 +56,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                 openInNewTab={true}
                 title="Need help with setting up Global Probes?"
                 description="Here is a guide which will help you get set up"
-                link={URL.fromString(
-                    'https://github.com/OneUptime/oneuptime/blob/master/Docs/Probe/CustomProbe.md'
-                )}
+                link={Route.fromString('/docs/probe/custom-probe')}
             />
 
             <ModelTable<Probe>
@@ -80,7 +78,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                 modelAPI={AdminModelAPI}
                 noItemsMessage={'No probes found.'}
                 showRefreshButton={true}
-                showFilterButton={true}
                 onBeforeCreate={(item: Probe) => {
                     item.isGlobalProbe = true;
                     return Promise.resolve(item);
@@ -130,8 +127,8 @@ const Settings: FunctionComponent = (): ReactElement => {
                         buttonStyleType: ButtonStyleType.NORMAL,
                         onClick: async (
                             item: JSONObject,
-                            onCompleteAction: Function,
-                            onError: (err: Error) => void
+                            onCompleteAction: VoidFunction,
+                            onError: ErrorFunction
                         ) => {
                             try {
                                 setCurrentProbe(item);
@@ -145,6 +142,22 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                     },
                 ]}
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            description: true,
+                        },
+                        title: 'Description',
+                        type: FieldType.Text,
+                    },
+                ]}
                 columns={[
                     {
                         field: {
@@ -152,7 +165,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Name',
                         type: FieldType.Text,
-                        isFilterable: true,
+
                         getElement: (item: JSONObject): ReactElement => {
                             return <ProbeElement probe={item} />;
                         },
@@ -163,7 +176,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Description',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -171,7 +183,6 @@ const Settings: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Status',
                         type: FieldType.Text,
-                        isFilterable: false,
                         getElement: (item: JSONObject): ReactElement => {
                             if (
                                 item &&
@@ -186,7 +197,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                                 return (
                                     <Statusbubble
                                         text={'Connected'}
-                                        color={Green}
+                                        color={Green500}
                                         shouldAnimate={true}
                                     />
                                 );
@@ -195,7 +206,7 @@ const Settings: FunctionComponent = (): ReactElement => {
                             return (
                                 <Statusbubble
                                     text={'Disconnected'}
-                                    color={Red}
+                                    color={Red500}
                                     shouldAnimate={false}
                                 />
                             );

AdminDashboard/src/Pages/Users/Index.tsx

@@ -72,16 +72,37 @@ const Users: FunctionComponent = (): ReactElement => {
                     },
                 ]}
                 showRefreshButton={true}
-                showFilterButton={true}
                 viewPageRoute={Navigation.getCurrentRoute()}
-                columns={[
+                filters={[
+                    {
+                        field: {
+                            name: true,
+                        },
+                        title: 'Full Name',
+                        type: FieldType.Text,
+                    },
+                    {
+                        field: {
+                            email: true,
+                        },
+                        title: 'Email',
+                        type: FieldType.Email,
+                    },
+                    {
+                        field: {
+                            createdAt: true,
+                        },
+                        title: 'Created At',
+                        type: FieldType.DateTime,
+                    },
+                ]}
+                columns={[
                     {
                         field: {
                             name: true,
                         },
                         title: 'Full Name',
                         type: FieldType.Text,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -89,7 +110,6 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Email',
                         type: FieldType.Email,
-                        isFilterable: true,
                     },
                     {
                         field: {
@@ -97,7 +117,6 @@ const Users: FunctionComponent = (): ReactElement => {
                         },
                         title: 'Created At',
                         type: FieldType.DateTime,
-                        isFilterable: true,
                     },
                 ]}
             />

AdminDashboard/tsconfig.json

@@ -3,7 +3,8 @@
         // these options are overrides used only by ts-node
         // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
         "compilerOptions": {
-            "module": "commonjs"
+            "module": "commonjs",
+            "resolveJsonModule": true, 
         }
     },
     "compilerOptions": {
@@ -105,6 +106,7 @@
 
         /* Completeness */
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-        "skipLibCheck": true /* Skip type checking all .d.ts files. */
+                "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+        "resolveJsonModule": true
     }
 }

App/Dockerfile.tpl

@@ -4,7 +4,6 @@
 
 # Pull base image nodejs image.
 FROM node:21.2-alpine3.18
-USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
@@ -15,6 +14,10 @@ ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
 
 
+# IF APP_VERSION is not set, set it to 1.0.0
+RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
+
+
 # Install bash. 
 RUN apk add bash && apk add curl
 
@@ -30,12 +33,16 @@ RUN mkdir /usr/src
 
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
+# Set version in ./Common/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
 RUN npm install
 COPY ./Common /usr/src/Common
 
 
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
+# Set version in ./Model/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
 RUN npm install
 COPY ./Model /usr/src/Model
 
@@ -43,6 +50,8 @@ COPY ./Model /usr/src/Model
 
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
+# Set version in ./CommonServer/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
 RUN npm install
 COPY ./CommonServer /usr/src/CommonServer
 
@@ -54,6 +63,8 @@ WORKDIR /usr/src/app
 
 # Install app dependencies
 COPY ./App/package*.json /usr/src/app/
+# Set version in ./App/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/app/package.json
 RUN npm install
 
 # Expose ports.

App/FeatureSet/ApiReference/Service/Introduction.ts

@@ -18,7 +18,7 @@ export default class ServiceHandler {
 
         pageData.featuredResources = FeaturedResources;
         pageTitle = 'Introduction';
-        pageDescription = 'API Documentation for OneUptime';
+        pageDescription = 'API Reference for OneUptime';
 
         return res.render(`${ViewsPath}/pages/index`, {
             page: page,

App/FeatureSet/ApiReference/views/main/introduction.ejs

@@ -29,7 +29,7 @@
              </svg>
           </div>
        </div>
-       <h1 class="font-bold text-xl">API Documentation</h1>
+       <h1 class="font-bold text-xl">API Reference</h1>
        <p class="lead">Use the OneUptime API to access any resource in your projects, create automated
           workflows, and more
           and

App/FeatureSet/BaseAPI/Index.ts

@@ -426,10 +426,20 @@ import LogService, {
     LogService as LogServiceType,
 } from 'CommonServer/Services/LogService';
 
-import UsageBilling from 'Model/Models/UsageBilling';
-import UsageBillingService, {
-    Service as UsageBillingServiceType,
-} from 'CommonServer/Services/UsageBillingService';
+import MonitorMetricsByMinute from 'Model/AnalyticsModels/MonitorMetricsByMinute';
+import MonitorMetricsByMinuteService, {
+    MonitorMetricsByMinuteService as MonitorMetricsByMinuteServiceType,
+} from 'CommonServer/Services/MonitorMetricsByMinuteService';
+
+import Span from 'Model/AnalyticsModels/Span';
+import SpanService, {
+    SpanService as SpanServiceType,
+} from 'CommonServer/Services/SpanService';
+
+import TelemetryUsageBilling from 'Model/Models/TelemetryUsageBilling';
+import TelemetryUsageBillingService, {
+    Service as TelemetryUsageBillingServiceType,
+} from 'CommonServer/Services/TelemetryUsageBillingService';
 import BaseAPI from 'CommonServer/API/BaseAPI';
 import BaseAnalyticsAPI from 'CommonServer/API/BaseAnalyticsAPI';
 
@@ -455,9 +465,22 @@ app.use(
 
 app.use(
     `/${APP_NAME.toLocaleLowerCase()}`,
-    new BaseAPI<UsageBilling, UsageBillingServiceType>(
-        UsageBilling,
-        UsageBillingService
+    new BaseAnalyticsAPI<
+        MonitorMetricsByMinute,
+        MonitorMetricsByMinuteServiceType
+    >(MonitorMetricsByMinute, MonitorMetricsByMinuteService).getRouter()
+);
+
+app.use(
+    `/${APP_NAME.toLocaleLowerCase()}`,
+    new BaseAnalyticsAPI<Span, SpanServiceType>(Span, SpanService).getRouter()
+);
+
+app.use(
+    `/${APP_NAME.toLocaleLowerCase()}`,
+    new BaseAPI<TelemetryUsageBilling, TelemetryUsageBillingServiceType>(
+        TelemetryUsageBilling,
+        TelemetryUsageBillingService
     ).getRouter()
 );
 

App/FeatureSet/Docs/Content/installation/local-development.md

@@ -1,4 +1,4 @@
-# Development
+# Local Development
 
 For local development you need to use docker-compose.dev.yml file. 
 

App/FeatureSet/Docs/Content/introduction/getting-started.md

@@ -0,0 +1,49 @@
+### OneUptime: The Complete Open-Source Observability Platform
+
+OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.
+
+OneUptime replaces multiple tools with one integrated platform:
+
+
+##### Uptime Monitoring
+
+Monitor the availability and response time of your online services from multiple locations around the world. Get notified via email, SMS, Slack, or other channels when something goes wrong. Replace tools like Pingdom.
+
+
+##### Status Pages
+
+Communicate with your customers and stakeholders during downtime or maintenance. Create a custom-branded status page that shows the current status and history of your services. Replace tools like StatusPage.io.
+
+
+##### Incident Management
+
+Manage incidents from start to finish with a collaborative workflow. Create incident reports, assign tasks, update stakeholders, and document resolutions. Replace tools like Incident.io.
+
+
+##### On Call and Alerts
+
+Schedule on-call shifts for your team and define escalation policies. Ensure that the right person is notified at the right time when an incident occurs. Replace tools like PagerDuty.
+
+
+##### Logs Management
+
+Collect, store, and analyze logs from your online services. Search, filter, and visualize log data to gain insights and troubleshoot issues. Replace tools like Loggly.
+
+
+##### Workflows
+
+Integrate OneUptime with your existing tools and automate your workflows. Integrate with tools like Slack, Jira, GitHub, and 5000+ more.
+
+
+##### Application Performance Monitoring
+
+Measure and optimize the performance of your online apps and services. Track key metrics such as traces, response time, throughput, error rate, and user satisfaction. Replace tools like NewRelic and DataDog.
+
+##### Error Tracking
+
+Detect and diagnose errors in your online services. Get detailed error reports with stack traces, context, and user feedback. Replace tools like Sentry.
+
+##### Reliability Autopilot
+
+Scan your code and fix performance issues and errors automatically. Get recommendations for improving the reliability of your online services.
+

App/FeatureSet/Docs/Content/probe/ip-address.md

@@ -5,5 +5,7 @@ Please whitelist the following IP's in your firewall to allow our probes to moni
 - 51.159.99.250
 - 62.210.173.51
 - 51.159.101.36
+- 172.174.206.132
+- 57.151.99.117  
 
 These IP's can change, we will let you know in advance if this happens. 

App/FeatureSet/Docs/Content/telemetry/fluentd.md

@@ -0,0 +1,114 @@
+# Use Fluentd to send telemetry data to OneUptime
+
+## Overview
+
+You can use the [Fluentd](https://www.fluentd.org/) plugin to collect logs & telemetry data from your applications and services. The plugin sends the telemetry data to the OneUptime HTTP Source. You can use the http output plugin of fluentd to send the telemetry data to the OneUptime HTTP Source. This plugin can be found here: https://docs.fluentd.org/output/http
+
+## Getting Started
+
+Fluentd supports hundreds of data sources and you can ingest logs from any of these sources into OneUptime. Some of the popular sources include:
+
+- Docker
+- Syslog
+- Apache
+- Nginx
+- MySQL
+- PostgreSQL
+- MongoDB
+- NodeJS
+- Ruby
+- Python
+- Java
+- PHP
+- Go
+- Rust 
+
+and many more. 
+
+You can find the full list of supported sources [here](https://www.fluentd.org/datasources)
+
+## Prerequisites
+
+- **Step 1: Install Fluentd on your system** - You can install Fluentd using the instructions provided [here](https://docs.fluentd.org/installation)
+- **Step 2: Sign up for OneUptime account** -  You can sign up for a free account [here](https://oneuptime.com). Please note while the account is free, log ingestion is a paid feature. You can find more details about the pricing [here](https://oneuptime.com/pricing).
+- **Step 3: Create OneUptime Project** - Once you have the account, you can create a project from the OneUptime dashboard. If you need any help with creating a project or have any questions, please reach out to us at support@oneuptime.com
+- **Step 4: Create a OneUptime Telemetry Service on OneUptime Dashboard** 
+
+On the telemetry service page, click on "Create Telemetry Service" button.
+
+![Create Service](/docs/static/images/CreateService.png)
+
+Once you create a telemetry service, click on "View Service" and you will be redirected to the telemetry service page.
+
+Click on View Service Token and copy the token. You will need this token to configure the telemetry service. **Please keep this token safe.**
+
+![View Service](/docs/static/images/ViewServiceToken.png)
+
+
+## Configuration
+
+You can use the following configuration to send the telemetry data to the OneUptime HTTP Source. You can add this configuration to the fluentd configuration file. The configuration file is usually located at `/etc/fluentd/fluent.conf` or `/etc/td-agent/td-agent.conf`. 
+
+```yaml
+# Match all patterns 
+<match **>
+  @type http
+
+  endpoint https://oneuptime.com/fluentd/logs
+  open_timeout 2
+
+  headers {"x-oneuptime-service-token":"<YOUR_SERVICE_TOKEN>"}
+
+  content_type application/json
+  json_array true
+
+  <format>
+    @type json
+  </format>
+  <buffer>
+    flush_interval 10s
+  </buffer>
+</match>
+```
+
+
+An example of full configuration file is shown below:
+
+```yaml
+####
+## Source descriptions:
+##
+
+## built-in TCP input
+## @see https://docs.fluentd.org/input/forward
+<source>
+  @type forward
+  port 24224
+  bind 0.0.0.0
+</source>
+
+<match **>
+  @type http
+
+  endpoint https://oneuptime.com/fluentd/logs
+  open_timeout 2
+
+  headers {"x-oneuptime-service-token":"<YOUR_SERVICE_TOKEN>"}
+
+  content_type application/json
+  json_array true
+
+  <format>
+    @type json
+  </format>
+  <buffer>
+    flush_interval 10s
+  </buffer>
+</match>
+```
+
+**If you're self hosting OneUptime**: If you're self hosting OneUptime you can replace the `endpoint_url` with the URL of your OneUptime instance. `http(s)://<YOUR_HOST>/fluentd/logs`
+
+## Usage
+
+Once you have added the configuration to the fluentd configuration file, you can restart the fluentd service. Once the service is restarted, the telemetry data will be sent to the OneUptime HTTP Source. You can now start seeing the telemetry data in the OneUptime dashboard. If you have any questions or need help with the configuration, please reach out to us at support@oneuptime.com

App/FeatureSet/Docs/Content/telemetry/open-telemetry.md

@@ -8,13 +8,13 @@ After you sign up to OneUptime and create a project. Click on more in the Naviga
 
 On the telemetry service page, click on "Create Telemetry Service" button.
 
-![Create Service](/Docs/Telemetry/Images/CreateService.png)
+![Create Service](/docs/static/images/CreateService.png)
 
 Once you create a telemetry service, click on "View Service" and you will be redirected to the telemetry service page.
 
 Click on View Service Token and copy the token. You will need this token to configure the telemetry service. Please keep this token safe.
 
-![View Service](/Docs/Telemetry/Images/ViewServiceToken.png)
+![View Service](/docs/static/images/ViewServiceToken.png)
 
 
 ### Step 2 - Configure the telemetry service in your application.

App/FeatureSet/Docs/Index.ts

@@ -5,18 +5,78 @@ import Express, {
     ExpressStatic,
     ExpressApplication,
 } from 'CommonServer/Utils/Express';
-import { StaticPath, ViewsPath } from './Utils/Config';
+import { ContentPath, StaticPath, ViewsPath } from './Utils/Config';
+import DocsNav, { NavGroup, NavLink } from './Utils/Nav';
+import LocalFile from 'CommonServer/Utils/LocalFile';
+import DocsRender from './Utils/Render';
+import logger from 'CommonServer/Utils/Logger';
 
 const app: ExpressApplication = Express.getExpressApp();
 
 app.get('/docs', (_req: ExpressRequest, res: ExpressResponse) => {
-    res.render(`${ViewsPath}/index`, {
-        support: false,
-        footerCards: true,
-        cta: true,
-        blackLogo: false,
-        requestDemoCta: false,
-    });
+    res.redirect('/docs/introduction/getting-started');
 });
 
+app.get(
+    '/docs/:categorypath/:pagepath',
+    async (_req: ExpressRequest, res: ExpressResponse) => {
+        try {
+            const fullPath: string =
+                `${_req.params['categorypath']}/${_req.params['pagepath']}`.toLowerCase();
+
+            // read file from Content folder.
+            let contentInMarkdown: string = await LocalFile.read(
+                `${ContentPath}/${fullPath}.md`
+            );
+
+            // remove first line from content because we dont want to show title in content. Title is already in nav.
+
+            contentInMarkdown = contentInMarkdown
+                .split('\n')
+                .slice(1)
+                .join('\n');
+
+            const renderedContent: string = await DocsRender.render(
+                contentInMarkdown
+            );
+
+            const currentCategory: NavGroup | undefined = DocsNav.find(
+                (category: NavGroup) => {
+                    return category.links.find((link: NavLink) => {
+                        return link.url.toLocaleLowerCase().includes(fullPath);
+                    });
+                }
+            );
+
+            const currrentNavLink: NavLink | undefined =
+                currentCategory?.links.find((link: NavLink) => {
+                    return link.url.toLocaleLowerCase().includes(fullPath);
+                });
+
+            if (!currentCategory || !currrentNavLink) {
+                // render not found.
+
+                res.status(404);
+                return res.render(`${ViewsPath}/NotFound`, {
+                    nav: DocsNav,
+                });
+            }
+
+            res.render(`${ViewsPath}/Index`, {
+                nav: DocsNav,
+                content: renderedContent,
+                category: currentCategory,
+                link: currrentNavLink,
+                githubPath: fullPath,
+            });
+        } catch (err) {
+            logger.error(err);
+            res.status(500);
+            return res.render(`${ViewsPath}/ServerError`, {
+                nav: DocsNav,
+            });
+        }
+    }
+);
+
 app.use('/docs/static', ExpressStatic(StaticPath));

App/FeatureSet/Docs/Static/scripts/infrastructure-agent/install-linux.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Check if this is debian based
+
+# Check if system supports apt-get
+
+if [ -x "$(command -v apt-get)" ]; then
+    # Update apt-get
+    sudo apt-get update
+    # Install build-essential
+    sudo apt-get install build-essential -y
+fi
+
+# Check if system supports yum
+if [ -x "$(command -v yum)" ]; then
+    # Update yum
+    sudo yum update
+    # Install build-essential
+    sudo yum install gcc-c++ make -y
+fi
+
+# Check if system supports apk
+if [ -x "$(command -v apk)" ]; then
+    # Update apk
+    sudo apk update
+    # Install build-essential
+    sudo apk add build-base
+fi
+
+
+# Install NVM
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+
+# Export to path
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+
+# Refresh bash 
+source ~/.bashrc
+
+# Install latest Node.js via NVM
+nvm install node
+
+# Make this nodejs version the default
+nvm alias default node
+
+# Use the default version
+nvm use default
+
+# Now install 
+npm install -g tsx
+npm install -g @oneuptime/infrastructure-agent

App/FeatureSet/Docs/Utils/Config.ts

@@ -1,2 +1,3 @@
 export const ViewsPath: string = '/usr/src/app/FeatureSet/Docs/Views';
 export const StaticPath: string = '/usr/src/app/FeatureSet/Docs/Static';
+export const ContentPath: string = '/usr/src/app/FeatureSet/Docs/Content';

App/FeatureSet/Docs/Utils/Nav.ts

@@ -0,0 +1,63 @@
+export interface NavLink {
+    title: string;
+    url: string;
+}
+
+export interface NavGroup {
+    title: string;
+    links: NavLink[];
+}
+
+const DocsNav: NavGroup[] = [
+    {
+        title: 'Introduction',
+        links: [
+            {
+                title: 'Getting Started',
+                url: '/docs/introduction/getting-started',
+            },
+        ],
+    },
+    {
+        title: 'Installation',
+        links: [
+            {
+                title: 'Local Development',
+                url: '/docs/installation/local-development',
+            },
+            {
+                title: 'Docker Compose',
+                url: '/docs/installation/docker-compose',
+            },
+            {
+                title: 'Kubernetes and Helm',
+                url: 'https://artifacthub.io/packages/helm/oneuptime/oneuptime',
+            },
+        ],
+    },
+    {
+        title: 'Monitor',
+        links: [
+            {
+                title: 'JavaScript Expressions',
+                url: '/docs/monitor/javascript-expression',
+            },
+        ],
+    },
+    {
+        title: 'Probe',
+        links: [
+            { title: 'Custom Probes', url: '/docs/probe/custom-probe' },
+            { title: 'IP Addresses', url: '/docs/probe/ip-address' },
+        ],
+    },
+    {
+        title: 'Telemetry',
+        links: [
+            { title: 'OpenTelemetry', url: '/docs/telemetry/open-telemetry' },
+            { title: 'Fluentd', url: '/docs/telemetry/fluentd' },
+        ],
+    },
+];
+
+export default DocsNav;

App/FeatureSet/Docs/Utils/Render.ts

@@ -0,0 +1,50 @@
+import { Renderer, marked } from 'marked';
+
+export default class DocsRender {
+    public static async render(markdownContent: string): Promise<string> {
+        const renderer: Renderer = this.getBlogRenderer();
+
+        return await marked(markdownContent, {
+            renderer: renderer,
+        });
+    }
+
+    private static getBlogRenderer(): Renderer {
+        const renderer: Renderer = new Renderer();
+
+        renderer.paragraph = function (text) {
+            return `<p class="mt-2 mb-2 leading-8 text-gray-600">${text}</p>`;
+        };
+
+        renderer.blockquote = function (quote) {
+            return `<blockquote class="p-4 pt-1 pb-1 my-4 border-s-4 border-indigo-500">
+            <div class="leading-8 text-gray-600">${quote}</div>
+        </blockquote>`;
+        };
+
+        renderer.image = function (href, _title, text) {
+            return `<img src="${href}" alt="${text}" class="rounded-md shadow-md" />`;
+        };
+
+        renderer.code = function (code, language) {
+            return `<pre class="language-${language} rounded-md"><code class="language-${language} rounded-md">${code}</code></pre>`;
+        };
+
+        renderer.heading = function (text, level) {
+            if (level === 1) {
+                return `<h1 class="my-5 mt-8 text-4xl font-bold tracking-tight text-gray-800">${text}</h1>`;
+            } else if (level === 2) {
+                return `<h2 class="my-5  mt-8 text-3xl font-bold tracking-tight text-gray-800">${text}</h2>`;
+            } else if (level === 3) {
+                return `<h3 class="my-5  mt-8 text-2xl font-bold tracking-tight text-gray-800">${text}</h3>`;
+            } else if (level === 4) {
+                return `<h4 class="my-5  mt-8 text-xl font-bold tracking-tight text-gray-800">${text}</h4>`;
+            } else if (level === 5) {
+                return `<h5 class="my-5  mt-8 text-lg font-bold tracking-tight text-gray-800">${text}</h5>`;
+            }
+            return `<h6 class="my-5 tracking-tight font-bold text-gray-800">${text}</h6>`;
+        };
+
+        return renderer;
+    }
+}

App/FeatureSet/Docs/Views/Index.ejs

@@ -0,0 +1,34 @@
+<html lang="en" class="h-full antialiased __variable_e66fe9 __variable_b436a8 light nbuofyfqi idc0_350"
+    style="color-scheme: light;">
+
+<head>
+    <%- include('./Partials/Head.ejs') %>
+</head>
+
+<body class="flex min-h-full bg-white dark:bg-slate-900">
+    
+    <div class="flex w-full flex-col">
+        <%- include('./Partials/Header.ejs') %>
+       
+        <div class="relative mx-auto flex w-full max-w-8xl flex-auto justify-center sm:px-2 lg:px-8 xl:px-12">
+            <div class="hidden lg:relative lg:block lg:flex-none">
+                <div class="absolute inset-y-0 right-0 w-[50vw] bg-slate-50 dark:hidden"></div>
+                <div
+                    class="absolute bottom-0 right-0 top-16 hidden h-12 w-px bg-gradient-to-t from-slate-800 dark:block">
+                </div>
+                <div class="absolute bottom-0 right-0 top-28 hidden w-px bg-slate-800 dark:block"></div>
+                <div
+                    class="sticky top-[4.75rem] -ml-0.5 h-[calc(100vh-4.75rem)] w-64 overflow-y-auto overflow-x-hidden py-16 pl-0.5 pr-8 xl:w-72 xl:pr-16">
+                  <%- include('./Partials/Nav.ejs') %>
+                </div>
+            </div>
+            <div class="min-w-0 max-w-2xl flex-auto px-4 py-16 lg:max-w-none lg:pl-8 lg:pr-0 xl:px-16">
+                <%- include('./Partials/Content.ejs', { category: category, link: link, content: content }) %>
+                <%- include('./Partials/OpenSourceCommitment.ejs', { githubPath: githubPath }) %>
+            </div>
+         
+        </div>
+    </div>
+</body>
+
+</html>

App/FeatureSet/Docs/Views/Partials/Content.ejs

@@ -0,0 +1,11 @@
+<article>
+    <header class="mb-9 space-y-1">
+        <p class="text-base font-bold text-sky-500"><%- category.title %></p>
+        <h1 class="font-bold text-3xl tracking-tight text-slate-900 dark:text-white"><%- link.title %>
+        </h1>
+    </header>
+    <div
+        class="prose prose-slate max-w-none dark:prose-invert dark:text-slate-400 prose-headings:scroll-mt-28 prose-headings:font-display prose-headings:font-normal lg:prose-headings:scroll-mt-[8.5rem] prose-lead:text-slate-500 dark:prose-lead:text-slate-400 prose-a:font-semibold dark:prose-a:text-sky-400 prose-a:no-underline prose-a:shadow-[inset_0_-2px_0_0_var(--tw-prose-background,#fff),inset_0_calc(-1*(var(--tw-prose-underline-size,4px)+2px))_0_0_var(--tw-prose-underline,theme(colors.sky.300))] hover:prose-a:[--tw-prose-underline-size:6px] dark:[--tw-prose-background:theme(colors.slate.900)] dark:prose-a:shadow-[inset_0_calc(-1*var(--tw-prose-underline-size,2px))_0_0_var(--tw-prose-underline,theme(colors.sky.800))] dark:hover:prose-a:[--tw-prose-underline-size:6px] prose-pre:rounded-xl prose-pre:bg-slate-900 prose-pre:shadow-lg dark:prose-pre:bg-slate-800/60 dark:prose-pre:shadow-none dark:prose-pre:ring-1 dark:prose-pre:ring-slate-300/10 dark:prose-hr:border-slate-800">
+        <%- content %>
+    </div>
+</article>

App/FeatureSet/Docs/Views/Partials/Head.ejs

@@ -0,0 +1,15 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="preload" href="/docs/static/fonts/f1.woff2" as="font" crossorigin="" type="font/woff2">
+<link rel="preload" href="/docs/static/fonts/f2.woff2" as="font" crossorigin="" type="font/woff2">
+<link rel="stylesheet" href="/docs/static/css/style.css" crossorigin="" data-precedence="next">
+<title>OneUptime Documentation</title>
+<meta name="description"
+    content="Cache every single thing your app could ever do ahead of time, so your code never even has to run at all.">
+<link rel="icon" href="/favicon.ico" type="image/x-icon" sizes="16x16">
+<meta name="next-size-adjust">
+<link rel="stylesheet" href="/docs/static/css/style.css" crossorigin="" data-precedence="next" />
+<script src="https://cdn.tailwindcss.com"></script>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/a11y-dark.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
+<script>hljs.highlightAll();</script>

App/FeatureSet/Docs/Views/Partials/Header.ejs

@@ -0,0 +1,17 @@
+<header
+    class="sticky top-0 z-50 flex flex-none flex-wrap items-center justify-between bg-white px-4 py-5 shadow-md shadow-slate-900/5 transition duration-500 sm:px-6 lg:px-8 dark:shadow-none dark:bg-slate-900/95 dark:backdrop-blur dark:[@supports(backdrop-filter:blur(0))]:bg-slate-900/75">
+   
+    <div class="relative flex flex-grow basis-0 items-center"><a aria-label="Home page" href="/">
+        <img class="h-8 w-auto" src="/img/3-transparent.svg" alt="">
+    </a></div>
+    
+    <div class="relative flex basis-0 justify-end gap-6 sm:gap-8 md:flex-grow">
+        <a class="group" aria-label="GitHub" target="_blank" href="https://github.com/oneuptime/oneuptime"><svg
+                aria-hidden="true" viewBox="0 0 16 16"
+                class="h-6 w-6 fill-slate-400 group-hover:fill-slate-500 dark:group-hover:fill-slate-300">
+                <path
+                    d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z">
+                </path>
+            </svg></a>
+    </div>
+</header>

App/FeatureSet/Docs/Views/Partials/Nav.ejs

@@ -0,0 +1,33 @@
+<nav class="text-base lg:text-sm">
+        <ul role="list" class="space-y-9">
+                <% for(var i=0; i<nav.length; i++) {%>
+                        <li>
+                                <h2 class="font-display font-medium text-slate-900 dark:text-white"><%- nav[i].title -%>
+                                </h2>
+
+                                <ul role="list"
+                                        class="mt-2 space-y-2 border-l-2 border-slate-100 lg:mt-4 lg:space-y-4 lg:border-slate-200 dark:border-slate-800">
+                                        <% if(nav[i].links.length> 0) { %>
+                                                <% for(var j=0; j<nav[i].links.length; j++) {%>
+                                                        <% if(link.url===nav[i].links[j].url) { %>
+                                                                <li class="relative"><a
+                                                                                class="block w-full pl-3.5 before:pointer-events-none before:absolute before:-left-1 before:top-1/2 before:h-1.5 before:w-1.5 before:-translate-y-1/2 before:rounded-full font-semibold text-sky-500 before:bg-sky-500"
+                                                                                href="<%- nav[i].links[j].url -%>"><%-
+                                                                                        nav[i].links[j].title -%></a>
+                                                                </li>
+                                                                <% } else { %>
+                                                                        <li class="relative"><a
+                                                                                        class="block w-full pl-3.5 before:pointer-events-none before:absolute before:-left-1 before:top-1/2 before:h-1.5 before:w-1.5 before:-translate-y-1/2 before:rounded-full text-slate-500 before:hidden before:bg-slate-300 hover:text-slate-600 hover:before:block dark:text-slate-400 dark:before:bg-slate-700 dark:hover:text-slate-300"
+                                                                                        href="<%- nav[i].links[j].url -%>"><%-
+                                                                                        nav[i].links[j].title -%></a></li>
+
+                                                                        <% } %>
+                                                                                <% } %>
+                                                                                        <% } %>
+
+                                </ul>
+                        </li>
+                        <% } %>
+
+        </ul>
+</nav>

App/FeatureSet/Docs/Views/Partials/OpenSourceCommitment.ejs

@@ -0,0 +1,22 @@
+<div class=" font-medium leading-6 text-gray-900 mt-24">Our Commitment to Open Source
+</div>
+
+<div class="mt-2 text-gray-900">
+    <ul role="list" class="divide-y divide-gray-100 rounded-md border border-gray-200">
+        <li class="items-center justify-between py-4 pl-4 pr-5 leading-6">
+            <div class="items-center">
+
+                <div class="p-1 space-y-2">
+                    
+                   
+
+                        <div>Everything we do at OneUptime is 100% open-source. You can contribute and improve this post here <a class="underline"
+                            target="_blank"
+                            href="https://github.com/OneUptime/oneuptime/tree/master/App/FeatureSet/Docs/Content/<%- githubPath -%>.md">here.</a></div>
+
+                </div>
+            </div>
+        </li>
+
+    </ul>
+</div>

App/FeatureSet/Docs/Views/Partials/Pagination.ejs

@@ -0,0 +1,13 @@
+<dl class="mt-12 flex border-t border-slate-200 pt-6 dark:border-slate-800">
+    <div class="ml-auto text-right">
+        <dt class="font-display text-sm font-medium text-slate-900 dark:text-white">Next</dt>
+        <dd class="mt-1"><a
+                class="flex items-center gap-x-1 text-base font-semibold text-slate-500 hover:text-slate-600 dark:text-slate-400 dark:hover:text-slate-300"
+                href="/docs/installation">Installation<svg viewBox="0 0 16 16" aria-hidden="true"
+                    class="h-4 w-4 flex-none fill-current">
+                    <path
+                        d="m9.182 13.423-1.17-1.16 3.505-3.505H3V7.065h8.517l-3.506-3.5L9.181 2.4l5.512 5.511-5.511 5.512Z">
+                    </path>
+                </svg></a></dd>
+    </div>
+</dl>

App/FeatureSet/Home/API/BlogAPI.ts

@@ -0,0 +1,89 @@
+import Express, {
+    ExpressApplication,
+    ExpressRequest,
+    ExpressResponse,
+} from 'CommonServer/Utils/Express';
+import BlogPostUtil, { BlogPost, BlogPostHeader } from '../Utils/BlogPost';
+import { ViewsPath } from '../Utils/Config';
+import logger from 'CommonServer/Utils/Logger';
+import ServerErrorUtil from '../Utils/ServerError';
+import NotFoundUtil from '../Utils/NotFound';
+import Text from 'Common/Types/Text';
+
+const app: ExpressApplication = Express.getExpressApp();
+
+app.get(
+    '/blog/post/:file',
+    async (req: ExpressRequest, res: ExpressResponse) => {
+        try {
+            const fileName: string = req.params['file'] as string;
+
+            const blogPost: BlogPost | null = await BlogPostUtil.getBlogPost(
+                fileName
+            );
+
+            if (!blogPost) {
+                return NotFoundUtil.renderNotFound(res);
+            }
+
+            res.render(`${ViewsPath}/Blog/Post`, {
+                support: false,
+                footerCards: true,
+                cta: true,
+                blackLogo: false,
+                requestDemoCta: false,
+                blogPost: blogPost,
+            });
+        } catch (e) {
+            logger.error(e);
+            return ServerErrorUtil.renderServerError(res);
+        }
+    }
+);
+
+// List all blog posts with tag
+
+app.get(
+    '/blog/tag/:tagName',
+    async (req: ExpressRequest, res: ExpressResponse) => {
+        try {
+            const tagName: string = req.params['tagName'] as string;
+
+            const blogPosts: Array<BlogPostHeader> =
+                await BlogPostUtil.getBlogPostList(tagName);
+
+            res.render(`${ViewsPath}/Blog/ListByTag`, {
+                support: false,
+                footerCards: true,
+                cta: true,
+                blackLogo: false,
+                requestDemoCta: false,
+                blogPosts: blogPosts,
+                tagName: Text.fromDashesToPascalCase(tagName),
+            });
+        } catch (e) {
+            logger.error(e);
+            return ServerErrorUtil.renderServerError(res);
+        }
+    }
+);
+
+// main blog page
+app.get('/blog', async (_req: ExpressRequest, res: ExpressResponse) => {
+    try {
+        const blogPosts: Array<BlogPostHeader> =
+            await BlogPostUtil.getBlogPostList();
+
+        res.render(`${ViewsPath}/Blog/List`, {
+            support: false,
+            footerCards: true,
+            cta: true,
+            blackLogo: false,
+            requestDemoCta: false,
+            blogPosts: blogPosts,
+        });
+    } catch (e) {
+        logger.error(e);
+        return ServerErrorUtil.renderServerError(res);
+    }
+});

App/FeatureSet/Home/Index.ts

@@ -16,6 +16,11 @@ import { JSONObject } from 'Common/Types/JSON';
 import HTTPResponse from 'Common/Types/API/HTTPResponse';
 import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse';
 import { StaticPath, ViewsPath } from './Utils/Config';
+import NotFoundUtil from './Utils/NotFound';
+import ServerErrorUtil from './Utils/ServerError';
+
+// improt API
+import './API/BlogAPI';
 
 const app: ExpressApplication = Express.getExpressApp();
 
@@ -30,6 +35,16 @@ app.get('/', (_req: ExpressRequest, res: ExpressResponse) => {
     });
 });
 
+app.get(
+    '/infrastructure-agent/install.sh',
+    (_req: ExpressRequest, res: ExpressResponse) => {
+        // fetch the file from https://raw.githubusercontent.com/oneuptime/infrastructure-agent/release/Scripts/Install/Linux.sh  and send it as response
+        res.redirect(
+            'https://raw.githubusercontent.com/OneUptime/oneuptime/release/InfrastructureAgent/Scripts/Install/Linux.sh'
+        );
+    }
+);
+
 app.get('/support', async (_req: ExpressRequest, res: ExpressResponse) => {
     res.render(`${ViewsPath}/support`);
 });
@@ -221,6 +236,15 @@ app.get('/pricing', (_req: ExpressRequest, res: ExpressResponse) => {
                         enterprise: true,
                     },
                 },
+                {
+                    name: 'VM or Server Monitoring',
+                    plans: {
+                        free: true,
+                        growth: true,
+                        scale: true,
+                        enterprise: true,
+                    },
+                },
                 {
                     name: 'Container Monitoring',
                     plans: {
@@ -231,15 +255,6 @@ app.get('/pricing', (_req: ExpressRequest, res: ExpressResponse) => {
                     },
                 },
 
-                {
-                    name: 'VM or Server Monitoring',
-                    plans: {
-                        free: 'Coming Soon',
-                        growth: 'Coming Soon',
-                        scale: 'Coming Soon',
-                        enterprise: 'Coming Soon',
-                    },
-                },
                 {
                     name: 'Network Monitoring',
                     plans: {
@@ -495,6 +510,10 @@ app.get(
     }
 );
 
+app.get('/product/apm', (_req: ExpressRequest, res: ExpressResponse) => {
+    res.render(`${ViewsPath}/apm`);
+});
+
 app.get('/status', (_req: ExpressRequest, res: ExpressResponse) => {
     res.status(200).send({ status: 'ok' });
 });
@@ -869,25 +888,17 @@ app.get('/compare/:product', (req: ExpressRequest, res: ExpressResponse) => {
     );
 
     if (!productConfig) {
-        res.status(404);
-        res.render(`${ViewsPath}/not-found.ejs`, {
-            footerCards: false,
-            support: false,
-            cta: false,
-            blackLogo: false,
-            requestDemoCta: false,
-        });
-    } else {
-        res.render(`${ViewsPath}/product-compare.ejs`, {
-            support: false,
-            footerCards: true,
-            cta: true,
-            blackLogo: false,
-            requestDemoCta: false,
-            productConfig,
-            onlyShowCompareTable: false,
-        });
+        return NotFoundUtil.renderNotFound(res);
     }
+    res.render(`${ViewsPath}/product-compare.ejs`, {
+        support: false,
+        footerCards: true,
+        cta: true,
+        blackLogo: false,
+        requestDemoCta: false,
+        productConfig,
+        onlyShowCompareTable: false,
+    });
 });
 
 // Generate sitemap
@@ -971,12 +982,9 @@ app.use(
 );
 
 app.get('/*', (_req: ExpressRequest, res: ExpressResponse) => {
-    res.status(404);
-    res.render(`${ViewsPath}/not-found.ejs`, {
-        footerCards: false,
-        support: false,
-        cta: false,
-        blackLogo: false,
-        requestDemoCta: false,
-    });
+    return NotFoundUtil.renderNotFound(res);
+});
+
+app.get('/server-error', (_req: ExpressRequest, res: ExpressResponse) => {
+    return ServerErrorUtil.renderServerError(res);
 });

App/FeatureSet/Home/Utils/BlogPost.ts

@@ -0,0 +1,489 @@
+import HTTPResponse from 'Common/Types/API/HTTPResponse';
+import API from 'Common/Utils/API';
+import URL from 'Common/Types/API/URL';
+import { marked, Renderer } from 'marked';
+import { JSONArray, JSONObject, JSONObjectOrArray } from 'Common/Types/JSON';
+import BaseModel from 'Common/Models/BaseModel';
+import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel';
+import LocalCache from 'CommonServer/Infrastructure/LocalCache';
+import JSONFunctions from 'Common/Types/JSONFunctions';
+import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse';
+import OneUptimeDate from 'Common/Types/Date';
+import BadDataException from 'Common/Types/Exception/BadDataException';
+import Text from 'Common/Types/Text';
+
+export interface BlogPostAuthor {
+    username: string;
+    githubUrl: string;
+    profileImageUrl: string;
+    name: string;
+}
+
+export interface BlogPostBaseProps {
+    title: string;
+    description: string;
+
+    formattedPostDate: string;
+    fileName: string;
+    tags: string[];
+    postDate: string;
+    blogUrl: string;
+}
+
+export interface BlogPostHeader extends BlogPostBaseProps {
+    authorGitHubUsername: string;
+}
+
+export interface BlogPost extends BlogPostBaseProps {
+    htmlBody: string;
+    markdownBody: string;
+    socialMediaImageUrl: string;
+    author: BlogPostAuthor | null;
+}
+
+const GitHubRawUrl: string =
+    'https://raw.githubusercontent.com/oneuptime/blog/master';
+
+export default class BlogPostUtil {
+    public static async getBlogPostList(
+        tagName?: string | undefined
+    ): Promise<BlogPostHeader[]> {
+        const fileUrl: URL = URL.fromString(`${GitHubRawUrl}/Blogs.json`);
+
+        const fileData:
+            | HTTPResponse<
+                  | JSONObjectOrArray
+                  | BaseModel
+                  | BaseModel[]
+                  | AnalyticsBaseModel
+                  | AnalyticsBaseModel[]
+              >
+            | HTTPErrorResponse = await API.get(fileUrl);
+
+        if (fileData.isFailure()) {
+            throw fileData as HTTPErrorResponse;
+        }
+
+        let jsonContent: string | JSONArray =
+            (fileData.data as string | JSONArray) || [];
+
+        if (typeof jsonContent === 'string') {
+            jsonContent = JSONFunctions.parseJSONArray(jsonContent);
+        }
+
+        const blogs: Array<JSONObject> = JSONFunctions.deserializeArray(
+            jsonContent as Array<JSONObject>
+        ).reverse(); // reverse so new content comes first
+
+        const resultList: Array<BlogPostHeader> = [];
+
+        for (const blog of blogs) {
+            const fileName: string = blog['post'] as string;
+            const formattedPostDate: string =
+                this.getFormattedPostDateFromFileName(fileName);
+            const postDate: string = this.getPostDateFromFileName(fileName);
+
+            resultList.push({
+                title: blog['title'] as string,
+                description: blog['description'] as string,
+                fileName,
+                formattedPostDate,
+                postDate,
+                tags: blog['tags'] as string[],
+                authorGitHubUsername: blog['authorGitHubUsername'] as string,
+                blogUrl: `/blog/post/${fileName}`,
+            });
+        }
+
+        if (tagName) {
+            return resultList.filter((blog: BlogPostHeader) => {
+                return blog.tags
+                    .map((item: string) => {
+                        return Text.replaceAll(item.toLowerCase(), ' ', '-');
+                    })
+                    .includes(tagName);
+            });
+        }
+
+        return resultList;
+    }
+
+    public static async getBlogPost(
+        fileName: string
+    ): Promise<BlogPost | null> {
+        let blogPost: BlogPost | null = this.getBlogPostFromCache(fileName);
+
+        // if (blogPost) {
+        //     return Promise.resolve(blogPost);
+        // }
+
+        blogPost = await this.getBlogPostFromGitHub(fileName);
+
+        // save this to cache
+        LocalCache.setJSON(
+            'blog',
+            fileName,
+            JSONFunctions.serialize(blogPost as any)
+        );
+
+        return blogPost;
+    }
+
+    public static async getNameOfGitHubUser(username: string): Promise<string> {
+        const fileUrl: URL = URL.fromString(
+            `https://api.github.com/users/${username}`
+        );
+
+        const fileData:
+            | HTTPResponse<
+                  | JSONObjectOrArray
+                  | BaseModel
+                  | BaseModel[]
+                  | AnalyticsBaseModel
+                  | AnalyticsBaseModel[]
+              >
+            | HTTPErrorResponse = await API.get(fileUrl);
+
+        if (fileData.isFailure()) {
+            throw fileData as HTTPErrorResponse;
+        }
+
+        const name: string =
+            (fileData.data as JSONObject)?.['name']?.toString() || '';
+        return name;
+    }
+
+    public static async getGitHubMarkdownFileContent(
+        githubPath: string
+    ): Promise<string | null> {
+        const fileUrl: URL = URL.fromString(`${GitHubRawUrl}/${githubPath}`);
+
+        const fileData:
+            | HTTPResponse<
+                  | JSONObjectOrArray
+                  | BaseModel
+                  | BaseModel[]
+                  | AnalyticsBaseModel
+                  | AnalyticsBaseModel[]
+              >
+            | HTTPErrorResponse = await API.get(fileUrl);
+
+        if (fileData.isFailure()) {
+            if ((fileData as HTTPErrorResponse).statusCode === 404) {
+                return null;
+            }
+
+            throw fileData as HTTPErrorResponse;
+        }
+
+        const markdownContent: string =
+            (fileData.data as JSONObject)?.['data']?.toString() || '';
+        return markdownContent;
+    }
+
+    public static async getTags(): Promise<string[]> {
+        // check if tags are in cache
+        let tags: string[] = LocalCache.getJSON(
+            'blog-tags',
+            'tags'
+        ) as string[];
+
+        if (tags && tags.length > 0) {
+            return tags;
+        }
+
+        tags = await this.getAllTagsFromGitHub();
+
+        // save this to cache
+
+        LocalCache.setJSON(
+            'blog-tags',
+            'tags',
+            JSONFunctions.serialize(tags as any)
+        );
+
+        return tags;
+    }
+
+    public static async getAllTagsFromGitHub(): Promise<string[]> {
+        const tagsMarkdownContent: string | null =
+            await this.getGitHubMarkdownFileContent('Tags.md');
+
+        if (!tagsMarkdownContent) {
+            return [];
+        }
+
+        const tags: Array<string> = tagsMarkdownContent
+            .split('\n')
+            .map((tag: string) => {
+                return tag.trim();
+            })
+            .filter((tag: string) => {
+                return tag.startsWith('-');
+            })
+            .map((tag: string) => {
+                return tag.replace('-', '').trim();
+            });
+
+        return tags;
+    }
+
+    public static async getBlogPostFromGitHub(
+        fileName: string
+    ): Promise<BlogPost | null> {
+        const fileUrl: URL = URL.fromString(
+            `${GitHubRawUrl}/posts/${fileName}/README.md`
+        );
+
+        const postDate: string = this.getPostDateFromFileName(fileName);
+        const formattedPostDate: string =
+            this.getFormattedPostDateFromFileName(fileName);
+
+        const fileData:
+            | HTTPResponse<
+                  | JSONObjectOrArray
+                  | BaseModel
+                  | BaseModel[]
+                  | AnalyticsBaseModel
+                  | AnalyticsBaseModel[]
+              >
+            | HTTPErrorResponse = await API.get(fileUrl);
+
+        if (fileData.isFailure()) {
+            if ((fileData as HTTPErrorResponse).statusCode === 404) {
+                return null;
+            }
+
+            throw fileData as HTTPErrorResponse;
+        }
+
+        let markdownContent: string =
+            (fileData.data as JSONObject)?.['data']?.toString() || '';
+
+        const blogPostAuthor: BlogPostAuthor | null =
+            await this.getAuthorFromFileContent(markdownContent);
+
+        const title: string = this.getTitleFromFileContent(markdownContent);
+        const description: string =
+            this.getDescriptionFromFileContent(markdownContent);
+        const tags: Array<string> =
+            this.getTagsFromFileContent(markdownContent);
+
+        markdownContent = this.getPostFromMarkdown(markdownContent);
+
+        const renderer: Renderer = this.getBlogRenderer();
+
+        const htmlBody: string = await marked(markdownContent, {
+            renderer: renderer,
+        });
+
+        const blogPost: BlogPost = {
+            title,
+            description,
+            author: blogPostAuthor,
+            htmlBody,
+            markdownBody: markdownContent,
+            fileName,
+            tags,
+            postDate,
+            formattedPostDate,
+            socialMediaImageUrl: `${GitHubRawUrl}/posts/${fileName}/social-media.png`,
+            blogUrl: `https://oneuptime.com/blog/post/${fileName}`, // this has to be oneuptime.com because its used in twitter cards and faceboomk cards. Please dont change this.
+        };
+
+        return blogPost;
+    }
+
+    private static getPostDateFromFileName(fileName: string): string {
+        const year: string | undefined = fileName.split('-')[0];
+        const month: string | undefined = fileName.split('-')[1];
+        const day: string | undefined = fileName.split('-')[2];
+
+        if (!year || !month || !day) {
+            throw new BadDataException('Invalid file name');
+        }
+
+        return `${year}-${month}-${day}`;
+    }
+
+    private static getFormattedPostDateFromFileName(fileName: string): string {
+        // file name is of the format YYYY-MM-DD-Title.md
+        const year: string | undefined = fileName.split('-')[0];
+        const month: string | undefined = fileName.split('-')[1];
+        const day: string | undefined = fileName.split('-')[2];
+
+        if (!year || !month || !day) {
+            throw new BadDataException('Invalid file name');
+        }
+
+        const date: Date = OneUptimeDate.getDateFromYYYYMMDD(year, month, day);
+        return OneUptimeDate.getDateAsLocalFormattedString(date, true);
+    }
+
+    private static getBlogRenderer(): Renderer {
+        const renderer: Renderer = new Renderer();
+
+        renderer.paragraph = function (text) {
+            return `<p class="mt-2 mb-2 leading-8 text-gray-600">${text}</p>`;
+        };
+
+        renderer.blockquote = function (quote) {
+            return `<blockquote class="p-4 pt-1 pb-1 my-4 border-s-4 border-indigo-500">
+            <div class="leading-8 text-gray-600">${quote}</div>
+        </blockquote>`;
+        };
+
+        renderer.code = function (code, language) {
+            return `<pre class="language-${language} rounded-md"><code class="language-${language} rounded-md">${code}</code></pre>`;
+        };
+
+        renderer.heading = function (text, level) {
+            if (level === 1) {
+                return `<h1 class="my-5 mt-8 text-4xl font-bold tracking-tight text-gray-800">${text}</h1>`;
+            } else if (level === 2) {
+                return `<h2 class="my-5  mt-8 text-3xl font-bold tracking-tight text-gray-800">${text}</h2>`;
+            } else if (level === 3) {
+                return `<h3 class="my-5  mt-8 text-2xl font-bold tracking-tight text-gray-800">${text}</h3>`;
+            } else if (level === 4) {
+                return `<h4 class="my-5  mt-8 text-xl font-bold tracking-tight text-gray-800">${text}</h4>`;
+            } else if (level === 5) {
+                return `<h5 class="my-5  mt-8 text-lg font-bold tracking-tight text-gray-800">${text}</h5>`;
+            }
+            return `<h6 class="my-5 tracking-tight font-bold text-gray-800">${text}</h6>`;
+        };
+
+        return renderer;
+    }
+
+    private static getPostFromMarkdown(markdownContent: string): string {
+        const authorLine: string | undefined = markdownContent
+            .split('\n')
+            .find((line: string) => {
+                return line.startsWith('Author:');
+            });
+        const titleLine: string | undefined = markdownContent
+            .split('\n')
+            .find((line: string) => {
+                return line.startsWith('#');
+            });
+        const descriptionLine: string | undefined =
+            markdownContent.split('\n').find((line: string) => {
+                return line.startsWith('Description:');
+            }) || '';
+
+        const tagsLine: string | undefined =
+            markdownContent.split('\n').find((line: string) => {
+                return line.startsWith('Tags:');
+            }) || '';
+
+        if (!authorLine && !titleLine && !descriptionLine && !tagsLine) {
+            return markdownContent;
+        }
+
+        const lines: string[] = markdownContent.split('\n');
+
+        if (authorLine) {
+            const authorLineIndex: number = lines.indexOf(authorLine);
+            lines.splice(authorLineIndex, 1);
+        }
+
+        if (titleLine) {
+            const titleLineIndex: number = lines.indexOf(titleLine);
+            lines.splice(titleLineIndex, 1);
+        }
+
+        if (descriptionLine) {
+            const descriptionLineIndex: number = lines.indexOf(descriptionLine);
+            lines.splice(descriptionLineIndex, 1);
+        }
+
+        if (tagsLine) {
+            const tagsLineIndex: number = lines.indexOf(tagsLine);
+            lines.splice(tagsLineIndex, 1);
+        }
+
+        return lines.join('\n').trim();
+    }
+
+    public static getBlogPostFromCache(fileName: string): BlogPost | null {
+        const blogPost: BlogPost | null = LocalCache.getJSON(
+            'blog',
+            fileName
+        ) as BlogPost | null;
+        return blogPost;
+    }
+
+    public static getTitleFromFileContent(fileContent: string): string {
+        // title is the first line that stars with "#"
+
+        const titleLine: string =
+            fileContent
+                .split('\n')
+                .find((line: string) => {
+                    return line.startsWith('#');
+                })
+                ?.replace('#', '') || 'OneUptime Blog';
+
+        return titleLine;
+    }
+
+    public static getTagsFromFileContent(fileContent: string): string[] {
+        // tags is the first line that starts with "Tags:"
+
+        const tagsLine: string | undefined =
+            fileContent
+                .split('\n')
+                .find((line: string) => {
+                    return line.startsWith('Tags:');
+                })
+                ?.replace('Tags:', '') || '';
+
+        return tagsLine.split(',').map((tag: string) => {
+            return tag.trim();
+        });
+    }
+
+    public static getDescriptionFromFileContent(fileContent: string): string {
+        // description is the first line that starts with ">"
+
+        const descriptionLine: string | undefined =
+            fileContent
+                .split('\n')
+                .find((line: string) => {
+                    return line.startsWith('Description:');
+                })
+                ?.replace('Description:', '') || '';
+
+        return descriptionLine;
+    }
+
+    public static async getAuthorFromFileContent(
+        fileContent: string
+    ): Promise<BlogPostAuthor | null> {
+        // author line is in this format: Author: [username](githubUrl)
+
+        const authorLine: string | undefined = fileContent
+            .split('\n')
+            .find((line: string) => {
+                return line.startsWith('Author:');
+            });
+        const authorUsername: string | undefined = authorLine
+            ?.split('[')[1]
+            ?.split(']')[0];
+        const authorGitHubUrl: string | undefined = authorLine
+            ?.split('(')[1]
+            ?.split(')')[0];
+        const authorProfileImageUrl: string = `https://avatars.githubusercontent.com/${authorUsername}`;
+
+        if (!authorUsername || !authorGitHubUrl) {
+            return null;
+        }
+
+        return {
+            username: authorUsername,
+            githubUrl: authorGitHubUrl,
+            profileImageUrl: authorProfileImageUrl,
+            name: await this.getNameOfGitHubUser(authorUsername),
+        };
+    }
+}

App/FeatureSet/Home/Utils/Config.ts

@@ -1,2 +1,2 @@
-export const ViewsPath: string = '/usr/src/app/FeatureSet/Home/views';
+export const ViewsPath: string = '/usr/src/app/FeatureSet/Home/Views';
 export const StaticPath: string = '/usr/src/app/FeatureSet/Home/Static';

App/FeatureSet/Home/Utils/NotFound.ts

@@ -0,0 +1,15 @@
+import { ExpressResponse } from 'CommonServer/Utils/Express';
+import { ViewsPath } from './Config';
+
+export default class NotFoundUtil {
+    public static renderNotFound(res: ExpressResponse): void {
+        res.status(404);
+        res.render(`${ViewsPath}/not-found.ejs`, {
+            footerCards: false,
+            support: false,
+            cta: false,
+            blackLogo: false,
+            requestDemoCta: false,
+        });
+    }
+}

App/FeatureSet/Home/Utils/ProductCompare.ts

@@ -58,7 +58,7 @@ export default (product: string): Product => {
                 {
                     question:
                         'Do I need to buy a monitoring solution to monitor my resources?',
-                    answer: 'PagerDuty needs a seperate monitoring solution that you need to buy which then sends data to PagerDuty for on-call and incident management. OneUptime has a built in monitoring solution as well. You use one product, your team has one dashboard, save time, simplify ops.',
+                    answer: 'PagerDuty needs a separate monitoring solution that you need to buy which then sends data to PagerDuty for on-call and incident management. OneUptime has a built in monitoring solution as well. You use one product, your team has one dashboard, save time, simplify ops.',
                 },
                 {
                     question:
@@ -215,7 +215,7 @@ export default (product: string): Product => {
                 {
                     question:
                         'Do I need to buy a monitoring solution to monitor my resources?',
-                    answer: 'StatusPage.io needs a seperate monitoring solution that you need to buy which then sends data to StatusPage.io. OneUptime has a built in monitoring solution as well. You use one product, your team has one dashboard, save time, simplify ops.',
+                    answer: 'StatusPage.io needs a separate monitoring solution that you need to buy which then sends data to StatusPage.io. OneUptime has a built in monitoring solution as well. You use one product, your team has one dashboard, save time, simplify ops.',
                 },
                 {
                     question:

App/FeatureSet/Home/Utils/ServerError.ts

@@ -0,0 +1,15 @@
+import { ExpressResponse } from 'CommonServer/Utils/Express';
+import { ViewsPath } from './Config';
+
+export default class ServerErrorUtil {
+    public static renderServerError(res: ExpressResponse): void {
+        res.status(500);
+        res.render(`${ViewsPath}/server-error.ejs`, {
+            footerCards: false,
+            support: false,
+            cta: false,
+            blackLogo: false,
+            requestDemoCta: false,
+        });
+    }
+}

App/FeatureSet/Home/Views/Blog/List.ejs

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en" id="home">
+
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+
+<head>
+  <title>
+    OneUptime Blog - Latest posts on Observability, Monitoring, Reliability and more.
+  </title>
+  <meta name="description" content="Learn more about Observability, Monitoring, Reliability and more.">
+  <%- include('../head') -%>
+
+
+</head>
+
+
+<body>
+  <%- include('../nav') -%>
+
+    <div class="relative isolate overflow-hidden bg-white">
+      <div class="py-24 sm:py-32">
+
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Engineering Uptime - Blog by OneUptime', description: 'Latest posts on Observability, Monitoring, Reliability and more.' }) -%>
+
+        <div class="mx-auto max-w-7xl px-6 lg:px-8">
+          
+          <div>
+
+            <% if(blogPosts.length> 0){ %>
+              <ul role="list" class="divide-y divide-gray-100 list-none">
+
+                <% for(var i=0; i<blogPosts.length; i++) {%>
+
+
+
+                  <%- include('./Partials/ListItem', { blogPost: blogPosts[i] }) -%>
+
+                    <% } %>
+
+              </ul>
+              <% } %>
+
+              <%- include('./Partials/OpenSourceCommitment', {blogPost: null}) -%>
+
+          </div>
+
+
+        </div>
+      </div>
+
+    </div>
+
+
+
+
+    <%- include('./Partials/BlogCta') -%>
+      <%- include('../footer') -%>
+</body>
+
+</html>

App/FeatureSet/Home/Views/Blog/ListByTag.ejs

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en" id="home">
+
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+
+<head>
+  <title>
+    OneUptime Blog - Latest posts on Observability, Monitoring, Reliability and more.
+  </title>
+  <meta name="description" content="Learn more about Observability, Monitoring, Reliability and more.">
+  <%- include('../head') -%>
+
+
+</head>
+
+
+<body>
+  <%- include('../nav') -%>
+
+    <div class="relative isolate overflow-hidden bg-white">
+      <div class="py-24 sm:py-32">
+
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, description: 'Here are some of the latest posts on '+tagName }) -%>
+
+        <div class="mx-auto max-w-7xl px-6 lg:px-8">
+          
+          <div>
+
+            <% if(blogPosts.length> 0){ %>
+              <ul role="list" class="divide-y divide-gray-100 list-none">
+
+                <% for(var i=0; i<blogPosts.length; i++) {%>
+
+
+
+                  <%- include('./Partials/ListItem', { blogPost: blogPosts[i] }) -%>
+
+                    <% } %>
+
+              </ul>
+              <% } %>
+
+          </div>
+          <%- include('./Partials/OpenSourceCommitment', {blogPost: null}) -%>
+
+
+        </div>
+      </div>
+
+    </div>
+
+
+
+
+    <%- include('./Partials/BlogCta') -%>
+      <%- include('../footer') -%>
+</body>
+
+</html>

App/FeatureSet/Home/Views/Blog/Partials/BlogCta.ejs

@@ -0,0 +1,16 @@
+
+<div class="border-t border-gray-900/10 pt-8"></div>
+<div class="relative isolate overflow-hidden bg-white">
+    <div class="py-16">
+      <div class="mx-auto max-w-8xl px-6 lg:px-8">
+        <div class="mx-auto max-w-4xl text-center">
+          <h1 class="text-3xl font-bold tracking-tight text-gray-900">OneUptime is open source observability platform.</h1>
+          <p class="mt-6 text-lg leading-8 text-gray-600">Monitor, Observe, Debug, Resolve. Everything you need to build reliable software in one open source platform. Get started for free today.</p>
+          <div class="mt-10 flex items-center justify-center gap-x-6">
+            <a href="/accounts/register" class="rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">Get started</a>
+            <a href="/enterprise/demo" class="text-sm font-semibold leading-6 text-gray-900">Request Demo <span aria-hidden="true">→</span></a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>

App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs

@@ -0,0 +1,10 @@
+<div class="mb-24">
+<div class="mx-auto flex justify-center text-center ">
+    <h1 class="max-w-2xl text-center text-4xl font-bold tracking-tight text-gray-900">
+        <%= title %>
+    </h1>
+  </div>
+  <p class="text-xl text-center leading-8 text-gray-600 mt-8">
+    <%= description %>
+</p>
+</div>

App/FeatureSet/Home/Views/Blog/Partials/ListItem.ejs

@@ -0,0 +1,33 @@
+<li class="py-5">
+    <div class="min-w-0">
+        <a href="<%= blogPost.blogUrl %>">
+            
+      <div class="min-w-0 flex-auto">
+        <p class="font-semibold text-2xl leading-6 text-gray-900">
+          <%= blogPost.title %>
+        </p>
+        <p class="mt-2 leading-5 text-gray-600">
+          <%= blogPost.description %>
+        </p>
+      </div>
+      </a>
+    </div>
+    <div class="-mt-5">
+      <%- include('./Tags', { blogPost: blogPost }) -%>
+    </div>
+    <div class="mt-5">
+      <div class="">
+
+        <a href="https://github.com/<%- blogPost.authorGitHubUsername -%>" target="_blank">
+          <div class="flex items-center gap-x-6">
+            <p class="text-sm font-medium leading-7 tracking-tight text-gray-600">
+              <span class="text-gray-500">By</span> @<%- blogPost.authorGitHubUsername -%> <span
+                  class="text-gray-500"> on
+                  <%- blogPost.formattedPostDate -%></span>
+            </p>
+          </div>
+      </div>
+      </a>
+
+    </div>
+  </li>

App/FeatureSet/Home/Views/Blog/Partials/OpenSourceCommitment.ejs

@@ -0,0 +1,29 @@
+<div class=" font-medium leading-6 text-gray-900 mt-24">Our Commitment to Open Source
+</div>
+
+<div class="mt-2 text-gray-900">
+    <ul role="list" class="divide-y divide-gray-100 rounded-md border border-gray-200">
+        <li class="items-center justify-between py-4 pl-4 pr-5 leading-6">
+            <div class="items-center">
+
+                <div class="p-1 space-y-2">
+                    
+                   
+
+                        <div>Everything we do at OneUptime is 100% open-source. You can contribute by writing a post just like this.
+                        Please check contributing guidelines <a class="underline"
+                            target="_blank"
+                            href="https://github.com/oneuptime/blog">here.</a></div>
+
+                            <% if(blogPost){%>
+
+                                <div>If you wish to contribute to this post, you can make edits and improve it <a
+                                        class="underline" target="_blank"
+                                        href="https://github.com/oneuptime/blog/tree/master/posts/<%- blogPost.fileName -%>">here</a>.</div>
+                            <% } %>
+                </div>
+            </div>
+        </li>
+
+    </ul>
+</div>

App/FeatureSet/Home/Views/Blog/Partials/Tags.ejs

@@ -0,0 +1,22 @@
+<% if(blogPost.tags.length> 0){ %>
+    <div class="flex mt-10">
+        <div class="space-x-1">
+            <!-- Loop over blogPost.tags and show them here-->
+            <% for(var i=0; i<blogPost.tags.length; i++) {%>
+                <a href="/blog/tag/<%- blogPost.tags[i].replaceAll(' ','-').toLowerCase() -%>">
+                    <div
+                        class="relative inline-flex items-center rounded-full border border-gray-300 px-3 py-0.5 text-sm">
+                        <div class="absolute flex flex-shrink-0 items-center justify-center">
+                            <div class="h-1.5 w-1.5 rounded-full bg-indigo-500" aria-hidden="true">
+                            </div>
+                        </div>
+                        <div class="ml-3.5 font-medium text-gray-900">
+                            <%- blogPost.tags[i] -%>
+                        </div>
+                    </div>
+                </a>
+
+                <% } %>
+        </div>
+    </div>
+    <% } %>

App/FeatureSet/Home/Views/Blog/Post.ejs

@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="en" id="home">
+
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+
+<head>
+    <title>
+        <%= blogPost.title %>
+    </title>
+    <meta name="description" content="<%= blogPost.description %>">
+    <%- include('../head-basic') -%>
+        <link rel="canonical" href="https://oneuptime.com/blog/post/<%= blogPost.fileName %>" />
+        <meta property="og:site_name" content="OneUptime | One Complete Observability platform.">
+        <meta property="og:type" content="article">
+        <meta property="og:title" content="<%= blogPost.title %>">
+        <meta property="og:description" content="<%= blogPost.description %>">
+        <meta property="og:url" content="<%= blogPost.blogUrl %>">
+        <meta property="og:image" content="<%= blogPost.socialMediaImageUrl %>">
+        <meta property="article:published_time" content="<%- blogPost.postDate -%>T00:00:00.000Z">
+        <meta property="article:modified_time" content="<%- blogPost.postDate -%>T00:00:00.000Z">
+        <meta property="article:publisher" content="https://www.facebook.com/OneUptime">
+        <meta name="twitter:card" content="summary_large_image">
+        <meta name="twitter:title" content="<%= blogPost.title %>">
+        <meta name="twitter:description" content="<%= blogPost.description %>">
+        <meta name="twitter:url" content="<%= blogPost.blogUrl %>">
+        <meta name="twitter:image" content="<%= blogPost.socialMediaImageUrl %>">
+        <meta name="twitter:label1" content="Written by">
+        <meta name="twitter:data1" content="<%= blogPost.author.name %>">
+        <meta name="twitter:site" content="@OneUptimeHQ">
+        <meta property="og:image:width" content="1280">
+        <meta property="og:image:height" content="720">
+        <script type="application/ld+json">
+{
+    "@context": "https://schema.org",
+    "@type": "Article",
+    "publisher": {
+        "@type": "Organization",
+        "name": "OneUptime",
+        "url": "https://oneuptime.com/",
+        "logo": {
+            "@type": "ImageObject",
+            "url": "https://oneuptime.com/img/OneUptimePNG/1.png",
+            "width": 60,
+            "height": 60
+        }
+    },
+    "author": {
+        "@type": "Person",
+        "name": "<%= blogPost.author.name %>",
+        "url": "<%= blogPost.author.githubUrl %>",
+        "sameAs": []
+    },
+    "headline": "<%= blogPost.title %>",
+    "url": "<%= blogPost.blogUrl %>",
+    "datePublished": "<%- blogPost.postDate -%>T00:00:00.000Z",
+    "dateModified": "<%- blogPost.postDate -%>T00:00:00.000Z",
+    "description": "<%- blogPost.description -%>",
+    "mainEntityOfPage": "<%= blogPost.blogUrl %>"
+}
+    </script>
+
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/a11y-dark.min.css">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
+        <script>hljs.highlightAll();</script>
+
+</head>
+
+
+<body>
+    <%- include('../nav') -%>
+
+        <div class="relative isolate overflow-hidden bg-white">
+            <div class="py-24 sm:py-32">
+                <div class="mx-auto max-w-7xl px-6 lg:px-8">
+
+                    <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , description:
+                        blogPost.description }) -%>
+
+
+                        <div class="blog-body">
+                            <%- blogPost.htmlBody -%>
+                        </div>
+
+                        <%- include('./Partials/Tags', { blogPost: blogPost }) -%>
+
+                            <div class="bg-white my-10 mt-20">
+                                <div class="">
+                                    <ul role="list" class="">
+                                        <li>
+                                            <a href="<%- blogPost.author.githubUrl -%>" target="_blank">
+                                                <div class="flex items-center gap-x-6">
+                                                    <img class="h-12 w-12 rounded-full"
+                                                        src="<%- blogPost.author.profileImageUrl -%>" alt="">
+                                                    <div class="-ml-4">
+                                                        <h3
+                                                            class="text-base font-medium leading-7 tracking-tight text-gray-600">
+                                                            <span class="text-gray-500">By</span> <%-
+                                                                blogPost.author.name -%> <span class="text-gray-500"> on
+                                                                    <%- blogPost.formattedPostDate -%></span>
+                                                        </h3>
+                                                        <p class="text-sm font-medium leading-6 text-indigo-500 -mt-1">
+                                                            @<%- blogPost.author.username -%></p>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+
+                            <%- include('./Partials/OpenSourceCommitment', { blogPost: blogPost }) -%>
+
+                </div>
+            </div>
+
+        </div>
+
+
+
+
+        <%- include('./Partials/BlogCta') -%>
+            <%- include('../footer') -%>
+</body>
+
+</html>

App/FeatureSet/Home/Views/Partials/product-tabs.ejs

@@ -1,6 +1,6 @@
 <div class="relative overflow-hidden bg-white pt-32 pb-32">
     <div class="max-w-3xl1 px-6">
-        <p class="text-5xl font-bold tracking-tight text-gray-900 sm:text-center">OneUptime is 6+ tools combined
+        <p class="text-5xl font-bold tracking-tight text-gray-900 sm:text-center">OneUptime is 7+ tools combined
             into one.</p>
         <p class="mt-5 text-xl text-gray-500 sm:text-center mb-12">Everything from monitoring, status pages,
             incident management, on-call schedules - we've got it and we are just getting started!</p>
@@ -14,8 +14,9 @@
                 <option value="2">Monitoring</option>
                 <option value="3">Incidents</option>
                 <option value="4">On Call</option>
-                <option value="5">Logs Management</option>
-                <option value="6">Workflows </option>
+                <option value="5">Logs</option>
+                <option value="6">APM</option>
+                <option value="7">Workflows </option>
             </select>
           </div>
 
@@ -76,13 +77,25 @@
                             <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 0 1 0 3.75H5.625a1.875 1.875 0 0 1 0-3.75Z" />
                           </svg>
 
-                        <span>Logs Management</span>
+                        <span>Logs</span>
                     </a>
 
                     <a onclick="showTab(6)"
                         class="tab-6-button cursor-pointer  border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 group inline-flex items-center border-b-2 py-4 px-1 font-medium">
                     
                         <svg class="icon-tab-6 text-gray-400 group-hover:text-gray-500 -ml-0.5 mr-2 h-5 w-5"
+                            xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-6 h-6">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875v-6.75ZM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V8.625ZM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V4.125Z" />
+                        </svg>
+
+                        <span>APM</span>
+                    </a>
+
+                    <a onclick="showTab(7)"
+                        class="tab-7-button cursor-pointer  border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 group inline-flex items-center border-b-2 py-4 px-1 font-medium">
+                    
+                        <svg class="icon-tab-7 text-gray-400 group-hover:text-gray-500 -ml-0.5 mr-2 h-5 w-5"
                             xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
                             stroke="currentColor" class="w-6 h-6">
                             <path strokeLinecap="round" strokeLinejoin="round"
@@ -405,7 +418,7 @@
                             <a href="/accounts/register"
                                 class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
                                 started</a>
-                            <a href="/product/log-management"
+                            <a href="/product/logs-management"
                                 class="text-base font-semibold leading-7 text-gray-900 ml-3">Learn more <span
                                     aria-hidden="true">→</span></a>
                         </div>
@@ -442,6 +455,73 @@
         <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3 lg:gap-24 lg:px-8">
 
 
+            <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none py-16 lg:px-0">
+                <div>
+                    <div class="mt-6">
+                        <h2 class="text-2xl font-medium tracking-tight text-gray-900">Monitor performance of any app, any service, any stack.</h2>
+
+                        <ul role="list" class="mt-6 space-y-3 mt-8 mb-8 text-lg text-gray-500">
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Backend </div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Database </div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Frontend</div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor Microservices</div>
+                            </li>
+                        </ul>
+
+
+                        <div class="mt-6">
+                            <a href="/accounts/register"
+                                class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                                started</a>
+                            <a href="/product/apm"
+                                class="text-base font-semibold leading-7 text-gray-900 ml-3">Learn more <span
+                                    aria-hidden="true">→</span></a>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                    <blockquote>
+                        <div>
+                            <p class="text-base text-gray-500">&ldquo;OpenTelemetry is an open standard for collecting telemetry in a vendor agnostic way.
+                                &rdquo;</p>
+                        </div>
+                        <footer class="mt-3">
+                            <div class="flex items-center space-x-3">
+                                <div class="text-base font-medium text-gray-700">Charity Majors on Twitter.
+                                </div>
+                            </div>
+                        </footer>
+                    </blockquote>
+                </div>
+            </div>
+
+            <div class="my-auto mx-auto px-6 col-span-2">
+                <div
+                    class="relative -m-2 rounded-xl bg-gray-900/5 p-2 ring-1 ring-inset ring-gray-900/10 lg:-m-4 lg:rounded-2xl lg:p-4">
+
+                    <img class="relative rounded-lg shadow-lg" src="/img/apm-3.png" alt="App screenshot">
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="mt-10 tab-7" style="display: none;">
+        <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3 lg:gap-24 lg:px-8">
+
+
             <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none py-16 lg:px-0">
                 <div>
                     <div class="mt-6">

App/FeatureSet/Home/Views/apm.ejs

@@ -0,0 +1,406 @@
+<!DOCTYPE html>
+<html lang="en" id="home">
+
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+
+<head>
+  <title>OneUptime | Application Performance Monitoring. </title>
+  <meta name="description"
+    content="Powered by OpenTelemetry. Monitor performance of any app, any service, any stack">
+  <%- include('head') -%>
+</head>
+
+<body>
+  <%- include('nav') -%>
+
+
+      <div class="relative isolate overflow-hidden bg-white">
+        <div class="py-24 sm:py-32">
+          <div class="mx-auto max-w-7xl px-6 lg:px-8">
+            <div class="mx-auto max-w-7xl text-center">
+
+              <h1 class="text-4xl font-bold tracking-tight text-gray-900 sm:text-6xl">Monitor performance of any app, any service, any stack.</h1>
+              <p class="mt-6 text-xl sm:text-2xl leading-8 text-gray-600">Powered by OpenTelemetry. OneUptime can monitor any backend, database and frontend. Trace events across services and monitor your whole stack.</p>
+              <div class="mt-10 flex items-center justify-center gap-x-6">
+                <a href="/accounts/register"
+                  class="rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">Get
+                  started</a>
+                <a href="/enterprise/demo" class="text-sm font-semibold leading-6 text-gray-900">Request Demo <span
+                    aria-hidden="true">→</span></a>
+              </div>
+            </div>
+            <div class="mt-16 flow-root sm:mt-24">
+              <div
+                class="relative -m-2 rounded-xl bg-gray-900/5 p-2 ring-1 ring-inset ring-gray-900/10 lg:-m-4 lg:rounded-2xl lg:p-4">
+                  <img src="/img/apm-3.png" alt="App screenshot" width="2432" height="1442"
+                    class="rounded-md shadow-2xl ring-1 ring-gray-900/10">
+                  <!-- <%- include('./Partials/watch-demo.ejs', {videoId: "F6BNipy5VCk" }) -%> -->
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="absolute inset-x-0 top-[calc(100%-13rem)] -z-10 transform-gpu overflow-hidden blur-3xl sm:top-[calc(100%-30rem)]"
+          aria-hidden="true">
+          <div
+            class="relative left-[calc(50%+3rem)] aspect-[1155/678] w-[36.125rem] -translate-x-1/2 bg-gradient-to-tr from-[#ff80b5] to-[#9089fc] opacity-30 sm:left-[calc(50%+36rem)] sm:w-[72.1875rem]"
+            style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)">
+          </div>
+        </div>
+      </div>
+
+      <%- include('logo-roll') -%>
+
+        <div class="relative overflow-hidden bg-white pt-16 pb-32">
+          <div class="max-w-3xl1 pr-12">
+            <h2 class="text-base font-semibold leading-7 text-indigo-500 sm:text-center">Why OneUptime</h2>
+            <p class="text-5xl font-bold tracking-tight text-gray-900 sm:text-center">Save 8x the cost when your stack and services with OneUptime</p>
+            <p class="mt-5 text-xl text-gray-500 sm:text-center mb-12">We offer the most cost effective application performance monitoring
+              software on the planet. Save 8x when you compare OneUptime to Datadog.</p>
+          </div>
+          <div class="relative mt-20">
+            <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-2 lg:gap-24 lg:px-8">
+
+              <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none lg:py-16 lg:px-0">
+                <div>
+                  <div>
+                    <span class="flex h-12 w-12 items-center justify-center rounded-xl bg-indigo-600">
+                     
+
+                      <svg class="h-8 w-8 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
+                      </svg>
+                      
+                    </span>
+                  </div>
+                  <div class="mt-6">
+                    <h2 class="text-3xl font-bold tracking-tight text-gray-900">Custom Data Rentention and Data
+                      Residency.
+                    </h2>
+                    <p class="mt-4 text-lg text-gray-500"> Set custom data retention and data residency. Have metrics, traces and logs stored in US or EU data centers to be compliant. Lower data rentention for non critical services to save costs. </p>
+                    <div class="mt-6">
+                      <a href="/accounts/register"
+                        class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                        started</a>
+
+                    </div>
+                  </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                  <blockquote>
+                    <div>
+                      <p class="text-base text-gray-500">&ldquo;Using custom data rentention for different services has helped us save thousands in costs.&rdquo;</p>
+                    </div>
+                    <footer class="mt-3">
+                      <div class="flex items-center space-x-3">
+                        <div class="text-base font-medium text-gray-700">Jamie Polowin, G2 Crowd Reviewer</div>
+                      </div>
+                    </footer>
+                  </blockquote>
+                </div>
+              </div>
+              <div class="mt-12 sm:mt-16 lg:mt-0">
+                <div class="-mr-48 pl-6 md:-mr-16 lg:relative lg:m-0 lg:h-full lg:px-0">
+                  <img
+                    class="w-full mt-40 rounded-xl shadow-xl ring-1 ring-black ring-opacity-5 lg:absolute lg:left-0"
+                    src="/img/custom-data-retention.png" alt="Status Pages">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="mt-24">
+            <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-2 lg:gap-24 lg:px-8">
+              <div class="mx-auto max-w-xl px-6 lg:col-start-2 lg:mx-0 lg:max-w-none lg:py-32 lg:px-0">
+                <div>
+                  <div>
+                    <span class="flex h-12 w-12 items-center justify-center rounded-xl bg-indigo-600">
+                      
+                    
+                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 9V5.25A2.25 2.25 0 0 1 10.5 3h6a2.25 2.25 0 0 1 2.25 2.25v13.5A2.25 2.25 0 0 1 16.5 21h-6a2.25 2.25 0 0 1-2.25-2.25V15M12 9l3 3m0 0-3 3m3-3H2.25" />
+                      </svg>
+                      
+                    </span>
+                  </div>
+                  <div class="mt-6">
+                    <h2 class="text-3xl font-bold tracking-tight text-gray-900">Monitor any backend, database and frontend. Monitor any stack and service.</h2>
+                    <p class="mt-4 text-lg text-gray-500"> Native OpenTelemery support lets you monitor any backend, database and frontend. Monitoring any piece of code is supported.</p>
+                    <div class="mt-6">
+                      <a href="/accounts/register"
+                        class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                        started</a>
+
+                    </div>
+                  </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                  <blockquote>
+                    <div>
+                      <p class="text-base text-gray-500">&ldquo;We have world class native integration with OpenTelemetry, so all you need to do is change one line of code and to monitor your app in OneUptime&rdquo;
+                      </p>
+                    </div>
+                    <footer class="mt-3">
+                      <div class="flex items-center space-x-3">
+                        <div class="text-base font-medium text-gray-700">Nawaz Dhandala, OneUptime</div>
+                      </div>
+                    </footer>
+                  </blockquote>
+                </div>
+              </div>
+              <div class="mt-12 sm:mt-16 lg:col-start-1 lg:mt-0">
+                <div class="-ml-48 pr-6 md:-ml-16 lg:relative lg:h-full lg:px-0 mt-48">
+                  <img
+                    class="w-full rounded-xl shadow-xl ring-1 ring-black ring-opacity-5 lg:absolute lg:right-0 lg:h-96 lg:w-auto lg:max-w-none"
+                    src="/img/logs-sources.png" alt="Monitoring">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="relative mt-24">
+            <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-2 lg:gap-24 lg:px-8">
+              <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none lg:py-16 lg:px-0">
+                <div>
+                  <div>
+                    <span class="flex h-12 w-12 items-center justify-center rounded-xl bg-indigo-600">
+                      
+                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+                      </svg>
+                      
+                    </span>
+                  </div>
+                  <div class="mt-6">
+                    <h2 class="text-3xl font-bold tracking-tight text-gray-900">Observe and Debug performance issues or errors instantly.</h2>
+                    <p class="mt-4 text-lg text-gray-500">Search traces, metrics and logs with full text search or search with Clickhouse SQL. Search petabytes of data in seconds. No rehydration needed. One of the most cost effective APM solutions in the market.</p>
+                    <div class="mt-6">
+                      <a href="/accounts/register"
+                        class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                        started</a>
+
+                    </div>
+                  </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                  <blockquote>
+                    <div>
+                      <p class="text-base text-gray-500">&ldquo; No rehydraton needed in OneUptime All your APM data is hot. Search in milliseconds to save critical time during incidents. &rdquo;</p>
+                    </div>
+                    <footer class="mt-3">
+                      <div class="flex items-center space-x-3">
+                        <div class="text-base font-medium text-gray-700">Simon Larsen, OneUptime</div>
+                      </div>
+                    </footer>
+                  </blockquote>
+                </div>
+              </div>
+              <div class="mt-12 sm:mt-16 lg:mt-0">
+                <div class="-mr-48 pl-6 md:-mr-16 lg:relative lg:m-0 lg:h-full lg:px-0">
+                  <img
+                    class="w-full rounded-xl shadow-xl ring-1 ring-black ring-opacity-5 lg:absolute lg:left-0 lg:h-full lg:w-auto lg:max-w-none"
+                    src="/img/search-with-sql.png" alt="Inbox user interface">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="mt-24">
+            <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-2 lg:gap-24 lg:px-8">
+              <div class="mx-auto max-w-xl px-6 lg:col-start-2 lg:mx-0 lg:max-w-none lg:py-32 lg:px-0">
+                <div>
+                  <div>
+                    <span class="flex h-12 w-12 items-center justify-center rounded-xl bg-indigo-600">
+                      
+
+                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" />
+                      </svg>
+                      
+                    </span>
+                  </div>
+                  <div class="mt-6">
+                    <h2 class="text-3xl font-bold tracking-tight text-gray-900">Alert right team members at the right
+                      time.</h2>
+                    <p class="mt-4 text-lg text-gray-500">Call right team members during an incident. Post notes directly on your status page and communicate
+                      directly
+                      with your team, customers and users. </p>
+                    <div class="mt-6">
+                      <a href="/accounts/register"
+                        class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                        started</a>
+
+                    </div>
+                  </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                  <blockquote>
+                    <div>
+                      <p class="text-base text-gray-500">&ldquo;Alerts, Incidents, On Call all in one platform gives your team a one dashboard to look at during war time 
+                        (and peace time).&rdquo;</p>
+                    </div>
+                    <footer class="mt-3">
+                      <div class="flex items-center space-x-3">
+                        <div class="text-base font-medium text-gray-700">Simon Larsen, OneUptime</div>
+                      </div>
+                    </footer>
+                  </blockquote>
+                </div>
+              </div>
+              <div class="mt-12 sm:mt-16 lg:col-start-1 lg:mt-0">
+                <div class="-ml-48 pr-6 md:-ml-16 lg:relative lg:m-0 lg:h-full lg:px-0">
+                  <img
+                    class="w-full rounded-xl shadow-xl ring-1 ring-black ring-opacity-5 lg:absolute lg:right-0 lg:h-full lg:w-auto lg:max-w-none"
+                    src="/img/incident-report.png" alt="Monitoring">
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+
+
+        <%- include('testimonials') -%>
+
+
+          <div class="relative bg-white py-24 sm:py-32 lg:py-40">
+            <div class="mx-auto max-w-md px-6 text-center sm:max-w-3xl lg:max-w-7xl lg:px-8">
+              <h2 class="text-lg font-semibold text-indigo-600">More features</h2>
+              <p class="mt-2 text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">Advanced features, built for
+                you.</p>
+              <p class="mx-auto mt-5 max-w-prose text-xl text-gray-500">Build custom workflows, integrate with anything
+                you have, or more - you never run out of features. Batteries included.
+              </p>
+              <div class="mt-20">
+                <div class="grid grid-cols-1 gap-12 sm:grid-cols-2 lg:grid-cols-3">
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                            <!-- Heroicon name: outline/cloud-arrow-up -->
+                            <svg class="h-8 w-8 text-white" xmlns="http://www.w3.org/2000/svg" fill="none"
+                              viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
+                              <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M9 12.75L11.25 15 15 9.75M21 12c0 1.268-.63 2.39-1.593 3.068a3.745 3.745 0 01-1.043 3.296 3.745 3.745 0 01-3.296 1.043A3.745 3.745 0 0112 21c-1.268 0-2.39-.63-3.068-1.593a3.746 3.746 0 01-3.296-1.043 3.745 3.745 0 01-1.043-3.296A3.745 3.745 0 013 12c0-1.268.63-2.39 1.593-3.068a3.745 3.745 0 011.043-3.296 3.746 3.746 0 013.296-1.043A3.746 3.746 0 0112 3c1.268 0 2.39.63 3.068 1.593a3.746 3.746 0 013.296 1.043 3.746 3.746 0 011.043 3.296A3.745 3.745 0 0121 12z" />
+                            </svg>
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">Reliability
+                          Guaranteed.</h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600">Hosted on a distributed high avalability
+                          infrastructure across multiple clouds and continents so your log management software is never
+                          down, even if
+                          major cloud provider (AWS, Azure, GCP, etc) is down.</p>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                            <!-- Heroicon name: outline/lock-closed -->
+                            <svg class="h-8 w-8 text-white" xmlns="http://www.w3.org/2000/svg" fill="none"
+                              viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
+                              <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M13.5 16.875h3.375m0 0h3.375m-3.375 0V13.5m0 3.375v3.375M6 10.5h2.25a2.25 2.25 0 002.25-2.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v2.25A2.25 2.25 0 006 10.5zm0 9.75h2.25A2.25 2.25 0 0010.5 18v-2.25a2.25 2.25 0 00-2.25-2.25H6a2.25 2.25 0 00-2.25 2.25V18A2.25 2.25 0 006 20.25zm9.75-9.75H18a2.25 2.25 0 002.25-2.25V6A2.25 2.25 0 0018 3.75h-2.25A2.25 2.25 0 0013.5 6v2.25a2.25 2.25 0 002.25 2.25z" />
+                            </svg>
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">Integrations</h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600">Choose from 5000+ integrates to integrate
+                          with.
+                          Your team can upate your status page and manage everything without leaving Slack for example.
+                          Build custom integrations with our API.</p>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                            <!-- Heroicon name: outline/arrow-path -->
+                            <svg class="h-8 w-8 text-white" xmlns="http://www.w3.org/2000/svg" fill="none"
+                              viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
+                              <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M2.25 7.125C2.25 6.504 2.754 6 3.375 6h6c.621 0 1.125.504 1.125 1.125v3.75c0 .621-.504 1.125-1.125 1.125h-6a1.125 1.125 0 01-1.125-1.125v-3.75zM14.25 8.625c0-.621.504-1.125 1.125-1.125h5.25c.621 0 1.125.504 1.125 1.125v8.25c0 .621-.504 1.125-1.125 1.125h-5.25a1.125 1.125 0 01-1.125-1.125v-8.25zM3.75 16.125c0-.621.504-1.125 1.125-1.125h5.25c.621 0 1.125.504 1.125 1.125v2.25c0 .621-.504 1.125-1.125 1.125h-5.25a1.125 1.125 0 01-1.125-1.125v-2.25z" />
+                            </svg>
+
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">Workflows</h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600">Build complex workflows without code. Automate
+                          incident workflow, status page updates, have one control plane for all of your resources and
+                          showcase reliability to different stakeholders</p>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                            <!-- Heroicon name: outline/shield-check -->
+                           
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                              <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z" />
+                            </svg>
+                            
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">Incident Management
+                        </h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600"> Keep stakeholders throughout the business informed in real-time, empowering the entire company to collaborate and respond proactively. </p>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                              <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75m-3-7.036A11.959 11.959 0 0 1 3.598 6 11.99 11.99 0 0 0 3 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285Z" />
+                            </svg>
+                            
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">SOC 2/3 &amp; ISO Compliant</h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600">We're SOC 2/3, ISO, GDPR, HIPAA, CCPA compliant (and more). We have all those boxes ticked so you're ready to get started from Day 1.</p>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="pt-6">
+                    <div class="flow-root rounded-lg bg-gray-50 px-6 pb-8">
+                      <div class="-mt-6">
+                        <div>
+                          <span class="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
+                          
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-white">
+                              <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
+                            </svg>
+                            
+                          </span>
+                        </div>
+                        <h3 class="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">Export to Data Wharehouse</h3>
+                        <p class="mt-5 text-base leading-7 text-gray-600">We export your logs to anywhere you like - BigQuery, S3 Buckets, anywhere. So, you have complete ownership of all the data you generate at OneUptime.</p>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <%- include('features-table') -%>
+            <%- include('cta') -%>
+              <%- include('footer') -%>
+                <%- include('./Partials/video-script') -%>
+
+</body>
+
+</html>