From 53ea555e2a4d9617e4c1c50a6c4819ccdcb12cc3 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Mon, 21 Aug 2023 18:07:18 +0200
Subject: Redo prometheus
---
.../prometheus-exporter-postgresql/helm-chart.yaml | 3 +--
.../tyilnet/monitoring/prometheus/helm-chart.yaml | 16 ++++++++++++++--
.../prometheus/persistent-volume-claim.yaml | 14 --------------
.../monitoring/prometheus/persistent-volume.yaml | 21 ---------------------
4 files changed, 15 insertions(+), 39 deletions(-)
delete mode 100644 data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume-claim.yaml
delete mode 100644 data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume.yaml
(limited to 'data.d/k3s-master/manifests.d')
diff --git a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus-exporter-postgresql/helm-chart.yaml b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus-exporter-postgresql/helm-chart.yaml
index 3222a7e..88b237d 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus-exporter-postgresql/helm-chart.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus-exporter-postgresql/helm-chart.yaml
@@ -3,11 +3,10 @@ apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: prometheus-exporter-postgresql
- namespace: kube-system
+ namespace: monitoring
spec:
repo: https://prometheus-community.github.io/helm-charts
chart: prometheus-postgres-exporter
- targetNamespace: monitoring
valuesContent: |-
config:
datasourceSecret:
diff --git a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/helm-chart.yaml b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/helm-chart.yaml
index c4f48f1..6074f58 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/helm-chart.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/helm-chart.yaml
@@ -3,14 +3,26 @@ apiVersion: helm.cattle.io/v1
kind: HelmChart
metadata:
name: prometheus
- namespace: kube-system
+ namespace: monitoring
spec:
repo: https://prometheus-community.github.io/helm-charts
chart: kube-prometheus-stack
- targetNamespace: monitoring
valuesContent: |-
alertmanager:
enabled: false
grafana:
enabled: false
+ prometheus:
+ enabled: true
+ prometheusSpec:
+ retention: 10d
+ storageSpec:
+ volumeClaimTemplate:
+ spec:
+ storageClassName: longhorn
+ resources:
+ requests:
+ storage: 50Gi
+ accessModes:
+ - ReadWriteOnce
...
diff --git a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume-claim.yaml b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume-claim.yaml
deleted file mode 100644
index 9ecd180..0000000
--- a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume-claim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: prometheus
- namespace: monitoring
-spec:
- storageClassName: nfs
- accessModes:
- - ReadWriteMany
- resources:
- requests:
- storage: 10Gi
-...
diff --git a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume.yaml b/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume.yaml
deleted file mode 100644
index 85aaebf..0000000
--- a/data.d/k3s-master/manifests.d/tyilnet/monitoring/prometheus/persistent-volume.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: prometheus
- namespace: monitoring
-spec:
- capacity:
- storage: 10Gi
- volumeMode: Filesystem
- accessModes:
- - ReadWriteMany
- persistentVolumeReclaimPolicy: Recycle
- storageClassName: nfs
- mountOptions:
- - hard
- - nfsvers=4.2
- nfs:
- path: /var/lib/prometheus
- server: 10.57.101.20
-...
--
cgit v1.1