From c9ff2d2581970726fcbe001953c0153dff08dd0c Mon Sep 17 00:00:00 2001 From: Nino van der Laan Date: Thu, 20 Jul 2023 11:50:43 +0200 Subject: [PATCH 1/2] Add prometheus stack --- argocd-managed/argocd-apps/values.yaml | 4 ++++ argocd-managed/prometheus/Chart.yaml | 8 ++++++++ argocd-managed/prometheus/README.md | 5 +++++ argocd-managed/prometheus/templates/ingress.yaml | 14 ++++++++++++++ argocd-managed/prometheus/templates/secrets.yaml | 10 ++++++++++ argocd-managed/prometheus/values.yaml | 5 +++++ 6 files changed, 46 insertions(+) create mode 100644 argocd-managed/prometheus/Chart.yaml create mode 100644 argocd-managed/prometheus/README.md create mode 100644 argocd-managed/prometheus/templates/ingress.yaml create mode 100644 argocd-managed/prometheus/templates/secrets.yaml create mode 100644 argocd-managed/prometheus/values.yaml diff --git a/argocd-managed/argocd-apps/values.yaml b/argocd-managed/argocd-apps/values.yaml index 8f0d629..6d1b0e3 100644 --- a/argocd-managed/argocd-apps/values.yaml +++ b/argocd-managed/argocd-apps/values.yaml @@ -41,4 +41,8 @@ argocdApps: folder: oauth2-proxy valuesFile: values-bruinsma.yaml - name: velero +<<<<<<< HEAD podSecurity: privileged +======= + - name: prometheus +>>>>>>> 92481ea (Add prometheus stack) diff --git a/argocd-managed/prometheus/Chart.yaml b/argocd-managed/prometheus/Chart.yaml new file mode 100644 index 0000000..6ff986d --- /dev/null +++ b/argocd-managed/prometheus/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: prometheus-wrapper +type: application +version: 1.0.0 +dependencies: + - name: prometheus-stack + version: 48.1.1 + repository: "https://prometheus-community.github.io/helm-charts" diff --git a/argocd-managed/prometheus/README.md b/argocd-managed/prometheus/README.md new file mode 100644 index 0000000..a0bd618 --- /dev/null +++ b/argocd-managed/prometheus/README.md @@ -0,0 +1,5 @@ +```shell +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +helm upgrade --install --atomic --force prometheus-operator-stack prometheus-community/kube-prometheus-stack -f values.yaml +``` \ No newline at end of file diff --git a/argocd-managed/prometheus/templates/ingress.yaml b/argocd-managed/prometheus/templates/ingress.yaml new file mode 100644 index 0000000..1804aca --- /dev/null +++ b/argocd-managed/prometheus/templates/ingress.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: grafana +spec: + entryPoints: + - websecure + routes: + - match: Host(`grafana.ninoo.nl`) + kind: Rule + services: + - name: prometheus-operator-stack-grafana + port: 80 diff --git a/argocd-managed/prometheus/templates/secrets.yaml b/argocd-managed/prometheus/templates/secrets.yaml new file mode 100644 index 0000000..1603fd5 --- /dev/null +++ b/argocd-managed/prometheus/templates/secrets.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: kibana-credentials + namespace: prometheus-operator +spec: + encryptedData: + KIBANA_PASSWORD: AgArDbrED9dbz6gdKwueG8MVL3BdA2we19WwMpWpuE+DTtj14fS47KLOwxuy3Y9w49pmouOKBIEEofEH7s2t46R8q1oZ+xSyVvLzUzNaeP0P4MGUh3wbugy2ul3ZcC4d4nQqOiAJHPdphOZxa9XBjEOPU7+u0bVMU1RWYN9/C9AUMrdft6h23jXYVjW75oUCbU94byLkaq+aDZrDBORG3Wk8OT6FXgCAUegd9ZGDJHedc/CIKRHvFTNZWyy0Oszv3v4J6yvHWIO/2WdaVmCO7y1myGXGMc1EiK9tMKyn9AOTg58lbeZE3kMLnwnnTcVVo2X1PUHP/KeuPULrC096SB/5ZGYaPS6bLznHeBpjrcWJY2xvBFP8VL8w/KB/ooiYr9O7D3a5yv0z45XDxnvucq3vMBYeZqx2WTIMOf3LLs8Xe3idc2nrypUb2D+fzkMUeQdr3PPaAUM4EEwnN9vaPZGY7jYHj9xY+8KhDEk+sUBKpoblGi52Xxf6J5og+vwxK/yVZIYBmyf/olLbLs7wvBcfdg1SVN9032yxh1a/uKmNmmaFZV7URlDJBm5lK7b8dRzLyTaVa2d84tsA28WJUquoNeEaElVSuuss0wSfi60GzpLB0Cg0KRs7nIHWnXYymZwHYU8JctSX74dVqRkldm9UZM1VrSsG1nB8jbeohOTs9qoA3vTHQwcvxpzy5S67r5Gl3bO4Py5q94WhXg== + KIBANA_USERNAME: AgAPhXLcs/ov8HU+p5lQMDE3DDUy7cXnvP8rm841uiTZkBJI8tKmirdDBM7Mm+XfzHO+9NWgAq9D/zcPRVqV49psQKBMwwic1k94uhQoMDXMUq/uoSrUkvLIhvhHnhWyYFnzsQGeSOFO4jVZ3N+Vj1gP4CJlH/0n5fYF6KVjQkdBPLvX17/DADGcjXllMJXk1HEli1aGJCOZjKw6LSSIHE+qLSs4Py2tBpIRbW+PjK7B4r2lFkn2Xeibn02AE2tOyaEA1tKkX/JNloetn9TUb01ONImvz0T3eOke9TeWroWdr00/tnopN3mqtgM3f3VFLIsOE4d7PjJF5RR8sj7XKN3ixMP7DleVPrHyRzl3bcLXAkEEAkpwqekQZ9Z4vChg/pjSXUp6E5Nx741miHi0jsuEvfYpIPxipe1y0MpgELS/Y0mO+t1UW9cC/TzQJHiKb+k4G3zymTvxk9eRYifgl9kugs0i6feoYxgJ76fWOOPEcOefZ0h9y8YW6SP2YBcMAnKZuPmFd275IxFSYcvgX+HvY476b4A/8jC8EmovvRivu8/xuFmupebrWGq/cMniholD4Kq8ev6tys887JiQOuNN0pKJ3mGIBhCHFJbtSH3Vq8E/DaHy76/AhgGFeWSFHYU5VWufvJp80D0xqciPzXDc3CCPFrXuzjGbFCmlYfR08SJubJqJ35ds08ndQVyZKY4qqeCKfw== diff --git a/argocd-managed/prometheus/values.yaml b/argocd-managed/prometheus/values.yaml new file mode 100644 index 0000000..15cd8ae --- /dev/null +++ b/argocd-managed/prometheus/values.yaml @@ -0,0 +1,5 @@ +grafana: + admin: + existingSecret: "kibana-credentials" + userKey: KIBANA_USERNAME + passwordKey: KIBANA_PASSWORD \ No newline at end of file From 4cd258d5e74f8481c2747ddb637932be6f26a147 Mon Sep 17 00:00:00 2001 From: Nino van der Laan Date: Fri, 21 Jul 2023 12:40:49 +0200 Subject: [PATCH 2/2] booboo --- argocd-managed/argocd-apps/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/argocd-managed/argocd-apps/values.yaml b/argocd-managed/argocd-apps/values.yaml index 6d1b0e3..ef14f3b 100644 --- a/argocd-managed/argocd-apps/values.yaml +++ b/argocd-managed/argocd-apps/values.yaml @@ -41,8 +41,5 @@ argocdApps: folder: oauth2-proxy valuesFile: values-bruinsma.yaml - name: velero -<<<<<<< HEAD podSecurity: privileged -======= - name: prometheus ->>>>>>> 92481ea (Add prometheus stack)