Observability - Helm chart releases (#63)

* Observability - new Otel and Grafana helm #61 * Observability Helm charts * GH worklow updates * Chart dependencies
Azure-Samples · Sep 29, 2023 · a534e25 · a534e25
1 parent 8bd1fce
commit a534e25
Show file tree

Hide file tree

Showing 59 changed files with 4,159 additions and 50 deletions.
diff --git a/.github/workflows/Release-dnsmasq.yml → ...hub/workflows/Release-helm-dnsmasqaks.yml b/.github/workflows/Release-dnsmasq.yml → ...hub/workflows/Release-helm-dnsmasqaks.yml
@@ -1,4 +1,4 @@
-name: Main - Release Helm Chart DNSMasq
+name: Main - Release Helm Charts - DNSMasqAKS
 on: 
   push:
     branches: 
@@ -21,12 +21,15 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "[email protected]"
 
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo main-${GITHUB_SHA})
-
-    - name: Echo Docker images tag
-      run: echo ${{steps.vars.outputs.tag}}
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/Release-helm-edgeobservability.yml b/.github/workflows/Release-helm-edgeobservability.yml
@@ -0,0 +1,39 @@
+name: Main - Release Helm Charts - Observability
+on: 
+  push:
+    branches: 
+      - main
+    paths:
+      # Only run this when chart file is updated.
+      - 'deployment/helm/edgeobservability/Chart.yaml'
+
+jobs:
+  Release-Artifacts:      
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Configure Git
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "[email protected]"
+
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
+
+    - name: Run chart-releaser
+      uses: helm/[email protected]
+      env:
+        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      with:
+        charts_dir: deployment/helm
diff --git a/.github/workflows/Release-envoy-proxy.yml → .github/workflows/Release-helm-envoy.yml b/.github/workflows/Release-envoy-proxy.yml → .github/workflows/Release-helm-envoy.yml
@@ -1,4 +1,4 @@
-name: Main - Release Helm Chart Envoy Proxy
+name: Main - Release Helm Charts - Envoy
 on: 
   push:
     branches: 
@@ -21,12 +21,15 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "[email protected]"
 
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo main-${GITHUB_SHA})
-
-    - name: Echo Docker images tag
-      run: echo ${{steps.vars.outputs.tag}}
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/Release-L2.yml → ...ub/workflows/Release-helm-iot-edge-l2.yml b/.github/workflows/Release-L2.yml → ...ub/workflows/Release-helm-iot-edge-l2.yml
@@ -1,4 +1,4 @@
-name: Main - Release Helm Chart IoT Edge Accelerator L2
+name: Main - Release Helm Charts - L2
 on: 
   push:
     branches: 
@@ -21,12 +21,15 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "[email protected]"
 
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo main-${GITHUB_SHA})
-
-    - name: Echo Docker images tag
-      run: echo ${{steps.vars.outputs.tag}}
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/Release-L4.yml → ...ub/workflows/Release-helm-iot-edge-l4.yml b/.github/workflows/Release-L4.yml → ...ub/workflows/Release-helm-iot-edge-l4.yml
@@ -1,4 +1,4 @@
-name: Main - Release Helm Chart IoT Edge Accelerator L4
+name: Main - Release Helm Charts - L4
 on: 
   push:
     branches: 
@@ -21,12 +21,15 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "[email protected]"
 
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo main-${GITHUB_SHA})
-
-    - name: Echo Docker images tag
-      run: echo ${{steps.vars.outputs.tag}}
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/Release-mosquitto.yml → .github/workflows/Release-helm-mosquitto.yml b/.github/workflows/Release-mosquitto.yml → .github/workflows/Release-helm-mosquitto.yml
@@ -1,4 +1,4 @@
-name: Main - Release Helm Chart Mosquitto Broker
+name: Main - Release Helm Charts - Mosquitto
 on: 
   push:
     branches: 
@@ -21,12 +21,15 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "[email protected]"
 
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo main-${GITHUB_SHA})
-
-    - name: Echo Docker images tag
-      run: echo ${{steps.vars.outputs.tag}}
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/Release-helm-otelcollection.yml b/.github/workflows/Release-helm-otelcollection.yml
@@ -0,0 +1,39 @@
+name: Main - Release Helm Charts - OtelCollection
+on: 
+  push:
+    branches: 
+      - main
+    paths:
+      # Only run this when chart file is updated.
+      - 'deployment/helm/otelcollection/Chart.yaml'
+
+jobs:
+  Release-Artifacts:      
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Configure Git
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "[email protected]"
+
+    - name: Setup Helm
+      uses: azure/[email protected] 
+      with:
+        version: v3.9.2
+
+    - name: Add Helm chart dependencies
+      run: |
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm repo add grafana https://grafana.github.io/helm-charts
+
+    - name: Run chart-releaser
+      uses: helm/[email protected]
+      env:
+        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      with:
+        charts_dir: deployment/helm
diff --git a/deployment/helm/dnsmasqaks/Chart.yaml b/deployment/helm/dnsmasqaks/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/deployment/helm/dnsmasqaks/templates/dnsmasq/configmaps.yaml b/deployment/helm/dnsmasqaks/templates/dnsmasq/configmaps.yaml
@@ -25,4 +25,7 @@ data:
     {{- range $key, $val := .Values.hostsDomains }}
     {{ $dnsServer }} {{ $val }}
     {{- end }}
+    {{- range $key, $val := .Values.customDomains }}
+    {{ $dnsServer }} {{ $val }}
+    {{- end }}
   
diff --git a/deployment/helm/dnsmasqaks/values.yaml b/deployment/helm/dnsmasqaks/values.yaml
@@ -33,6 +33,9 @@ wildcardDomains:
   docker_io: "docker.io" # temporary for mosquitto image # TODO remove once usage of connected container registry
   azurecr_io: "azurecr.io" # temporary for dev images of this project # TODO remove once usage of connected container registry
   githubusercontent_com: "githubusercontent.com" # for flux repo in GitHub
+  quay_io: "quay.io" # for images for cert-manager and otel operator
+  pkg_dev: "pkg.dev" # for images from registry.k8s.io - kube-state-metrics # TODO remove once usage of connected container registry
+  amazonaws_com: "amazonaws.com" # for images from registry.k8s.io - kube-state-metrics # TODO remove once usage of connected container registry
 
 # Provide additional domains that you want to proxy through, pass the whole collection through Values
 # customDomains:

diff --git a/deployment/helm/edgeobservability/.gitignore b/deployment/helm/edgeobservability/.gitignore
@@ -0,0 +1 @@
+/charts
diff --git a/deployment/helm/edgeobservability/.helmignore b/deployment/helm/edgeobservability/.helmignore
@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+.tgz
+index.yaml
diff --git a/deployment/helm/edgeobservability/Chart.lock b/deployment/helm/edgeobservability/Chart.lock
@@ -0,0 +1,12 @@
+dependencies:
+- name: tempo
+  repository: https://grafana.github.io/helm-charts
+  version: 0.16.2
+- name: loki
+  repository: https://grafana.github.io/helm-charts
+  version: 2.16.0
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 24.3.0
+digest: sha256:8dfb27c12c2c334b6ad22253880a1ecdd2f53b93c1afd5ce09b17adb1af2a49e
+generated: "2023-09-06T15:50:33.6038669+02:00"
diff --git a/deployment/helm/edgeobservability/Chart.yaml b/deployment/helm/edgeobservability/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v2
+name: edgeobservability
+description: A Helm chart with observability components for Edge deployments.
+version: 0.1.0
+
+dependencies: 
+  - name: tempo
+    repository: https://grafana.github.io/helm-charts     
+    version: 0.16.2
+    condition: tempo.enabled
+
+  - name: loki
+    repository: https://grafana.github.io/helm-charts
+    version: 2.16.0
+    condition: loki.enabled
+
+  - name: prometheus
+    repository: https://prometheus-community.github.io/helm-charts
+    version: 24.3.0
+    condition: prometheus.enabled
+
diff --git a/deployment/helm/edgeobservability/templates/grafana/_helpers.tpl b/deployment/helm/edgeobservability/templates/grafana/_helpers.tpl
@@ -0,0 +1,42 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "grafana.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "grafana.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "grafana.labels" -}}
+helm.sh/chart: {{ include "grafana.chart" . }}
+{{ include "grafana.selectorLabels" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "grafana.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "grafana.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "grafana.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default "grafana" .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/edgeobservability/templates/grafana/config-dashboard.yaml b/deployment/helm/edgeobservability/templates/grafana/config-dashboard.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: grafana-config-dashboards
+  labels:
+  {{- include "grafana.labels" . | nindent 4 }}
+data:
+  provider.yaml: |
+    apiVersion: 1
+    providers:
+    - allowUiUpdates: false
+      disableDeletion: false
+      folder: ""
+      name: sidecarProvider
+      options:
+        foldersFromFilesStructure: false
+        path: /tmp/dashboards
+      orgId: 1
+      type: file
+      updateIntervalSeconds: 30