Squashed commit of the following:

commit 965a483 Merge: f3349ce 525e746 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 13:03:13 2024 +0300 Merge pull request #505 from logzio/logzio-monitoring-6.0.3 bugfix/ Logzio monitoring 6.0.3 commit 525e746 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 13:02:53 2024 +0300 Update README.md commit 3feeff0 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:49:24 2024 +0300 changelog commit b5d1572 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:49:16 2024 +0300 Remove the duplicate label `app.kubernetes.io/managed-by` commit f3349ce Merge: 0d6dfd1 c65a60e Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:46:21 2024 +0300 Merge branch 'master' of https://github.com/logzio/logzio-helm commit 0d6dfd1 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:46:09 2024 +0300 k8s events changelog commit c65a60e Merge: 4ebd6cd cc4b540 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:43:57 2024 +0300 Merge pull request #504 from logzio/logzio-k8s-events-0.0.5 Logzio k8s events 0.0.5 commit cc4b540 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:38:41 2024 +0300 Update Chart.yaml commit 5303631 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:38:39 2024 +0300 remove `pp.kubernetes.io/managed-by` duplicate label commit 4ebd6cd Author: Ral G <[email protected]> Date: Tue Jun 18 18:20:04 2024 +0300 Upgrade `logzio-monitoring` chart tov v6.0.2 (#503) - Upgrade `logzio-k8s-telemetry` chart to `v4.2.4` - Upgrade `otel/opentelemetry-collector-contrib` image to `v0.102.1` commit 67f1532 Author: Ral G <[email protected]> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - open-telemetry/opentelemetry-collector-contrib#33231 commit 8379a75 Author: ralongit <[email protected]> Date: Tue Jun 18 15:34:56 2024 +0300 Upgrade opentelemetry image to v0.102.1 - Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit b0f75d0 Author: Ral G <[email protected]> Date: Tue Jun 18 17:20:23 2024 +0300 Update changelog commit 686158e Author: Ral G <[email protected]> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - open-telemetry/opentelemetry-collector-contrib#33231 commit 1a72f04 Author: ralongit <[email protected]> Date: Tue Jun 18 15:34:56 2024 +0300 Upgrade opentelemetry image to v0.102.1 - Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit 3d06dd0 Author: Ral G <[email protected]> Date: Tue Jun 18 17:22:41 2024 +0300 Update telemetry chart test trigger path commit 5283fd5 Author: Ral G <[email protected]> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Upgrade opentelemetry image to v0.102.1" This reverts commit a39596e. commit 41ee0f5 Author: Ral G <[email protected]> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Update changelog" This reverts commit 7b26c36. commit 7b26c36 Author: ralongit <[email protected]> Date: Tue Jun 18 15:03:06 2024 +0300 Update changelog commit a39596e Author: ralongit <[email protected]> Date: Tue Jun 18 13:46:27 2024 +0300 Upgrade opentelemetry image to v0.102.1 -Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit cc104f4 Merge: 623d936 3b83f35 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:12:57 2024 +0300 Merge pull request #500 from logzio/feature/logzio-monitoring-multi-env-tests Change env var name from `token` to `key` commit 3b83f35 Merge: 2eee533 dd01b70 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:11:52 2024 +0300 Merge remote-tracking branch 'origin/feature/logzio-monitoring-multi-env-tests' into feature/logzio-monitoring-multi-env-tests commit 2eee533 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:11:31 2024 +0300 Change env var name from `token` to `key` commit 623d936 Merge: ab68b71 dd01b70 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:52:02 2024 +0300 Merge pull request #499 from logzio/feature/logzio-monitoring-multi-env-tests Change trigger branch to master commit dd01b70 Merge: 39c57e2 ab68b71 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:51:27 2024 +0300 Merge branch 'master' into feature/logzio-monitoring-multi-env-tests commit 39c57e2 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:49:00 2024 +0300 change trigger branch to master commit ab68b71 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:30:01 2024 +0300 Automated tests for `logzio-k8s-telemetry` and `logzio-logs-colector` charts (#496) * Add files to branch * Edit container metrics query * Add api environment variables * Use `secrets` in workflows commit a0113fb Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 12:01:52 2024 +0300 Use `secrets` in workflows commit 899055f Author: Yotam loewenbach <[email protected]> Date: Mon Jun 10 15:48:04 2024 +0300 Add api environment variables commit c533c54 Author: Yotam loewenbach <[email protected]> Date: Mon Jun 10 15:46:59 2024 +0300 Edit container metrics query commit b931577 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 17:22:03 2024 +0300 Add files to branch commit 4f5980f Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 17:18:27 2024 +0300 delete from master commit 030f47e Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:34:20 2024 +0300 `env.` -> `secrets.` commit eab7352 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:32:40 2024 +0300 change cluster name commit 01e6667 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:32:26 2024 +0300 Separate metrics tests commit 143b6e4 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 14:44:36 2024 +0300 add unique id to each run commit 9a26ca2 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 14:44:23 2024 +0300 update log collector test commit 4349afb Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:29 2024 +0300 Add test for `logzio-k8s-telemetry` commit 766024f Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:26 2024 +0300 Add test for `logzio-k8s-telemetry` commit 0586836 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:06 2024 +0300 go mod commit ce271f0 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:48 2024 +0300 common.go commit 0c463f3 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:34 2024 +0300 update e2e tests commit ed60767 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:23 2024 +0300 test resources commit 6d11e12 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:12 2024 +0300 Delete unused files commit 6e277bf Merge: ea90448 7127169 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 15:14:18 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit ea90448 Merge: 1ebd28d b63e44f Author: Yotam loewenbach <[email protected]> Date: Wed May 29 12:38:35 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit 1ebd28d Author: Yotam loewenbach <[email protected]> Date: Wed May 22 22:01:07 2024 +0300 add multi env initial workflow commit 023fc61 Author: Yotam loewenbach <[email protected]> Date: Wed May 22 21:59:27 2024 +0300 go mod commit 41cf719 Author: Yotam loewenbach <[email protected]> Date: Wed May 22 21:59:21 2024 +0300 Add e2e tests for logs, metrics, traces commit 993ae74 Author: Yotam loewenbach <[email protected]> Date: Mon May 20 12:43:39 2024 +0300 Delete old and unused test files
logzio · Jun 19, 2024 · da3f1e3 · da3f1e3
1 parent 250a73f
commit da3f1e3
Show file tree

Hide file tree

Showing 25 changed files with 689 additions and 806 deletions.
diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml
diff --git a/.github/workflows/logzio-logs-collector-test.yaml b/.github/workflows/logzio-logs-collector-test.yaml
@@ -0,0 +1,76 @@
+name: Test Logzio Logs Collector Helm Chart on Kind Kubernetes Environment
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'charts/logzio-logs-collector/**'
+jobs:
+  test-helm-chart:
+    name: Test Helm Chart on Kind
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate random id
+        id: random_id
+        run: echo "::set-output name=rand::$(echo $RANDOM)"
+
+      - name: Set ENV_ID
+        run: echo "ENV_ID=logs-test-run-${{ steps.random_id.outputs.rand }}" >> $GITHUB_ENV
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+
+      - name: Set up Helm
+        uses: azure/[email protected]
+
+      - name: Set up kubectl
+        uses: azure/setup-kubectl@v3
+
+      - name: Install Kind
+        run: |
+          curl -Lo ./kind "https://kind.sigs.k8s.io/dl/v0.11.1/kind-Linux-amd64"
+          chmod +x ./kind
+          mv ./kind /usr/local/bin/kind
+
+      - name: Create Kind cluster
+        run: |
+          kind create cluster --name kind-${{ github.run_id }}
+          kubectl cluster-info
+
+      - name: Deploy Helm Chart
+        run: |
+          cd charts/logzio-logs-collector
+          helm upgrade --install \
+          --set secrets.env_id=${{ env.ENV_ID }} \
+          --set secrets.logzioLogsToken=${{ secrets.LOGZIO_LOGS_TOKEN }} \
+          --set secrets.logzioRegion=us \
+          logzio-logs-collector .
+
+      - name: run log generator
+        run: |
+          kubectl apply -f tests/resources/logsgen.yaml
+          kubectl rollout status deployment/log-generator --timeout=300s
+
+      - name: sleep
+        run: sleep 120
+
+      - name: Run Go Tests
+        env:
+          LOGZIO_LOGS_API_KEY: ${{ secrets.LOGZIO_LOGS_API_KEY }}
+        run: |
+          go get go.uber.org/zap
+          go test -v ./tests/logs_e2e_test.go ./tests/common.go
+
+      - name: Cleanup Environment
+        run: |
+          helm uninstall logzio-logs-collector
+
+      - name: Delete Kind cluster
+        if: always()
+        run: kind delete cluster --name kind-${{ github.run_id }}
diff --git a/.github/workflows/logzio-telemetry-test.yaml b/.github/workflows/logzio-telemetry-test.yaml
@@ -0,0 +1,90 @@
+name: Test Logzio Telemetry Helm Chart on Kind Kubernetes Environment
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'charts/logzio-telemetry/**'
+jobs:
+  test-helm-chart:
+    name: Test Helm Chart on Kind
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mode: ['daemonset', 'standalone']
+    steps:
+      - name: Generate random id
+        id: random_id
+        run: echo "::set-output name=rand::$(echo $RANDOM)"
+
+      - name: Set ENV_ID
+        run: echo "ENV_ID=telemetry-test-run-${{ steps.random_id.outputs.rand }}-${{ matrix.mode }}" >> $GITHUB_ENV
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+
+      - name: Set up Helm
+        uses: azure/[email protected]
+
+      - name: Set up kubectl
+        uses: azure/setup-kubectl@v3
+
+      - name: Install Kind
+        run: |
+          curl -Lo ./kind "https://kind.sigs.k8s.io/dl/v0.11.1/kind-Linux-amd64"
+          chmod +x ./kind
+          mv ./kind /usr/local/bin/kind
+
+      - name: Create Kind cluster
+        run: |
+          kind create cluster --name kind-${{ github.run_id }}-${{ matrix.mode }}
+          kubectl cluster-info
+
+      - name: Deploy Helm Chart
+        run: |
+          cd charts/logzio-telemetry
+          helm dependency build
+          helm upgrade --install \
+          --set traces.enabled=true \
+          --set spm.enabled=true \
+          --set metrics.enabled=true \
+          --set secrets.TracesToken=${{ secrets.LOGZIO_TRACES_TOKEN }} \
+          --set secrets.SpmToken=${{ secrets.LOGZIO_METRICS_TOKEN }} \
+          --set secrets.MetricsToken=${{ secrets.LOGZIO_METRICS_TOKEN }} \
+          --set secrets.ListenerHost=https://listener.logz.io:8053 \
+          --set secrets.p8s_logzio_name=${{ env.ENV_ID }} \
+          --set secrets.env_id=${{ env.ENV_ID }} \
+          --set mode=${{ matrix.mode }} \
+          logzio-k8s-telemetry .
+          kubectl rollout status deployment/logzio-k8s-telemetry-otel-collector-standalone --timeout=300s
+          kubectl rollout status deployment/logzio-k8s-telemetry-otel-collector-spm --timeout=300s
+
+      - name: run trace generator
+        run: |
+          kubectl apply -f tests/resources/tracegen.yaml
+          kubectl rollout status deployment/trace-gen --timeout=300s
+
+      - name: sleep for 2 minutes
+        run: sleep 120
+
+      - name: Run Go Tests
+        env:
+          LOGZIO_METRICS_API_KEY: ${{ secrets.LOGZIO_METRICS_API_KEY }}
+          LOGZIO_TRACES_API_KEY: ${{ secrets.LOGZIO_TRACES_API_KEY }}
+        run: |
+          go get go.uber.org/zap
+          go test -v ./tests/traces_e2e_test.go ./tests/common.go
+          go test -v ./tests/metrics_e2e_test.go ./tests/common.go
+      - name: Cleanup Environment
+        run: |
+          helm uninstall logzio-k8s-telemetry
+
+      - name: Delete Kind cluster
+        if: always()
+        run: kind delete cluster --name kind-${{ github.run_id }}-${{ matrix.mode }}
+
diff --git a/.github/workflows/monitoring-tests.yaml b/.github/workflows/monitoring-tests.yaml
diff --git a/charts/logzio-k8s-events/Chart.yaml b/charts/logzio-k8s-events/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
   - logging
   - k8s
   - kubernetes
-version: 0.0.4
+version: 0.0.5
 appVersion: 0.0.2
 maintainers:
   - name: Raul Gurshumov

diff --git a/charts/logzio-k8s-events/README.md b/charts/logzio-k8s-events/README.md
@@ -98,6 +98,8 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain
 
 
 ## Change log
+ - **0.0.5**:
+    - Remove the duplicate label `app.kubernetes.io/managed-by` @philwelz
  - **0.0.4**:
     - Enhanced env_id handling to support both numeric and string formats.
  - **0.0.3**:

diff --git a/charts/logzio-k8s-events/templates/_helpers.tpl b/charts/logzio-k8s-events/templates/_helpers.tpl
@@ -40,7 +40,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{ include "logzio-k8s-events.selectorLabels" . }}
 {{- end }}