From fb87d34c96abf2a1e0ff8aba29fc6990234906a5 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 8 Nov 2023 09:35:43 +0100 Subject: [PATCH] Added monitoring configurations for app-of-apps and prometheus --- argocd/app-of-apps/Chart.yaml | 1 + argocd/app-of-apps/monitoring/Chart.yaml | 5 ++ argocd/app-of-apps/monitoring/templates | 1 + argocd/app-of-apps/monitoring/values.yaml | 48 +++++++++++++++++++ .../{test => }/templates/applications.yaml | 0 .../{test => }/templates/namespaces.yaml | 0 argocd/app-of-apps/test/templates | 1 + argocd/prometheus/monitoring/Chart.lock | 6 +++ argocd/prometheus/monitoring/Chart.yaml | 8 ++++ .../prometheus/monitoring/argocd_values.yaml | 37 ++++++++++++++ argocd/prometheus/monitoring/templates | 1 + argocd/prometheus/monitoring/values.yaml | 1 + 12 files changed, 109 insertions(+) create mode 100644 argocd/app-of-apps/Chart.yaml create mode 100644 argocd/app-of-apps/monitoring/Chart.yaml create mode 120000 argocd/app-of-apps/monitoring/templates create mode 100644 argocd/app-of-apps/monitoring/values.yaml rename argocd/app-of-apps/{test => }/templates/applications.yaml (100%) rename argocd/app-of-apps/{test => }/templates/namespaces.yaml (100%) create mode 120000 argocd/app-of-apps/test/templates create mode 100644 argocd/prometheus/monitoring/Chart.lock create mode 100644 argocd/prometheus/monitoring/Chart.yaml create mode 100644 argocd/prometheus/monitoring/argocd_values.yaml create mode 120000 argocd/prometheus/monitoring/templates create mode 120000 argocd/prometheus/monitoring/values.yaml diff --git a/argocd/app-of-apps/Chart.yaml b/argocd/app-of-apps/Chart.yaml new file mode 100644 index 0000000..6b7a717 --- /dev/null +++ b/argocd/app-of-apps/Chart.yaml @@ -0,0 +1 @@ +# only there for correct syntax highlighting in IDE \ No newline at end of file diff --git a/argocd/app-of-apps/monitoring/Chart.yaml b/argocd/app-of-apps/monitoring/Chart.yaml new file mode 100644 index 0000000..4a3d644 --- /dev/null +++ b/argocd/app-of-apps/monitoring/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: app-of-apps +description: Configuration chart for ArgoCD to monitor +type: application +version: 0.1.1 \ No newline at end of file diff --git a/argocd/app-of-apps/monitoring/templates b/argocd/app-of-apps/monitoring/templates new file mode 120000 index 0000000..564a409 --- /dev/null +++ b/argocd/app-of-apps/monitoring/templates @@ -0,0 +1 @@ +../templates \ No newline at end of file diff --git a/argocd/app-of-apps/monitoring/values.yaml b/argocd/app-of-apps/monitoring/values.yaml new file mode 100644 index 0000000..003d6a2 --- /dev/null +++ b/argocd/app-of-apps/monitoring/values.yaml @@ -0,0 +1,48 @@ +applications: + - name: hcloud-csi + project: default + targetRevision: main + namespace: hcloud + createNamespace: false + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + syncWave: 1 + - name: vso-crds + project: default + targetRevision: main + namespace: hcloud + createNamespace: false + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + syncWave: -1 + - name: vault-secrets-operator + project: default + targetRevision: main + namespace: vault-secrets-operator-system + createNamespace: true + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + syncWave: 0 + - name: prometheus + project: default + targetRevision: main + namespace: observability + createNamespace: false + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + serverSideApply: true + syncWave: 2 + - name: prometheus-adapter + project: default + targetRevision: main + namespace: observability + createNamespace: false + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + syncWave: 2 + - name: thanos + project: default + targetRevision: main + namespace: thanos + createNamespace: true + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + syncWave: 2 + +overall: + destinationServer: https://kubernetes.default.svc + environment: monitoring diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/templates/applications.yaml similarity index 100% rename from argocd/app-of-apps/test/templates/applications.yaml rename to argocd/app-of-apps/templates/applications.yaml diff --git a/argocd/app-of-apps/test/templates/namespaces.yaml b/argocd/app-of-apps/templates/namespaces.yaml similarity index 100% rename from argocd/app-of-apps/test/templates/namespaces.yaml rename to argocd/app-of-apps/templates/namespaces.yaml diff --git a/argocd/app-of-apps/test/templates b/argocd/app-of-apps/test/templates new file mode 120000 index 0000000..564a409 --- /dev/null +++ b/argocd/app-of-apps/test/templates @@ -0,0 +1 @@ +../templates \ No newline at end of file diff --git a/argocd/prometheus/monitoring/Chart.lock b/argocd/prometheus/monitoring/Chart.lock new file mode 100644 index 0000000..3bb018e --- /dev/null +++ b/argocd/prometheus/monitoring/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: kube-prometheus-stack + repository: https://prometheus-community.github.io/helm-charts + version: 52.1.0 +digest: sha256:d029407897f7046c7efe1b19ab9056ff5268c429a85f8fe45cfdf8db82dd78b8 +generated: "2023-11-08T09:14:30.984982+01:00" diff --git a/argocd/prometheus/monitoring/Chart.yaml b/argocd/prometheus/monitoring/Chart.yaml new file mode 100644 index 0000000..9793cdd --- /dev/null +++ b/argocd/prometheus/monitoring/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: prometheus +version: 0.1.0 +type: application +dependencies: + - name: kube-prometheus-stack + version: 52.1.0 + repository: https://prometheus-community.github.io/helm-charts \ No newline at end of file diff --git a/argocd/prometheus/monitoring/argocd_values.yaml b/argocd/prometheus/monitoring/argocd_values.yaml new file mode 100644 index 0000000..0fc370f --- /dev/null +++ b/argocd/prometheus/monitoring/argocd_values.yaml @@ -0,0 +1,37 @@ +kube-prometheus-stack: + prometheusOperator: + admissionWebhooks: + certManager: + enabled: true +# issuerRef: +# name: "lets-encrypt" +# kind: "ClusterIssuer" + prometheus-node-exporter: + hostRootFsMount: + mountPropagation: None + + alertmanager: + enabled: true + grafana: + enabled: true + + prometheus: + prometheusSpec: + retention: 6h + disableCompaction: true + storageSpec: + volumeClaimTemplate: + spec: + storageClassName: hcloud-volumes + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 10Gi + ingress: + enabled: false + kubeControllerManager: + endpoints: + - 10.0.0.4 + kubeScheduler: + endpoints: + - 10.0.0.4 diff --git a/argocd/prometheus/monitoring/templates b/argocd/prometheus/monitoring/templates new file mode 120000 index 0000000..564a409 --- /dev/null +++ b/argocd/prometheus/monitoring/templates @@ -0,0 +1 @@ +../templates \ No newline at end of file diff --git a/argocd/prometheus/monitoring/values.yaml b/argocd/prometheus/monitoring/values.yaml new file mode 120000 index 0000000..5d1191e --- /dev/null +++ b/argocd/prometheus/monitoring/values.yaml @@ -0,0 +1 @@ +../values.yaml \ No newline at end of file