From 56ffc030253ca1640308fee1bdf5b7e0c0e7eba4 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Thu, 26 May 2022 13:14:50 -0400 Subject: [PATCH] suspend metrics forwarding due to cardinality concerns --- kustomize/bases/prometheus/prometheus.yaml | 35 +++++++++++++--------- kustomize/overlays/prod/kustomization.yaml | 24 +++++++-------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/kustomize/bases/prometheus/prometheus.yaml b/kustomize/bases/prometheus/prometheus.yaml index 1c34ee7..4a8c6b6 100644 --- a/kustomize/bases/prometheus/prometheus.yaml +++ b/kustomize/bases/prometheus/prometheus.yaml @@ -4,8 +4,8 @@ metadata: name: prometheus spec: serviceAccountName: prometheus - retention: 1d - retentionSize: 5GB + retention: 30d + retentionSize: 9GB ruleSelector: matchLabels: monitor: prometheus @@ -18,15 +18,15 @@ spec: probeSelector: matchLabels: monitor: prometheus - remoteWrite: - - url: changeme - basicAuth: - username: - name: grafana-cloud-credentials - key: username - password: - name: grafana-cloud-credentials - key: password + # remoteWrite: + # - url: changeme + # basicAuth: + # username: + # name: grafana-cloud-credentials + # key: username + # password: + # name: grafana-cloud-credentials + # key: password securityContext: runAsGroup: 65534 runAsNonRoot: true @@ -34,8 +34,15 @@ spec: fsGroup: 65534 resources: requests: - cpu: 500m - memory: 500Mi + cpu: 1000m + memory: 1Gi limits: cpu: 1000m - memory: 500Mi + memory: 1Gi + storage: + volumeClaimTemplate: + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 10Gi diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index 0fee987..be0b9c4 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -62,13 +62,13 @@ secretGenerator: behavior: replace literals: - password=${ssm:/k3s/prod/nextcloud/redis/password} - - name: grafana-cloud-credentials - type: Opaque - namespace: monitoring - behavior: replace - literals: - - username=${ssm:/k3s/prod/monitoring/grafana-cloud/username} - - password=${ssm:/k3s/prod/monitoring/grafana-cloud/password} + # - name: grafana-cloud-credentials + # type: Opaque + # namespace: monitoring + # behavior: replace + # literals: + # - username=${ssm:/k3s/prod/monitoring/grafana-cloud/username} + # - password=${ssm:/k3s/prod/monitoring/grafana-cloud/password} # allow "kubectl apply -l managed-by=kustomize --prune ..." commonLabels: @@ -84,11 +84,11 @@ patchesJson6902: kind: Deployment name: nextcloud path: patches/nextcloud-deployment-patch.yaml - - target: - version: v1 - kind: Prometheus - name: prometheus - path: patches/prometheus-patch.yaml + # - target: + # version: v1 + # kind: Prometheus + # name: prometheus + # path: patches/prometheus-patch.yaml # patchesStrategicMerge: # - patches/blackbox-exporter-probe-patch.yaml