fix: convert prometheus charts to helm install (#597)

* fix: prometheus-blackbox-exporter kustomize->helm driven install * fix: prometheus-postgres-exporter kustomize->helm driven install * fix: prometheus-rabbitmq-exporter kustomize->helm driven install * fix: prometheus-pushgateway kustomize->helm driven install * fix: prometheus-mysql-exporter kustomize->helm driven install JIRA:OSPC-854
rackerlabs · Nov 27, 2024 · c2714f0 · c2714f0
1 parent 749db1b
commit c2714f0
Show file tree

Hide file tree

Showing 31 changed files with 233 additions and 151 deletions.
diff --git a/.github/workflows/helm-prometheus-blackbox-exporter.yaml b/.github/workflows/helm-prometheus-blackbox-exporter.yaml
@@ -0,0 +1,42 @@
+name: Helm GitHub Actions for Prometheus Blackbox Exporter
+
+on:
+  pull_request:
+    paths:
+      - base-helm-configs/prometheus-blackbox-exporter/**
+      - base-kustomize/prometheus-blackbox-exporter/**
+      - .github/workflows/helm-prometheus-blackbox-exporter.yaml
+jobs:
+  helm:
+    strategy:
+      matrix:
+        overlays:
+          - base
+    name: Helm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: azure/setup-helm@v3
+        with:
+          version: latest
+          token: "${{ secrets.GITHUB_TOKEN }}"
+        id: helm
+      - name: Add prometheus-community repo to helm
+        run: |
+            ${{ steps.helm.outputs.helm-path }} repo add prometheus-community https://prometheus-community.github.io/helm-charts
+            ${{ steps.helm.outputs.helm-path }} repo update
+      - name: Run Helm Template
+        run: |
+          ${{ steps.helm.outputs.helm-path }} template prometheus-blackbox-exporter prometheus-community/prometheus-blackbox-exporter \
+            --create-namespace \
+            --namespace=prometheus \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-blackbox-exporter/values.yaml \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-blackbox-exporter/probe_targets.yaml \
+            --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
+            --post-renderer-args prometheus-blackbox-exporter/${{ matrix.overlays }} > /tmp/rendered.yaml
+      - name: Return helm Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm-prometheus-artifact-${{ matrix.overlays }}
+          path: /tmp/rendered.yaml
diff --git a/.github/workflows/helm-prometheus-mysql-exporter.yaml b/.github/workflows/helm-prometheus-mysql-exporter.yaml
@@ -0,0 +1,41 @@
+name: Helm GitHub Actions for Prometheus MySQL Exporter
+
+on:
+  pull_request:
+    paths:
+      - base-helm-configs/prometheus-mysql-exporter/**
+      - base-kustomize/prometheus-mysql-exporter/**
+      - .github/workflows/helm-prometheus-mysql-exporter.yaml
+jobs:
+  helm:
+    strategy:
+      matrix:
+        overlays:
+          - base
+    name: Helm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: azure/setup-helm@v3
+        with:
+          version: latest
+          token: "${{ secrets.GITHUB_TOKEN }}"
+        id: helm
+      - name: Add prometheus-community repo to helm
+        run: |
+            ${{ steps.helm.outputs.helm-path }} repo add prometheus-community https://prometheus-community.github.io/helm-charts
+            ${{ steps.helm.outputs.helm-path }} repo update
+      - name: Run Helm Template
+        run: |
+          ${{ steps.helm.outputs.helm-path }} template prometheus-mysql-exporter prometheus-community/prometheus-mysql-exporter \
+            --create-namespace \
+            --namespace=prometheus \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-mysql-exporter/values.yaml \
+            --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
+            --post-renderer-args prometheus-mysql-exporter/${{ matrix.overlays }} > /tmp/rendered.yaml
+      - name: Return helm Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm-prometheus-artifact-${{ matrix.overlays }}
+          path: /tmp/rendered.yaml
diff --git a/.github/workflows/helm-prometheus-postgres-exporter.yaml b/.github/workflows/helm-prometheus-postgres-exporter.yaml
@@ -0,0 +1,41 @@
+name: Helm GitHub Actions for Prometheus Postgres Exporter
+
+on:
+  pull_request:
+    paths:
+      - base-helm-configs/prometheus-postgres-exporter/**
+      - base-kustomize/prometheus-postgres-exporter/**
+      - .github/workflows/helm-prometheus-postgres-exporter.yaml
+jobs:
+  helm:
+    strategy:
+      matrix:
+        overlays:
+          - base
+    name: Helm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: azure/setup-helm@v3
+        with:
+          version: latest
+          token: "${{ secrets.GITHUB_TOKEN }}"
+        id: helm
+      - name: Add prometheus-community repo to helm
+        run: |
+            ${{ steps.helm.outputs.helm-path }} repo add prometheus-community https://prometheus-community.github.io/helm-charts
+            ${{ steps.helm.outputs.helm-path }} repo update
+      - name: Run Helm Template
+        run: |
+          ${{ steps.helm.outputs.helm-path }} template prometheus prometheus-community/prometheus-postgres-exporter \
+            --create-namespace \
+            --namespace=prometheus \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-postgres-exporter/values.yaml \
+            --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
+            --post-renderer-args prometheus-postgres-exporter/${{ matrix.overlays }} > /tmp/rendered.yaml
+      - name: Return helm Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm-prometheus-artifact-${{ matrix.overlays }}
+          path: /tmp/rendered.yaml
diff --git a/.github/workflows/helm-prometheus-pushgateway.yaml b/.github/workflows/helm-prometheus-pushgateway.yaml
@@ -0,0 +1,41 @@
+name: Helm GitHub Actions for Prometheus Pushgateway
+
+on:
+  pull_request:
+    paths:
+      - base-helm-configs/prometheus-pushgateway/**
+      - base-kustomize/prometheus-pushgateway/**
+      - .github/workflows/helm-prometheus-pushgateway.yaml
+jobs:
+  helm:
+    strategy:
+      matrix:
+        overlays:
+          - base
+    name: Helm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: azure/setup-helm@v3
+        with:
+          version: latest
+          token: "${{ secrets.GITHUB_TOKEN }}"
+        id: helm
+      - name: Add prometheus-community repo to helm
+        run: |
+            ${{ steps.helm.outputs.helm-path }} repo add prometheus-community https://prometheus-community.github.io/helm-charts
+            ${{ steps.helm.outputs.helm-path }} repo update
+      - name: Run Helm Template
+        run: |
+          ${{ steps.helm.outputs.helm-path }} template prometheus-pushgateway prometheus-community/prometheus-pushgateway \
+            --create-namespace \
+            --namespace=prometheus \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-pushgateway/values.yaml \
+            --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
+            --post-renderer-args prometheus-pushgateway/${{ matrix.overlays }} > /tmp/rendered.yaml
+      - name: Return helm Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm-prometheus-artifact-${{ matrix.overlays }}
+          path: /tmp/rendered.yaml
diff --git a/.github/workflows/helm-prometheus-rabbitmq-exporter.yaml b/.github/workflows/helm-prometheus-rabbitmq-exporter.yaml
@@ -0,0 +1,41 @@
+name: Helm GitHub Actions for Prometheus RabbitMQ Exporter
+
+on:
+  pull_request:
+    paths:
+      - base-helm-configs/prometheus-rabbitmq-exporter/**
+      - base-kustomize/prometheus-rabbitmq-exporter/**
+      - .github/workflows/helm-prometheus-rabbitmq-exporter.yaml
+jobs:
+  helm:
+    strategy:
+      matrix:
+        overlays:
+          - base
+    name: Helm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: azure/setup-helm@v3
+        with:
+          version: latest
+          token: "${{ secrets.GITHUB_TOKEN }}"
+        id: helm
+      - name: Add prometheus-community repo to helm
+        run: |
+            ${{ steps.helm.outputs.helm-path }} repo add prometheus-community https://prometheus-community.github.io/helm-charts
+            ${{ steps.helm.outputs.helm-path }} repo update
+      - name: Run Helm Template
+        run: |
+          ${{ steps.helm.outputs.helm-path }} template prometheus-rabbitmq-exporter prometheus-community/prometheus-rabbitmq-exporter \
+            --create-namespace \
+            --namespace=openstack \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-rabbitmq-exporter/values.yaml \
+            --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
+            --post-renderer-args prometheus-rabbitmq-exporter/${{ matrix.overlays }} > /tmp/rendered.yaml
+      - name: Return helm Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm-prometheus-artifact-${{ matrix.overlays }}
+          path: /tmp/rendered.yaml
diff --git a/.github/workflows/kustomize-prometheus-mysql-exporter.yaml b/.github/workflows/kustomize-prometheus-mysql-exporter.yaml
diff --git a/.github/workflows/kustomize-prometheus-postgres-exporter.yaml b/.github/workflows/kustomize-prometheus-postgres-exporter.yaml
diff --git a/.github/workflows/kustomize-prometheus-rabbitmq-exporter.yaml b/.github/workflows/kustomize-prometheus-rabbitmq-exporter.yaml
diff --git a/...heus-blackbox-exporter/probe_targets.yaml → ...heus-blackbox-exporter/probe_targets.yaml b/...heus-blackbox-exporter/probe_targets.yaml → ...heus-blackbox-exporter/probe_targets.yaml
diff --git a/.../prometheus-blackbox-exporter/values.yaml → .../prometheus-blackbox-exporter/values.yaml b/.../prometheus-blackbox-exporter/values.yaml → .../prometheus-blackbox-exporter/values.yaml
diff --git a/...ize/prometheus-mysql-exporter/values.yaml → ...igs/prometheus-mysql-exporter/values.yaml b/...ize/prometheus-mysql-exporter/values.yaml → ...igs/prometheus-mysql-exporter/values.yaml
diff --git a/.../prometheus-postgres-exporter/values.yaml → .../prometheus-postgres-exporter/values.yaml b/.../prometheus-postgres-exporter/values.yaml → .../prometheus-postgres-exporter/values.yaml
diff --git a/...tomize/prometheus-pushgateway/values.yaml → ...onfigs/prometheus-pushgateway/values.yaml b/...tomize/prometheus-pushgateway/values.yaml → ...onfigs/prometheus-pushgateway/values.yaml
diff --git a/.../prometheus-rabbitmq-exporter/values.yaml → .../prometheus-rabbitmq-exporter/values.yaml b/.../prometheus-rabbitmq-exporter/values.yaml → .../prometheus-rabbitmq-exporter/values.yaml
diff --git a/base-kustomize/prometheus-blackbox-exporter/base/kustomization.yaml b/base-kustomize/prometheus-blackbox-exporter/base/kustomization.yaml
@@ -0,0 +1,4 @@
+sortOptions:
+  order: fifo
+resources:
+  - all.yaml
diff --git a/base-kustomize/prometheus-blackbox-exporter/kustomization.yaml b/base-kustomize/prometheus-blackbox-exporter/kustomization.yaml
diff --git a/base-kustomize/prometheus-mysql-exporter/base/kustomization.yaml b/base-kustomize/prometheus-mysql-exporter/base/kustomization.yaml
@@ -0,0 +1,6 @@
+sortOptions:
+  order: fifo
+resources:
+  - monitoring_user_create.yaml
+  - monitoring_user_grant.yaml
+  - all.yaml
diff --git a/...ysql-exporter/monitoring_user_create.yaml → ...exporter/base/monitoring_user_create.yaml b/...ysql-exporter/monitoring_user_create.yaml → ...exporter/base/monitoring_user_create.yaml
diff --git a/...mysql-exporter/monitoring_user_grant.yaml → ...-exporter/base/monitoring_user_grant.yaml b/...mysql-exporter/monitoring_user_grant.yaml → ...-exporter/base/monitoring_user_grant.yaml
diff --git a/base-kustomize/prometheus-mysql-exporter/kustomization.yaml b/base-kustomize/prometheus-mysql-exporter/kustomization.yaml
diff --git a/base-kustomize/prometheus-postgres-exporter/base/kustomization.yaml b/base-kustomize/prometheus-postgres-exporter/base/kustomization.yaml
@@ -0,0 +1,4 @@
+sortOptions:
+  order: fifo
+resources:
+  - all.yaml
diff --git a/base-kustomize/prometheus-postgres-exporter/kustomization.yaml b/base-kustomize/prometheus-postgres-exporter/kustomization.yaml
diff --git a/base-kustomize/prometheus-pushgateway/base/kustomization.yaml b/base-kustomize/prometheus-pushgateway/base/kustomization.yaml
@@ -0,0 +1,4 @@
+sortOptions:
+  order: fifo
+resources:
+  - all.yaml
diff --git a/base-kustomize/prometheus-pushgateway/kustomization.yaml b/base-kustomize/prometheus-pushgateway/kustomization.yaml
diff --git a/base-kustomize/prometheus-rabbitmq-exporter/base/kustomization.yaml b/base-kustomize/prometheus-rabbitmq-exporter/base/kustomization.yaml
@@ -0,0 +1,4 @@
+sortOptions:
+  order: fifo
+resources:
+  - all.yaml
diff --git a/base-kustomize/prometheus-rabbitmq-exporter/kustomization.yaml b/base-kustomize/prometheus-rabbitmq-exporter/kustomization.yaml
diff --git a/docs/prometheus-blackbox-exporter.md b/docs/prometheus-blackbox-exporter.md
@@ -8,7 +8,7 @@ The blackbox exporter ideally would be ran outside the cluster but can still pro
 
 
 ``` shell
-kubectl kustomize --enable-helm /etc/genestack/kustomize/prometheus-blackbox-exporter | kubectl apply -f -
+bin/install-chart.sh prometheus-blackbox-exporter
 ```
 
 !!! success