FORMAT: use jsonnet for templating

* add jsonnet templates
* rewrite all charts to jsonnet

k8s-manifests/monitoring/loki-stack.jsonnet

@@ -0,0 +1,37 @@
+# vim:expandtab:
+local helmapp = import "../../_templates/argo_helm_app.template";
+
+[
+helmapp + {
+  name:: "loki",
+  namespace:: "metrics",
+  repo:: "https://grafana.github.io/helm-charts",
+  chart:: "loki-stack",
+  version:: "2.6.1",
+  values:: |||
+    promtail:
+      extraScrapeConfigs:
+        - job_name: journal
+          journal:
+            path: /var/log/journal
+            max_age: 12h
+            labels:
+              job: systemd-journal
+          relabel_configs:
+            - source_labels:
+                - '__journal__systemd_unit'
+              target_label: 'unit'
+            - source_labels:
+                - '__journal__hostname'
+              target_label: 'hostname'
+      extraVolumes:
+        - name: journal
+          hostPath:
+            path: /var/log/journal
+      extraVolumeMounts:
+        - name: journal
+          mountPath: /var/log/journal
+          readOnly: true
+  |||
+}
+]

k8s-manifests/monitoring/loki-stack.yml

@@ -1,46 +0,0 @@
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: loki
-  namespace: argocd
-spec:
-  project: baseline
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: metrics
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
-  source:
-    repoURL: https://grafana.github.io/helm-charts
-    chart: loki-stack
-    targetRevision: 2.6.1
-    helm:
-      values: |
-        promtail:
-          extraScrapeConfigs:
-            - job_name: journal
-              journal:
-                path: /var/log/journal
-                max_age: 12h
-                labels:
-                  job: systemd-journal
-              relabel_configs:
-                - source_labels:
-                    - '__journal__systemd_unit'
-                  target_label: 'unit'
-                - source_labels:
-                    - '__journal__hostname'
-                  target_label: 'hostname'
-          extraVolumes:
-            - name: journal
-              hostPath:
-                path: /var/log/journal
-          extraVolumeMounts:
-            - name: journal
-              mountPath: /var/log/journal
-              readOnly: true

k8s-manifests/monitoring/prometheus-stack-crds.yml

@@ -1,25 +0,0 @@
-# https://github.com/prometheus-operator/prometheus-operator/issues/4439#issuecomment-1030198014
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: prometheus-crds
-  namespace: argocd
-spec:
-  project: baseline
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: metrics
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
-      - Replace=true
-  source:
-    repoURL: https://github.com/prometheus-community/helm-charts.git
-    path: charts/kube-prometheus-stack/crds/
-    targetRevision: kube-prometheus-stack-34.6.0
-    directory:
-      recurse: true

k8s-manifests/monitoring/prometheus-stack.yml

@@ -1,62 +0,0 @@
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: prometheus-grafana
-  namespace: argocd
-spec:
-  project: baseline
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: metrics
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
-  source:
-    repoURL: https://prometheus-community.github.io/helm-charts
-    chart: kube-prometheus-stack
-    targetRevision: 34.6.0
-    helm:
-      skipCrds: true
-      values: |
-        kubeProxy:
-          enabled: false
-        kubeScheduler:
-          enabled: false
-        kubeControllerManager:
-          enabled: false
-        alertmanager:
-          config:
-            global:
-              resolve_timeout: 5m
-            route:
-              group_by: ['alertname', 'cluster']
-              group_wait: 30s
-              group_interval: 5m
-              repeat_interval: 12h
-              receiver: 'pushover'
-              routes:
-                - receiver: 'null'
-                  matchers:
-                    - alertname="Watchdog"
-                - receiver: 'null'
-                  matchers:
-                    - alertname="InfoInhibitor"
-            receivers:
-              - name: 'null'
-              - name: 'pushover'
-                pushover_configs:
-                  - user_key: x9PipXt1zGOU31OJH9Osv18BFrlRhw
-                    token: aqvce1uukerhxhayxdq85wgtdh2c5r
-        prometheus:
-          prometheusSpec:
-            storageSpec:
-              volumeClaimTemplate:
-                spec:
-                  accessModes: ["ReadWriteOnce"]
-                  resources:
-                    requests:
-                      storage: 10Gi

k8s-manifests/monitoring/prometheus/prometheus-stack-crds.jsonnet

@@ -0,0 +1,14 @@
+# vim:expandtab:
+local argoapp = import "../../../_templates/argo_app.template";
+local vars = import "prometheus_vars";
+
+[
+argoapp + {
+  name:: "prometheus-crds",
+  namespace:: vars.namespace,
+  repo:: "https://github.com/prometheus-community/helm-charts.git",
+  path:: "charts/kube-prometheus-stack/crds/",
+  version:: "kube-prometheus-stack-" + vars.version,
+  syncOptions:: ["CreateNamespace=true", "Replace=true"]
+}
+]

k8s-manifests/monitoring/prometheus/prometheus-stack.jsonnet

@@ -0,0 +1,54 @@
+# vim:expandtab:
+local helmapp = import "../../../_templates/argo_helm_app.template";
+local vars = import "prometheus_vars";
+
+[
+helmapp + {
+  name:: "prometheus-grafana",
+  namespace: vars.namespace,
+  repo:: "https://prometheus-community.github.io/helm-charts",
+  chart:: "kube-prometheus-stack",
+  version:: vars.version,
+  skipCrds:: true,
+  values:: |||
+    kubeProxy:
+      enabled: false
+    kubeScheduler:
+      enabled: false
+    kubeControllerManager:
+      enabled: false
+    alertmanager:
+      config:
+        global:
+          resolve_timeout: 5m
+        route:
+          group_by: ['alertname', 'cluster']
+          group_wait: 30s
+          group_interval: 5m
+          repeat_interval: 12h
+          receiver: 'pushover'
+          routes:
+            - receiver: 'null'
+              matchers:
+                - alertname="Watchdog"
+            - receiver: 'null'
+              matchers:
+                - alertname="InfoInhibitor"
+        receivers:
+          - name: 'null'
+          - name: 'pushover'
+            pushover_configs:
+              - user_key: x9PipXt1zGOU31OJH9Osv18BFrlRhw
+                token: aqvce1uukerhxhayxdq85wgtdh2c5r
+    prometheus:
+      prometheusSpec:
+        storageSpec:
+          volumeClaimTemplate:
+            spec:
+              accessModes: ["ReadWriteOnce"]
+              resources:
+                requests:
+                  storage: 10Gi
+  |||
+}
+]

k8s-manifests/monitoring/prometheus/prometheus_vars

@@ -0,0 +1,4 @@
+{
+	"version": "34.6.0",
+	"namespace": "metrics"
+}