comment out Test Helm Chart CI step for now

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>

.github/workflows/helm-ci.yml

@@ -16,86 +16,51 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      # - name: Check Docs
-      #   run: |
-      #     docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:v1.11.0
-      #     if ! git diff --exit-code; then
-      #         echo "Documentation not up to date. Please run helm-docs and commit changes!" >&2
-      #         exit 1
-      #     fi
-
       - name: Lint Yaml
         run: make helm-lint
 
-      # - name: Lint Code Base
+  # call-test:
-      #   uses: docker://github/super-linter:v3.12.0
+  #   name: Test Helm Chart
-      #   env:
+  #   runs-on: ubuntu-latest
-      #     FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).*
+  #   steps:
-      #     FILTER_REGEX_INCLUDE: .*charts/meta-monitoring/.*
+  #     - name: Checkout
-      #     VALIDATE_ALL_CODEBASE: false
+  #       uses: actions/checkout@v3
-      #     VALIDATE_KUBERNETES_KUBEVAL: false
+  #       with:
-      #     VALIDATE_YAML: false
+  #         fetch-depth: 0
-      #     VALIDATE_GO: false
-      #     DEFAULT_BRANCH: main
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  call-test:
-    name: Test Helm Chart
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
 
-      - name: Set up Helm
+  #     - name: Set up Helm
-        uses: azure/setup-helm@v3
+  #       uses: azure/setup-helm@v3
-        with:
+  #       with:
-          version: v3.8.2
+  #         version: v3.8.2
 
-      # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
+  #     # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
-      # yamllint (https://github.com/adrienverge/yamllint) which require Python
+  #     # yamllint (https://github.com/adrienverge/yamllint) which require Python
-      - name: Set up Python
+  #     - name: Set up Python
-        uses: actions/setup-python@v4
+  #       uses: actions/setup-python@v4
-        with:
+  #       with:
-          python-version: 3.7
+  #         python-version: 3.7
 
-      - name: Set up chart-testing
+  #     - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+  #       uses: helm/chart-testing-action@v2.4.0
 
-      - name: Run chart-testing (list-changed)
+  #     - name: Run chart-testing (list-changed)
-        id: list-changed
+  #       id: list-changed
-        run: |
+  #       run: |
-          changed=$(ct list-changed --config "${CT_CONFIGFILE}")
+  #         changed=$(ct list-changed --config "${CT_CONFIGFILE}")
-          if [[ -n "$changed" ]]; then
+  #         if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+  #           echo "changed=true" >> $GITHUB_OUTPUT
-          fi
+  #         fi
 
-      - name: Run chart-testing (lint)
+  #     - name: Run chart-testing (lint)
-        run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false
+  #       run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false
 
-      - name: Create kind cluster
+  #     - name: Create kind cluster
-        uses: helm/kind-action@v1.8.0
+  #       uses: helm/kind-action@v1.8.0
-        if: steps.list-changed.outputs.changed == 'true'
+  #       if: steps.list-changed.outputs.changed == 'true'
+  #       with:
+  #         config: tools/kind.config
 
-      # - name: Install prometheus operator
+  #     - name: Run chart-testing (install)
-      #   id: install-prometheus
+  #       run: |
-      #   if: steps.list-changed.outputs.changed == 'true'
+  #         changed=$(ct list-changed --config "${CT_CONFIGFILE}")
-      #   run: |
+  #         ct install --config "${CT_CONFIGFILE}"
-      #     kubectl create namespace prometheus
-
-      #     helm install prometheus prometheus-community/kube-prometheus-stack \
-      #       --namespace prometheus \
-      #       --set grafana.enabled=false \
-      #       --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus
-
-      #     kubectl --namespace prometheus get pods -l "release=prometheus"
-      #     kubectl --namespace prometheus get services -l "release=prometheus"
-
-      - name: Run chart-testing (install)
-        run: |
-          changed=$(ct list-changed --config "${CT_CONFIGFILE}")
-          if [[ "$changed" == "charts/enterprise-metrics" ]]; then
-            # Do not run `ct install` for enterprise-metrics
-            exit 0
-          fi
-          ct install --config "${CT_CONFIGFILE}"

Makefile

@@ -6,5 +6,5 @@ help:
 
 .PHONY: helm-lint
 
-helm-lint: ## run helm linter
+helm-lint: ## Run helm linter
 	$(MAKE) -BC charts/meta-monitoring lint

charts/meta-monitoring/Chart.lock

@@ -15,4 +15,4 @@ dependencies:
   repository: https://charts.min.io
   version: 5.0.11
 digest: sha256:da0e744b5046eb7972e0bf82d1d0ba4786e9600af63b65f35b16118105248074
-generated: "2023-08-16T16:08:36.406791+01:00"
+generated: "2023-08-18T10:58:08.978123+01:00"

charts/meta-monitoring/Makefile

@@ -1,4 +1,4 @@
-.DEFAULT_GOAL := all
+.DEFAULT_GOAL := lint
 .PHONY: lint lint-yaml
 
 lint: lint-yaml

charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml

@@ -14,6 +14,6 @@ data:
     {{ $.Files.Get "src/dashboards/agent-remote-write.json" | fromJson | toJson }}
   "agent-tracing-pipeline.json": |
     {{ $.Files.Get "src/dashboards/agent-tracing-pipeline.json" | fromJson | toJson }}
-  "agent-overview.json": |
+  "agent.json": |
     {{ $.Files.Get "src/dashboards/agent.json" | fromJson | toJson }}
 {{- end }}

charts/meta-monitoring/templates/ruler/ruler.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.local.metrics.enabled }}
 {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }}
 apiVersion: apps/v1
 kind: Deployment
@@ -91,8 +92,6 @@ spec:
         runAsUser: 10001
         seccompProfile:
           type: RuntimeDefault
-      serviceAccount: meta-mimir
-      serviceAccountName: meta-mimir
       terminationGracePeriodSeconds: 180
       topologySpreadConstraints:
         - labelSelector:
@@ -124,3 +123,4 @@ spec:
             name: rules
           name: rules
 {{- end }}
+{{- end }}

charts/meta-monitoring/templates/ruler/rules-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.local.metrics.enabled }}
 {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }}
 ---
 apiVersion: v1
@@ -16,3 +17,4 @@ data:
 {{ ($.Files.Glob "src/rules/tempo-rules.yaml").AsConfig | indent 2 }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/meta-monitoring/values.yaml

@@ -6,34 +6,34 @@ namespacesToMonitor:
 # The name of the cluster where this will be installed
 clusterName: "meta-monitoring"
 
-# Set to true for a local version of logs, metrics or traces
-local:
-  logs:
-    enabled: true
-  metrics:
-    enabled: true
-  traces:
-    enabled: true
-  minio:
-    enabled: true  # This should be set to true if any of the previous is enabled
-
 # Set to true to write logs, metrics or traces to Grafana Cloud
 cloud:
+  logs:
+    enabled: true
+    endpoint: to_be_changed
+    username: to_be_changed
+    password: to_be_changed
+  metrics:
+    enabled: true
+    endpoint: to_be_changed
+    username: to_be_changed
+    password: to_be_changed
+  traces:
+    enabled: true
+    endpoint: to_be_changed
+    username: to_be_changed
+    password: to_be_changed
+
+# Set to true for a local version of logs, metrics or traces
+local:
   logs:
     enabled: false
-    endpoint:
-    username:
-    password:
   metrics:
     enabled: false
-    endpoint:
-    username:
-    password:
   traces:
     enabled: false
-    endpoint:
+  minio:
-    username:
+    enabled: false  # This should be set to true if any of the previous is enabled
-    password:
 
 # Adding regexes here will add a stage.replace block for logs. For more information see
 # https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/#stagereplace-block
@@ -90,7 +90,7 @@ loki:
       compactor:
         retention_enabled: true
       limits_config:
-        retention_period: 24h
+        retention_period: 30d
   monitoring:
     dashboards:
       enabled: false
@@ -142,7 +142,7 @@ mimir-distributed:
           secret_access_key: "{{ .Values.global.minio.rootPassword }}"
           insecure: true
       limits:
-        compactor_blocks_retention_period: 24h
+        compactor_blocks_retention_period: 30d
 
 tempo-distributed:
   tempo:
@@ -158,7 +158,7 @@ tempo-distributed:
             insecure: true
       compactor:
         compaction:
-          block_retention: 24h
+          block_retention: 30d
   traces:
     otlp:
       http:

tools/kind.config

@@ -0,0 +1,9 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+name: meta
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
+- role: worker
+