From 508b714c82ff1f41ad0d68ca85fbec3f579bcaff Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Sun, 26 Dec 2021 22:49:51 -0500 Subject: [PATCH] enable persistent storage for prometheus --- .../kustomization.yaml | 2 -- .../bases/kube-state-metrics/kustomization.yaml | 1 - kustomize/bases/longhorn/longhorn-helmchart.yaml | 2 +- kustomize/bases/node-exporter/kustomization.yaml | 1 - kustomize/bases/prometheus/prometheus.yaml | 16 +++++++++++++++- .../namespaces/monitoring/kustomization.yaml | 4 ++++ .../helium-blockchain-exporter.yaml} | 0 .../helium-blockchain-exporter.yaml} | 0 .../servicemonitors/kube-state-metrics.yaml} | 0 .../servicemonitors/node-exporter.yaml} | 0 10 files changed, 20 insertions(+), 6 deletions(-) rename kustomize/{bases/helium-blockchain-exporter/helium-blockchain-exporter-prometheusrule.yaml => namespaces/monitoring/prometheusrules/helium-blockchain-exporter.yaml} (100%) rename kustomize/{bases/helium-blockchain-exporter/helium-blockchain-exporter-servicemonitor.yaml => namespaces/monitoring/servicemonitors/helium-blockchain-exporter.yaml} (100%) rename kustomize/{bases/kube-state-metrics/kube-state-metrics-servicemonitors.yaml => namespaces/monitoring/servicemonitors/kube-state-metrics.yaml} (100%) rename kustomize/{bases/node-exporter/node-exporter-servicemonitor.yaml => namespaces/monitoring/servicemonitors/node-exporter.yaml} (100%) diff --git a/kustomize/bases/helium-blockchain-exporter/kustomization.yaml b/kustomize/bases/helium-blockchain-exporter/kustomization.yaml index 9b38900..b7aeebc 100644 --- a/kustomize/bases/helium-blockchain-exporter/kustomization.yaml +++ b/kustomize/bases/helium-blockchain-exporter/kustomization.yaml @@ -1,7 +1,5 @@ resources: - helium-blockchain-exporter-deployment.yaml - - helium-blockchain-exporter-servicemonitor.yaml - - helium-blockchain-exporter-prometheusrule.yaml configMapGenerator: - name: helium-blockchain-exporter-config diff --git a/kustomize/bases/kube-state-metrics/kustomization.yaml b/kustomize/bases/kube-state-metrics/kustomization.yaml index 9042caf..4c1a124 100644 --- a/kustomize/bases/kube-state-metrics/kustomization.yaml +++ b/kustomize/bases/kube-state-metrics/kustomization.yaml @@ -1,5 +1,4 @@ resources: - - kube-state-metrics-servicemonitors.yaml - https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.1.1/examples/standard/cluster-role-binding.yaml - https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.1.1/examples/standard/cluster-role.yaml - https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.1.1/examples/standard/deployment.yaml diff --git a/kustomize/bases/longhorn/longhorn-helmchart.yaml b/kustomize/bases/longhorn/longhorn-helmchart.yaml index 91eca86..4737590 100644 --- a/kustomize/bases/longhorn/longhorn-helmchart.yaml +++ b/kustomize/bases/longhorn/longhorn-helmchart.yaml @@ -16,7 +16,7 @@ spec: defaultReplicaCount: 2 defaultDataLocality: best-effort replicaAutoBalance: best-effort - taintToleration: kubernetes.io/arch: + taintToleration: "kubernetes.io/arch:" longhornManager: tolerations: - key: kubernetes.io/arch diff --git a/kustomize/bases/node-exporter/kustomization.yaml b/kustomize/bases/node-exporter/kustomization.yaml index 2f177ac..afe897a 100644 --- a/kustomize/bases/node-exporter/kustomization.yaml +++ b/kustomize/bases/node-exporter/kustomization.yaml @@ -1,3 +1,2 @@ resources: - node-exporter-daemonset.yaml - - node-exporter-servicemonitor.yaml diff --git a/kustomize/bases/prometheus/prometheus.yaml b/kustomize/bases/prometheus/prometheus.yaml index 5f99bd2..4678159 100644 --- a/kustomize/bases/prometheus/prometheus.yaml +++ b/kustomize/bases/prometheus/prometheus.yaml @@ -4,6 +4,8 @@ metadata: name: prometheus spec: serviceAccountName: prometheus + retention: 28d + retentionSize: 4.5GB ruleSelector: matchLabels: monitor: prometheus @@ -16,10 +18,22 @@ spec: probeSelector: matchLabels: monitor: prometheus + securityContext: + runAsGroup: 65534 + runAsNonRoot: true + runAsUser: 65534 + fsGroup: 65534 resources: requests: cpu: 500m memory: 1Gi limits: cpu: 1000m - memory: 2Gi \ No newline at end of file + memory: 2Gi + storage: + volumeClaimTemplate: + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 5Gi \ No newline at end of file diff --git a/kustomize/namespaces/monitoring/kustomization.yaml b/kustomize/namespaces/monitoring/kustomization.yaml index 21e75d1..a0eae87 100644 --- a/kustomize/namespaces/monitoring/kustomization.yaml +++ b/kustomize/namespaces/monitoring/kustomization.yaml @@ -8,7 +8,11 @@ bases: - servicemonitors/kubelet.yaml - servicemonitors/longhorn.yaml - servicemonitors/prometheus.yaml + - servicemonitors/kube-state-metrics.yaml + - servicemonitors/helium-blockchain-exporter.yaml + - servicemonitors/node-exporter.yaml - probes/blackbox-exporter.yaml + - prometheusrules/helium-blockchain-exporter.yaml resources: - namespace.yaml diff --git a/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-prometheusrule.yaml b/kustomize/namespaces/monitoring/prometheusrules/helium-blockchain-exporter.yaml similarity index 100% rename from kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-prometheusrule.yaml rename to kustomize/namespaces/monitoring/prometheusrules/helium-blockchain-exporter.yaml diff --git a/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-servicemonitor.yaml b/kustomize/namespaces/monitoring/servicemonitors/helium-blockchain-exporter.yaml similarity index 100% rename from kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-servicemonitor.yaml rename to kustomize/namespaces/monitoring/servicemonitors/helium-blockchain-exporter.yaml diff --git a/kustomize/bases/kube-state-metrics/kube-state-metrics-servicemonitors.yaml b/kustomize/namespaces/monitoring/servicemonitors/kube-state-metrics.yaml similarity index 100% rename from kustomize/bases/kube-state-metrics/kube-state-metrics-servicemonitors.yaml rename to kustomize/namespaces/monitoring/servicemonitors/kube-state-metrics.yaml diff --git a/kustomize/bases/node-exporter/node-exporter-servicemonitor.yaml b/kustomize/namespaces/monitoring/servicemonitors/node-exporter.yaml similarity index 100% rename from kustomize/bases/node-exporter/node-exporter-servicemonitor.yaml rename to kustomize/namespaces/monitoring/servicemonitors/node-exporter.yaml