Rename Ingestor to ProbeIngest; update configurations, routes, and Do…

…cker support; add new request types and workflows
yonasBSD · Nov 21, 2024 · 815ae71 · 815ae71
1 parent 3a1f5c7
commit 815ae71
Show file tree

Hide file tree

Showing 46 changed files with 127 additions and 127 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -240,7 +240,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Probe/Dockerfile .
 
-  docker-build-ingestor:
+  docker-build-probe-ingest:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -253,7 +253,7 @@ jobs:
 
       # build image probe api
       - name: build docker image
-        run: sudo docker build -f ./Ingestor/Dockerfile .
+        run: sudo docker build -f ./ProbeIngest/Dockerfile .
 
   docker-build-open-telemetry-ingest:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -204,7 +204,7 @@ jobs:
       - run: cd Common && npm install
       - run: cd Probe && npm install && npm run compile && npm run dep-check
 
-  compile-ingestor:
+  compile-probe-ingest:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -214,7 +214,7 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd Ingestor && npm install && npm run compile && npm run dep-check
+      - run: cd ProbeIngest && npm install && npm run compile && npm run dep-check
 
   compile-open-telemetry-ingest:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -553,7 +553,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  ingestor-docker-image-deploy:
+  probe-ingest-docker-image-deploy:
     needs: [generate-build-number]
     runs-on: ubuntu-latest
     steps:
@@ -562,8 +562,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/ingestor
-            ghcr.io/oneuptime/ingestor
+            oneuptime/probe-ingest
+            ghcr.io/oneuptime/probe-ingest
           tags: |
             type=raw,value=release,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true
@@ -585,7 +585,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/[email protected]
@@ -603,7 +603,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Ingestor/Dockerfile
+          file: ./ProbeIngest/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -1590,7 +1590,7 @@ jobs:
 
   test-e2e-release-saas: 
     runs-on: ubuntu-latest
-    needs: [open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy,  llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy,  otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
+    needs: [open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy,  llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, probe-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy,  otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -1643,7 +1643,7 @@ jobs:
   test-e2e-release-self-hosted: 
     runs-on: ubuntu-latest
     # After all the jobs runs
-    needs: [open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, incoming-request-ingest-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy,  api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
+    needs: [open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, incoming-request-ingest-docker-image-deploy, fluent-ingest-docker-image-deploy, docs-docker-image-deploy,  api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, probe-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
@@ -599,7 +599,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  ingestor-docker-image-deploy:
+  probe-ingest-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -608,8 +608,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/ingestor
-            ghcr.io/oneuptime/ingestor
+            oneuptime/probe-ingest
+            ghcr.io/oneuptime/probe-ingest
           tags: |
             type=raw,value=test,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@@ -632,7 +632,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/[email protected]
@@ -650,7 +650,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Ingestor/Dockerfile
+          file: ./ProbeIngest/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -721,7 +721,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
             APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}}
 
-  ingestor-docker-image-deploy:
+  probe-ingest-docker-image-deploy:
     needs: generate-build-number
     runs-on: ubuntu-latest
     steps:
@@ -730,8 +730,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            oneuptime/ingestor
-            ghcr.io/oneuptime/ingestor
+            oneuptime/probe-ingest
+            ghcr.io/oneuptime/probe-ingest
           tags: |
             type=raw,value=test,enable=true
             type=semver,value=7.0.${{needs.generate-build-number.outputs.build_number}}-test,pattern={{version}},enable=true
@@ -754,7 +754,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/[email protected]
@@ -772,7 +772,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          file: ./Ingestor/Dockerfile
+          file: ./ProbeIngest/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
@@ -876,7 +876,7 @@ jobs:
       - name: Generate Dockerfile from Dockerfile.tpl
         run: npm run prerun
 
-      # Build and deploy ingestor.
+      # Build and deploy probe-ingest.
 
       - name: Login to Docker Hub 
         uses: docker/[email protected]
@@ -1587,7 +1587,7 @@ jobs:
 
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [llm-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, ingestor-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, fluent-ingest-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
+    needs: [llm-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, probe-docker-image-deploy, haraka-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, fluent-ingest-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

diff --git a/.github/workflows/test.ingestor.yaml → .github/workflows/test.probe-ingest.yaml b/.github/workflows/test.ingestor.yaml → .github/workflows/test.probe-ingest.yaml
@@ -1,4 +1,4 @@
-name: Ingestor Test
+name: ProbeIngest Test
 
 on:
   pull_request: 
@@ -17,5 +17,5 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd Ingestor && npm install && npm run test
+      - run: cd ProbeIngest && npm install && npm run test
 
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -163,8 +163,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Ingestor",
-            "name": "Ingestor: Debug with Docker",
+            "localRoot": "${workspaceFolder}/ProbeIngest",
+            "name": "ProbeIngest: Debug with Docker",
             "port": 9932,
             "remoteRoot": "/usr/src/app",
             "request": "attach",

diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts
@@ -88,9 +88,9 @@ export const AppApiHostname: Hostname = Hostname.fromString(
   }`,
 );
 
-export const IngestorHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_INGESTOR_HOSTNAME"] || "localhost"}:${
-    process.env["INGESTOR_PORT"] || 80
+export const ProbeIngestHostname: Hostname = Hostname.fromString(
+  `${process.env["SERVER_PROBE_INGEST_HOSTNAME"] || "localhost"}:${
+    process.env["PROBE_INGEST_PORT"] || 80
   }`,
 );
 

diff --git a/Common/ServiceRoute.ts b/Common/ServiceRoute.ts
@@ -26,7 +26,7 @@ export const ApiReferenceRoute: Route = new Route("/reference");
 
 export const AdminDashboardRoute: Route = new Route("/admin");
 
-export const IngestorRoute: Route = new Route("/ingestor");
+export const ProbeIngestRoute: Route = new Route("/probe-ingest");
 
 export const OpenTelemetryIngestRoute: Route = new Route(
   "/open-telemetry-ingest",

diff --git a/Common/UI/Config.ts b/Common/UI/Config.ts
@@ -8,7 +8,7 @@ import {
   FileRoute,
   HomeRoute,
   IdentityRoute,
-  IngestorRoute,
+  ProbeIngestRoute,
   IntegrationRoute,
   NotificationRoute,
   RealtimeRoute,
@@ -68,7 +68,7 @@ export const STATUS_PAGE_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
 export const WORKFLOW_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
-export const INGESTOR_HOSTNAME: Hostname = Hostname.fromString(HOST);
+export const PROBE_INGEST_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
 export const OPEN_TELEMETRY_INGEST_HOSTNAME: Hostname =
   Hostname.fromString(HOST);
@@ -142,10 +142,10 @@ export const WORKFLOW_URL: URL = new URL(
   WorkflowRoute,
 );
 
-export const INGESTOR_URL: URL = new URL(
+export const PROBE_INGEST_URL: URL = new URL(
   HTTP_PROTOCOL,
-  INGESTOR_HOSTNAME,
-  IngestorRoute,
+  PROBE_INGEST_HOSTNAME,
+  ProbeIngestRoute,
 );
 
 export const INCOMING_REQUEST_INGEST_URL: URL = new URL(

diff --git a/E2E/Tests/Ingestor/StatusCheck.spec.ts b/E2E/Tests/Ingestor/StatusCheck.spec.ts
@@ -6,7 +6,7 @@ test.describe("check live and health check of the app", () => {
   test("check if app status is ok", async ({ page }: { page: Page }) => {
     await page.goto(
       `${URL.fromString(BASE_URL.toString())
-        .addRoute("/ingestor/status")
+        .addRoute("/probe-ingest/status")
         .toString()}`,
     );
     const content: string = await page.content();
@@ -16,7 +16,7 @@ test.describe("check live and health check of the app", () => {
   test("check if app is ready", async ({ page }: { page: Page }) => {
     await page.goto(
       `${URL.fromString(BASE_URL.toString())
-        .addRoute("/ingestor/status/ready")
+        .addRoute("/probe-ingest/status/ready")
         .toString()}`,
     );
     const content: string = await page.content();
@@ -26,7 +26,7 @@ test.describe("check live and health check of the app", () => {
   test("check if app is live", async ({ page }: { page: Page }) => {
     await page.goto(
       `${URL.fromString(BASE_URL.toString())
-        .addRoute("/ingestor/status/live")
+        .addRoute("/probe-ingest/status/live")
         .toString()}`,
     );
     const content: string = await page.content();

diff --git a/FluentIngest/API/FluentIngest.ts b/FluentIngest/API/FluentIngest.ts
@@ -46,7 +46,7 @@ router.post(
     next: NextFunction,
   ): Promise<void> => {
     try {
-      logger.debug("Fluent Ingestor API called");
+      logger.debug("Fluent ProbeIngest API called");
 
       const dbLogs: Array<Log> = [];
 

diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -58,8 +58,8 @@ Usage:
   value: {{ $.Release.Name }}-home.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
 - name: SERVER_APP_HOSTNAME
   value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
-- name: SERVER_INGESTOR_HOSTNAME
-  value: {{ $.Release.Name }}-ingestor.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
+- name: SERVER_PROBE_INGEST_HOSTNAME
+  value: {{ $.Release.Name }}-probe-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
 - name: OPEN_TELEMETRY_INGEST_HOSTNAME
   value: {{ $.Release.Name }}-open-telemetry-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
 - name: SERVER_INCOMING_REQUEST_INGEST_HOSTNAME
@@ -81,8 +81,8 @@ Usage:
 
 - name: APP_PORT
   value: {{ $.Values.port.app | squote }}
-- name: INGESTOR_PORT
-  value: {{ $.Values.port.ingestor | squote }}
+- name: PROBE_INGEST_PORT
+  value: {{ $.Values.port.probeIngest | squote }}
 - name: OPEN_TELEMETRY_INGEST_PORT
   value: {{ $.Values.port.openTelemetryIngest | squote }}
 - name: INCOMING_REQUEST_INGEST_PORT