From 69ae1eb31093d3c416a66d728baaa355af984199 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Fri, 7 Nov 2025 18:46:27 +0000 Subject: [PATCH] chore(ci/infra): remove FluentIngest from workflows, charts and compose; bump OpenTelemetryIngest deps - Remove FluentIngest CI jobs and release/test deploy steps (build.yml, compile.yml, release.yml, test-release.yaml) - Delete test.fluent-ingest workflow - Remove Fluent-related env vars/hostnames from config.example.env, docker-compose.base.yml, HelmChart templates and EnvironmentConfig.ts - Remove fluent-ingest service block from docker-compose.base.yml - Bump Playwright and TypeORM versions in OpenTelemetryIngest package-lock.json --- .github/workflows/build.yml | 23 --- .github/workflows/compile.yml | 18 -- .github/workflows/release.yml | 90 +-------- .github/workflows/test-release.yaml | 180 +----------------- .github/workflows/test.fluent-ingest.yaml | 20 -- Common/Server/EnvironmentConfig.ts | 6 - .../Public/oneuptime/templates/_helpers.tpl | 4 - .../oneuptime/templates/fluent-ingest.yaml | 137 ------------- OpenTelemetryIngest/package-lock.json | 4 +- config.example.env | 2 - docker-compose.base.yml | 16 -- 11 files changed, 5 insertions(+), 495 deletions(-) delete mode 100644 .github/workflows/test.fluent-ingest.yaml delete mode 100644 HelmChart/Public/oneuptime/templates/fluent-ingest.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bff3e82b3a..3b549b7e1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -428,29 +428,6 @@ jobs: max_attempts: 3 command: sudo docker build --no-cache -f ./IncomingRequestIngest/Dockerfile . - docker-build-fluent-ingest: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Preinstall - uses: nick-fields/retry@v3 - with: - timeout_minutes: 10 - max_attempts: 3 - command: npm run prerun - - # build image probe api - - name: build docker image - uses: nick-fields/retry@v3 - with: - timeout_minutes: 45 - max_attempts: 3 - command: sudo docker build --no-cache -f ./FluentIngest/Dockerfile . - docker-build-status-page: runs-on: ubuntu-latest env: diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 879e029a59..40027afb1e 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -354,24 +354,6 @@ jobs: max_attempts: 3 command: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check - compile-fluent-ingest: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: latest - - run: cd Common && npm install - - name: Compile Fluent Ingest - uses: nick-fields/retry@v3 - with: - timeout_minutes: 30 - max_attempts: 3 - command: cd FluentIngest && npm install && npm run compile && npm run dep-check - - compile-status-page: runs-on: ubuntu-latest env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29cedd5edf..e7a6377dad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1277,90 +1277,6 @@ jobs: --build-arg IS_ENTERPRISE_EDITION=true \ . - fluent-ingest-docker-image-deploy: - needs: [generate-build-number, read-version] - runs-on: ubuntu-latest - steps: - - name: Docker Meta - id: meta - uses: docker/metadata-action@v4 - with: - images: | - oneuptime/fluent-ingest - ghcr.io/oneuptime/fluent-ingest - tags: | - type=raw,value=release,enable=true - type=semver,value=${{needs.read-version.outputs.major_minor}}.${{needs.generate-build-number.outputs.build_number}},pattern={{version}},enable=true - - - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - uses: actions/setup-node@v4 - with: - node-version: latest - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Generate Dockerfile from Dockerfile.tpl - uses: nick-fields/retry@v3 - with: - timeout_minutes: 10 - max_attempts: 3 - command: npm run prerun - - # Build and deploy fluent-ingest. - - - name: Login to Docker Hub - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 3 - command: | - echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin - - - name: Login to GitHub Container Registry - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 3 - command: | - echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin - - - name: Build and push - uses: nick-fields/retry@v3 - with: - timeout_minutes: 45 - max_attempts: 3 - command: | - VERSION="${{needs.read-version.outputs.major_minor}}.${{needs.generate-build-number.outputs.build_number}}" - docker buildx build \ - --no-cache \ - --file ./FluentIngest/Dockerfile \ - --platform linux/amd64,linux/arm64 \ - --push \ - --tag oneuptime/fluent-ingest:${VERSION} \ - --tag ghcr.io/oneuptime/fluent-ingest:${VERSION} \ - --build-arg GIT_SHA=${{ github.sha }} \ - --build-arg APP_VERSION=${VERSION} \ - --build-arg IS_ENTERPRISE_EDITION=false \ - . - docker buildx build \ - --no-cache \ - --file ./FluentIngest/Dockerfile \ - --platform linux/amd64,linux/arm64 \ - --push \ - --tag oneuptime/fluent-ingest:enterprise-${VERSION} \ - --tag ghcr.io/oneuptime/fluent-ingest:enterprise-${VERSION} \ - --build-arg GIT_SHA=${{ github.sha }} \ - --build-arg APP_VERSION=${VERSION} \ - --build-arg IS_ENTERPRISE_EDITION=true \ - . - probe-docker-image-deploy: needs: [generate-build-number, read-version] runs-on: ubuntu-latest @@ -2426,7 +2342,6 @@ jobs: - server-monitor-ingest-docker-image-deploy - open-telemetry-ingest-docker-image-deploy - incoming-request-ingest-docker-image-deploy - - fluent-ingest-docker-image-deploy - probe-docker-image-deploy - admin-dashboard-docker-image-deploy - dashboard-docker-image-deploy @@ -2458,7 +2373,6 @@ jobs: "server-monitor-ingest", "open-telemetry-ingest", "incoming-request-ingest", - "fluent-ingest", "probe", "admin-dashboard", "dashboard", @@ -2524,7 +2438,7 @@ jobs: test-e2e-release-saas: runs-on: ubuntu-latest - needs: [open-telemetry-ingest-docker-image-deploy, publish-mcp-server, 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, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy] + needs: [open-telemetry-ingest-docker-image-deploy, publish-mcp-server, copilot-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy] env: CI_PIPELINE_ID: ${{github.run_number}} steps: @@ -2611,7 +2525,7 @@ jobs: test-e2e-release-self-hosted: runs-on: ubuntu-latest # After all the jobs runs - needs: [open-telemetry-ingest-docker-image-deploy, publish-mcp-server, 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, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy] + needs: [open-telemetry-ingest-docker-image-deploy, publish-mcp-server, copilot-docker-image-deploy, incoming-request-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, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, 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 index 4e5892e22b..410d080f0e 100644 --- a/.github/workflows/test-release.yaml +++ b/.github/workflows/test-release.yaml @@ -6,95 +6,6 @@ concurrency: on: push: - branches: - - "master" - -jobs: - - generate-build-number: - runs-on: ubuntu-latest - outputs: - build_number: ${{ steps.buildnumber.outputs.build_number }} - steps: - - name: Generate build number - id: buildnumber - uses: onyxmueller/build-tag-number@v1.0.2 - with: - token: ${{secrets.github_token}} - - run: echo "Build number is ${{ steps.buildnumber.outputs.build_number }}" - read-version: - runs-on: ubuntu-latest - outputs: - major_minor: ${{ steps.read.outputs.major_minor }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - id: read - name: Read VERSION_PREFIX - run: | - MAJOR_MINOR=$(cat VERSION_PREFIX | tr -d '\n' | tr -d '\r') - echo "major_minor=$MAJOR_MINOR" >> $GITHUB_OUTPUT - echo "Using version prefix: $MAJOR_MINOR" - - - publish-terraform-provider: - needs: [read-version, generate-build-number] - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{ github.run_number }} - GITHUB_TOKEN: ${{ secrets.SIMLARSEN_GITHUB_PAT }} - GPG_PRIVATE_KEY: ${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }} - TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY: ${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }} - permissions: - contents: write # For creating releases - packages: write # For publishing packages - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Full history for changelog generation - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: 'latest' - cache: 'npm' - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: '1.21' - cache: true - - - name: Install GoReleaser - uses: goreleaser/goreleaser-action@v5 - with: - install-only: true - - - - name: Determine version - id: version - run: | - VERSION="${{needs.read-version.outputs.major_minor}}.${{needs.generate-build-number.outputs.build_number}}" - echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "Publishing Terraform provider version: $VERSION" - - - name: Install dependencies - run: | - npm install - if [ -d "Common" ]; then cd Common && npm install && cd ..; fi - if [ -d "Scripts" ]; then cd Scripts && npm install && cd ..; fi - - - name: Import GPG key - run: | - echo '${{ secrets.TERRAFORM_GPG_PRIVATE_KEY }}' > private.key - gpg --import private.key || true - rm private.key - echo "GPG key imported successfully" - gpg --export-secret-keys >~/.gnupg/secring.gpg - echo "GPG key exported successfully" - - - name: Generate Terraform provider run: npm run publish-terraform-provider -- --version "${{ steps.version.outputs.version }}" --github-token "${{ secrets.SIMLARSEN_GITHUB_PAT }}" --github-repo-deploy-key "${{ secrets.TERRAFORM_PROVIDER_GITHUB_REPO_DEPLOY_KEY }}" --test-release publish-mcp-server: @@ -1423,95 +1334,6 @@ jobs: --build-arg IS_ENTERPRISE_EDITION=true \ . - fluent-ingest-docker-image-deploy: - needs: [read-version, generate-build-number] - runs-on: ubuntu-latest - steps: - - name: Docker Meta - id: meta - uses: docker/metadata-action@v4 - with: - images: | - oneuptime/fluent-ingest - ghcr.io/oneuptime/fluent-ingest - tags: | - type=raw,value=test,enable=true - type=raw,value=${{needs.read-version.outputs.major_minor}}.${{needs.generate-build-number.outputs.build_number}}-test,enable=true - - - - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - uses: actions/setup-node@v4 - with: - node-version: latest - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Generate Dockerfile from Dockerfile.tpl - uses: nick-fields/retry@v3 - with: - timeout_minutes: 10 - max_attempts: 3 - command: npm run prerun - - # Build and deploy probe-ingest. - - - name: Login to Docker Hub - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 3 - command: | - echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin - - - name: Login to GitHub Container Registry - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 3 - command: | - echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin - - - name: Build and push - uses: nick-fields/retry@v3 - with: - timeout_minutes: 30 - max_attempts: 3 - command: | - VERSION="${{needs.read-version.outputs.major_minor}}.${{needs.generate-build-number.outputs.build_number}}-test" - docker buildx build \ - --no-cache \ - --file ./FluentIngest/Dockerfile \ - --platform linux/amd64,linux/arm64 \ - --push \ - --tag oneuptime/fluent-ingest:test \ - --tag oneuptime/fluent-ingest:${VERSION} \ - --tag ghcr.io/oneuptime/fluent-ingest:test \ - --tag ghcr.io/oneuptime/fluent-ingest:${VERSION} \ - --build-arg GIT_SHA=${{ github.sha }} \ - --build-arg APP_VERSION=${VERSION} \ - --build-arg IS_ENTERPRISE_EDITION=false \ - . - docker buildx build \ - --no-cache \ - --file ./FluentIngest/Dockerfile \ - --platform linux/amd64,linux/arm64 \ - --push \ - --tag oneuptime/fluent-ingest:enterprise-test \ - --tag oneuptime/fluent-ingest:enterprise-${VERSION} \ - --tag ghcr.io/oneuptime/fluent-ingest:enterprise-test \ - --tag ghcr.io/oneuptime/fluent-ingest:enterprise-${VERSION} \ - --build-arg GIT_SHA=${{ github.sha }} \ - --build-arg APP_VERSION=${VERSION} \ - --build-arg IS_ENTERPRISE_EDITION=true \ - . - probe-docker-image-deploy: needs: [read-version, generate-build-number] runs-on: ubuntu-latest @@ -2414,7 +2236,7 @@ jobs: test-helm-chart: runs-on: ubuntu-latest - needs: [infrastructure-agent-deploy, publish-mcp-server, llm-docker-image-deploy, publish-terraform-provider, open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy, workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy, test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, fluent-ingest-docker-image-deploy, incoming-request-ingest-docker-image-deploy] + needs: [infrastructure-agent-deploy, publish-mcp-server, llm-docker-image-deploy, publish-terraform-provider, open-telemetry-ingest-docker-image-deploy, copilot-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy, workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy, test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, 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, incoming-request-ingest-docker-image-deploy] env: CI_PIPELINE_ID: ${{github.run_number}} steps: diff --git a/.github/workflows/test.fluent-ingest.yaml b/.github/workflows/test.fluent-ingest.yaml deleted file mode 100644 index 8e383c594a..0000000000 --- a/.github/workflows/test.fluent-ingest.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Fluent Ingest Test - -on: - pull_request: - push: - branches-ignore: - - 'hotfix-*' # excludes hotfix branches - - 'release' - -jobs: - test: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: latest - - run: cd FluentIngest && npm install && npm run test \ No newline at end of file diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts index cd20a91e03..d6d7af7fe3 100644 --- a/Common/Server/EnvironmentConfig.ts +++ b/Common/Server/EnvironmentConfig.ts @@ -176,12 +176,6 @@ export const IncomingRequestIngestHostname: Hostname = Hostname.fromString( }`, ); -export const FluentIngestHostname: Hostname = Hostname.fromString( - `${process.env["SERVER_FLUENT_INGEST_HOSTNAME"] || "localhost"}:${ - process.env["FLUENT_INGEST_PORT"] || 80 - }`, -); - export const IsolatedVMHostname: Hostname = Hostname.fromString( `${process.env["SERVER_ISOLATED_VM_HOSTNAME"] || "localhost"}:${ process.env["ISOLATED_VM_PORT"] || 80 diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index 516b205b96..452e0ccfc7 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -111,8 +111,6 @@ Usage: value: {{ $.Release.Name }}-open-telemetry-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_INCOMING_REQUEST_INGEST_HOSTNAME value: {{ $.Release.Name }}-incoming-request-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} -- name: SERVER_FLUENT_INGEST_HOSTNAME - value: {{ $.Release.Name }}-fluent-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_OPEN_TELEMETRY_INGEST_HOSTNAME value: {{ $.Release.Name }}-open-telemetry-ingest.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_TEST_SERVER_HOSTNAME @@ -138,8 +136,6 @@ Usage: value: {{ $.Values.openTelemetryIngest.ports.http | squote }} - name: INCOMING_REQUEST_INGEST_PORT value: {{ $.Values.incomingRequestIngest.ports.http | squote }} -- name: FLUENT_INGEST_PORT - value: {{ $.Values.fluentIngest.ports.http | squote }} - name: TEST_SERVER_PORT value: {{ $.Values.testServer.ports.http | squote }} - name: ACCOUNTS_PORT diff --git a/HelmChart/Public/oneuptime/templates/fluent-ingest.yaml b/HelmChart/Public/oneuptime/templates/fluent-ingest.yaml deleted file mode 100644 index b22603de11..0000000000 --- a/HelmChart/Public/oneuptime/templates/fluent-ingest.yaml +++ /dev/null @@ -1,137 +0,0 @@ -# OneUptime fluent-ingest Deployment - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ printf "%s-%s" $.Release.Name "fluent-ingest" }} - namespace: {{ $.Release.Namespace }} - labels: - app: {{ printf "%s-%s" $.Release.Name "fluent-ingest" }} - app.kubernetes.io/part-of: oneuptime - app.kubernetes.io/managed-by: Helm - appname: oneuptime - {{- if $.Values.deployment.includeTimestampLabel }} - date: "{{ now | unixEpoch }}" - {{- end }} -spec: - selector: - matchLabels: - app: {{ printf "%s-%s" $.Release.Name "fluent-ingest" }} - {{- if $.Values.fluentIngest.replicaCount }} - replicas: {{ $.Values.fluentIngest.replicaCount }} - {{- else }} - {{- if or (not $.Values.autoscaling.enabled) ($.Values.fluentIngest.disableAutoscaler) }} - replicas: {{ $.Values.deployment.replicaCount }} - {{- end }} - {{- end }} - strategy: {{- toYaml $.Values.deployment.updateStrategy | nindent 4 }} - template: - metadata: - labels: - app: {{ printf "%s-%s" $.Release.Name "fluent-ingest" }} - {{- if $.Values.deployment.includeTimestampLabel }} - date: "{{ now | unixEpoch }}" - {{- end }} - appname: oneuptime - spec: - volumes: - - name: greenlockrc - emptyDir: - sizeLimit: "1Gi" - {{- if $.Values.fluentIngest.podSecurityContext }} - securityContext: - {{- toYaml $.Values.fluentIngest.podSecurityContext | nindent 8 }} - {{- else if $.Values.podSecurityContext }} - securityContext: - {{- toYaml $.Values.podSecurityContext | nindent 8 }} - {{- end }} - {{- if $.Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml $.Values.imagePullSecrets | nindent 8 }} - {{- end }} - {{- if $.Values.affinity }} - affinity: {{- $.Values.affinity | toYaml | nindent 8 }} - {{- end }} - {{- if $.Values.tolerations }} - tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }} - {{- end }} - {{- if $.Values.fluentIngest.nodeSelector }} - nodeSelector: - {{- toYaml $.Values.fluentIngest.nodeSelector | nindent 8 }} - {{- else if $.Values.nodeSelector }} - nodeSelector: - {{- toYaml $.Values.nodeSelector | nindent 8 }} - {{- end }} - containers: - - image: {{ include "oneuptime.image" (dict "Values" $.Values "ServiceName" "fluent-ingest") }} - name: {{ printf "%s-%s" $.Release.Name "fluent-ingest" }} - {{- if $.Values.startupProbe.enabled }} - # Startup probe - startupProbe: - httpGet: - path: /status/live - port: {{ $.Values.fluentIngest.ports.http }} - periodSeconds: {{ $.Values.startupProbe.periodSeconds }} - failureThreshold: {{ $.Values.startupProbe.failureThreshold }} - {{- end }} - {{- if $.Values.livenessProbe.enabled }} - # Liveness probe - livenessProbe: - httpGet: - path: /status/live - port: {{ $.Values.fluentIngest.ports.http }} - periodSeconds: {{ $.Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ $.Values.livenessProbe.timeoutSeconds }} - initialDelaySeconds: {{ $.Values.livenessProbe.initialDelaySeconds }} - {{- end }} - {{- if $.Values.readinessProbe.enabled }} - # Readyness Probe - readinessProbe: - httpGet: - path: /status/ready - port: {{ $.Values.fluentIngest.ports.http }} - periodSeconds: {{ $.Values.readinessProbe.periodSeconds }} - initialDelaySeconds: {{ $.Values.readinessProbe.initialDelaySeconds }} - timeoutSeconds: {{ $.Values.readinessProbe.timeoutSeconds }} - {{- end }} - {{- if $.Values.fluentIngest.containerSecurityContext }} - securityContext: - {{- toYaml $.Values.fluentIngest.containerSecurityContext | nindent 12 }} - {{- else if $.Values.containerSecurityContext }} - securityContext: - {{- toYaml $.Values.containerSecurityContext | nindent 12 }} - {{- end }} - imagePullPolicy: {{ $.Values.image.pullPolicy }} - env: - {{- include "oneuptime.env.common" . | nindent 12 }} - {{- include "oneuptime.env.runtime" (dict "Values" $.Values "Release" $.Release) | nindent 12 }} - - name: PORT - value: {{ $.Values.fluentIngest.ports.http | quote }} - - name: DISABLE_TELEMETRY - value: {{ $.Values.fluentIngest.disableTelemetryCollection | quote }} - - name: FLUENT_INGEST_CONCURRENCY - value: {{ $.Values.fluentIngest.concurrency | squote }} - ports: - - containerPort: {{ $.Values.fluentIngest.ports.http }} - protocol: TCP - name: http - {{- if $.Values.fluentIngest.resources }} - resources: - {{- toYaml $.Values.fluentIngest.resources | nindent 12 }} - {{- end }} - restartPolicy: {{ $.Values.image.restartPolicy }} - ---- - -# OneUptime fluent-ingest Service -{{- $fluentIngestPorts := dict "port" $.Values.fluentIngest.ports.http -}} -{{- $fluentIngestServiceArgs := dict "ServiceName" "fluent-ingest" "Ports" $fluentIngestPorts "Release" $.Release "Values" $.Values -}} -{{- include "oneuptime.service" $fluentIngestServiceArgs }} ---- - -# OneUptime fluent-ingest autoscaler -{{- if and (not $.Values.fluentIngest.disableAutoscaler) (not (and $.Values.keda.enabled $.Values.fluentIngest.keda.enabled)) }} -{{- $fluentIngestAutoScalerArgs := dict "ServiceName" "fluent-ingest" "Release" $.Release "Values" $.Values -}} -{{- include "oneuptime.autoscaler" $fluentIngestAutoScalerArgs }} -{{- end }} ---- diff --git a/OpenTelemetryIngest/package-lock.json b/OpenTelemetryIngest/package-lock.json index 52d0a86dc4..bdc9deb92c 100644 --- a/OpenTelemetryIngest/package-lock.json +++ b/OpenTelemetryIngest/package-lock.json @@ -89,7 +89,7 @@ "nodemailer": "^7.0.7", "otpauth": "^9.3.1", "pg": "^8.7.3", - "playwright": "^1.55.1", + "playwright": "^1.56.0", "posthog-js": "^1.275.3", "prop-types": "^15.8.1", "qrcode": "^1.5.3", @@ -120,7 +120,7 @@ "tailwind-merge": "^2.5.2", "tippy.js": "^6.3.7", "twilio": "^4.22.0", - "typeorm": "^0.3.20", + "typeorm": "^0.3.26", "typeorm-extension": "^2.2.13", "universal-cookie": "^7.2.1", "use-async-effect": "^2.2.6", diff --git a/config.example.env b/config.example.env index 7c17646591..dbfb8ff41d 100644 --- a/config.example.env +++ b/config.example.env @@ -104,7 +104,6 @@ SERVER_PROBE_INGEST_HOSTNAME=probe-ingest SERVER_SERVER_MONITOR_INGEST_HOSTNAME=server-monitor-ingest SERVER_OPEN_TELEMETRY_INGEST_HOSTNAME=otel-telemetry-ingest SERVER_INCOMING_REQUEST_INGEST_HOSTNAME=incoming-request-ingest -SERVER_FLUENT_INGEST_HOSTNAME=fluent-ingest SERVER_TEST_SERVER_HOSTNAME=test-server SERVER_STATUS_PAGE_HOSTNAME=status-page SERVER_DASHBOARD_HOSTNAME=dashboard @@ -120,7 +119,6 @@ APP_PORT=3002 PROBE_INGEST_PORT=3400 SERVER_MONITOR_INGEST_PORT=3404 OPEN_TELEMETRY_INGEST_PORT=3403 -FLUENT_INGEST_PORT=3401 INCOMING_REQUEST_INGEST_PORT=3402 TEST_SERVER_PORT=3800 ACCOUNTS_PORT=3003 diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 58eef3430c..733de32f66 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -36,7 +36,6 @@ x-common-variables: &common-variables SERVER_PROBE_INGEST_HOSTNAME: probe-ingest SERVER_OPEN_TELEMETRY_INGEST_HOSTNAME: open-telemetry-ingest SERVER_INCOMING_REQUEST_INGEST_HOSTNAME: incoming-request-ingest - SERVER_FLUENT_INGEST_HOSTNAME: fluent-ingest SERVER_TEST_SERVER_HOSTNAME: test-server SERVER_STATUS_PAGE_HOSTNAME: status-page SERVER_DASHBOARD_HOSTNAME: dashboard @@ -56,7 +55,6 @@ x-common-variables: &common-variables PROBE_INGEST_PORT: ${PROBE_INGEST_PORT} OPEN_TELEMETRY_INGEST_PORT: ${OPEN_TELEMETRY_INGEST_PORT} INCOMING_REQUEST_INGEST_PORT: ${INCOMING_REQUEST_INGEST_PORT} - FLUENT_INGEST_PORT: ${FLUENT_INGEST_PORT} TEST_SERVER_PORT: ${TEST_SERVER_PORT} ACCOUNTS_PORT: ${ACCOUNTS_PORT} STATUS_PAGE_PORT: ${STATUS_PAGE_PORT} @@ -446,20 +444,6 @@ services: options: max-size: "1000m" - fluent-ingest: - networks: - - oneuptime - restart: always - environment: - <<: *common-runtime-variables - PORT: ${FLUENT_INGEST_PORT} - DISABLE_TELEMETRY: ${DISABLE_TELEMETRY_FOR_FLUENT_INGEST} - FLUENT_INGEST_CONCURRENCY: ${FLUENT_INGEST_CONCURRENCY} - logging: - driver: "local" - options: - max-size: "1000m" - probe-ingest: networks: - oneuptime