diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml index df83881..bf001cf 100644 --- a/k8s/argoapps/chart-values/prometheus.yaml +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -1,21 +1,63 @@ -configmapReload: - prometheus: - enabled: false -alertmanager: - persistence: - enabled: true - storageClass: "{{ .Values.global.nfs.storageClass }}" - ingress: - enabled: false -server: +## Configuration for alertmanager +## ref: https://prometheus.io/docs/alerting/alertmanager/ +## +alertmanager: + + alertmanagerSpec: + storage: + volumeClaimTemplate: + spec: + storageClassName: {{ .Values.global.nfs.storageClass }} + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 50Gi + limits: + storage: 100Gi + selector: {} + {{ if .Values.global.tls.enabled }} - baseURL: "https://monitoring.core.{{ .Values.global.domain }}" + externalUrl: "https://alerts.core.{{ .Values.global.domain }}" {{ else }} - baseURL: "http://monitoring.core.{{ .Values.global.domain }}" + externalUrl: "http://alerts.core.{{ .Values.global.domain }}" {{ end }} - persistentVolume: - enabled: true - storageClass: "{{ .Values.global.nfs.storageClass }}" - existingClaim: "{{ .Values.storage.prometheus.name }}" - ingress: - enabled: false \ No newline at end of file + resources: + requests: + memory: 400Mi + limits: + memory: 2Gi + +grafana: + defaultDashboardsTimezone: {{ .Values.global.timezone }} + + adminPassword: prom-operator + +prometheus: + prometheusSpec: + enableAdminAPI: false + +{{ if .Values.global.tls.enabled }} + externalUrl: "https://prometheus.core.{{ .Values.global.domain }}" +{{ else }} + externalUrl: "http://prometheus.core.{{ .Values.global.domain }}" +{{ end }} + resources: + requests: + memory: 400Mi + limits: + memory: 2Gi + + storageSpec: + volumeClaimTemplate: + spec: + storageClassName: {{ .Values.global.nfs.storageClass }} + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 50Gi + limits: + storage: 100Gi + selector: {} + + +cleanPrometheusOperatorObjectNames: true \ No newline at end of file diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 48746e8..416b3c5 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -121,7 +121,7 @@ apps: port: 9093 - prefix: "grafana.core" service: grafana - namespace: chart-grafana + namespace: chart-prometheus middleware: "apps-ingresses-chain-authelia" - prefix: "demo" service: "dummy-app" @@ -189,18 +189,10 @@ infrastructureCharts: targetRevision: "12.1.8" valuesFile: database.yaml prometheus: - chart: prometheus + chart: kube-prometheus-stack repoURL: "https://prometheus-community.github.io/helm-charts" targetRevision: "20.2.0" valuesFile: prometheus.yaml - grafana: - chart: grafana - repoURL: https://grafana.github.io/helm-charts - targetRevision: "6.53.0" - values: |- - persistence: - enabled: true - existingClaim: "{{ .Values.storage.grafana.name }}" secrets: database: namespace: chart-database @@ -254,23 +246,3 @@ storage: storage: 100Gi requests: storage: 10Gi - prometheus: - name: prometheus - namespace: chart-prometheus - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi - grafana: - name: grafana - namespace: chart-grafana - accessModes: - - ReadWriteMany - resources: - limits: - storage: 100Gi - requests: - storage: 10Gi