From 92e9be6fa69de880c541175f4542d1de1b03e19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 24 Jan 2024 14:23:09 +0100 Subject: [PATCH] fix --- monitor/alertmanager/datas.tf | 2 +- monitor/alertmanager/index.yaml | 48 ++++++------- ...ertmanager-kube-promethe-alertmanager.yaml | 32 --------- monitor/loki/config.tf | 8 +++ monitor/loki/index.yaml | 41 ++++++----- monitor/prometheus/datas.tf | 2 +- monitor/prometheus/index.yaml | 69 ++++++++++--------- monitor/prometheus/prometheus.tf | 2 +- 8 files changed, 95 insertions(+), 109 deletions(-) delete mode 100644 monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml diff --git a/monitor/alertmanager/datas.tf b/monitor/alertmanager/datas.tf index 52ef0e6..b5d4376 100644 --- a/monitor/alertmanager/datas.tf +++ b/monitor/alertmanager/datas.tf @@ -62,7 +62,7 @@ data "kustomization_overlay" "data" { - name: Alertmanager type: alertmanager uid: alertmanager - url: http://alertmanager-operated.${var.namespace}:9093/ + url: http://${var.component}-${var.instance}.${var.namespace}:9093/ access: proxy jsonData: handleGrafanaManagedAlerts: false diff --git a/monitor/alertmanager/index.yaml b/monitor/alertmanager/index.yaml index 081a43c..17d720c 100644 --- a/monitor/alertmanager/index.yaml +++ b/monitor/alertmanager/index.yaml @@ -11,15 +11,10 @@ options: examples: - 1 type: integer - domain: - default: your-company + ingress-class: + default: traefik examples: - - your-company - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod + - traefik type: string listenLocal: default: false @@ -31,6 +26,16 @@ options: examples: - alertmanager type: string + app-group: + default: monitor + examples: + - monitor + type: string + logLevel: + default: info + examples: + - info + type: string images: default: alertmanager: @@ -70,30 +75,25 @@ options: type: string type: object type: object - retention: - default: 120h + issuer: + default: letsencrypt-prod examples: - - 120h + - letsencrypt-prod + type: string + domain: + default: your-company + examples: + - your-company type: string domain-name: default: your_company.com examples: - your_company.com type: string - app-group: - default: monitor + retention: + default: 120h examples: - - monitor - type: string - logLevel: - default: info - examples: - - info - type: string - ingress-class: - default: traefik - examples: - - traefik + - 120h type: string dependencies: - dist: null diff --git a/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml b/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml deleted file mode 100644 index 15c6b00..0000000 --- a/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Source: kube-prometheus-stack/templates/alertmanager/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: alertmanager-kube-promethe-alertmanager - namespace: vynil-monitor - labels: - app: kube-prometheus-stack-alertmanager - self-monitor: "true" - - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: alertmanager - app.kubernetes.io/version: "56.0.3" - app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.3 - release: "alertmanager" - heritage: "Helm" -spec: - ports: - - name: http-web - port: 9093 - targetPort: 9093 - protocol: TCP - - name: reloader-web - appProtocol: http - port: 8080 - targetPort: reloader-web - selector: - app.kubernetes.io/name: alertmanager - alertmanager: alertmanager-kube-promethe-alertmanager - sessionAffinity: None - type: "ClusterIP" \ No newline at end of file diff --git a/monitor/loki/config.tf b/monitor/loki/config.tf index c9928f3..de79b58 100644 --- a/monitor/loki/config.tf +++ b/monitor/loki/config.tf @@ -58,6 +58,14 @@ resource "kubectl_manifest" "config" { ruler: storage: type: local + local: + directory: /tmp/rules + rule_path: /tmp/scratch + alertmanager_url: http://${var.alertmanager}:9093 + ring: + kvstore: + store: inmemory + enable_api: true runtime_config: file: /etc/loki/runtime-config/runtime-config.yaml schema_config: diff --git a/monitor/loki/index.yaml b/monitor/loki/index.yaml index 718deee..71f29e5 100644 --- a/monitor/loki/index.yaml +++ b/monitor/loki/index.yaml @@ -6,6 +6,25 @@ metadata: name: loki description: null options: + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + examples: + - accessMode: ReadWriteOnce + size: 10Gi + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: object images: default: loki: @@ -45,25 +64,11 @@ options: type: string type: object type: object - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi + alertmanager: + default: alertmanager-alertmanager examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object + - alertmanager-alertmanager + type: string dependencies: [] providers: kubernetes: true diff --git a/monitor/prometheus/datas.tf b/monitor/prometheus/datas.tf index 608cf3b..7e6ba67 100644 --- a/monitor/prometheus/datas.tf +++ b/monitor/prometheus/datas.tf @@ -42,7 +42,7 @@ data "kustomization_overlay" "data" { - name: Prometheus type: prometheus uid: prometheus - url: http://prometheus-operated.${var.namespace}:9090/ + url: http://${var.component}-${var.instance}.${var.namespace}:9090/ access: proxy isDefault: false jsonData: diff --git a/monitor/prometheus/index.yaml b/monitor/prometheus/index.yaml index 391b644..1d60340 100644 --- a/monitor/prometheus/index.yaml +++ b/monitor/prometheus/index.yaml @@ -6,21 +6,51 @@ metadata: name: prometheus description: null options: - domain-name: - default: your_company.com + alertmanager: + default: alertmanager-alertmanager examples: - - your_company.com + - alertmanager-alertmanager + type: string + sub-domain: + default: prometheus + examples: + - prometheus + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string domain: default: your-company examples: - your-company type: string + shards: + default: 1 + examples: + - 1 + type: integer ingress-class: default: traefik examples: - traefik type: string + enableAdminAPI: + default: false + examples: + - false + type: boolean + app-group: + default: monitor + examples: + - monitor + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string images: default: prometheus: @@ -60,51 +90,26 @@ options: type: string type: object type: object - app-group: - default: monitor - examples: - - monitor - type: string replicas: default: 1 examples: - 1 type: integer - shards: - default: 1 - examples: - - 1 - type: integer - logLevel: - default: info - examples: - - info - type: string listenLocal: default: false examples: - false type: boolean - enableAdminAPI: - default: false + logLevel: + default: info examples: - - false - type: boolean + - info + type: string retention: default: 10d examples: - 10d type: string - sub-domain: - default: prometheus - examples: - - prometheus - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string dependencies: - dist: null category: share diff --git a/monitor/prometheus/prometheus.tf b/monitor/prometheus/prometheus.tf index 6d41341..2e1ecdb 100644 --- a/monitor/prometheus/prometheus.tf +++ b/monitor/prometheus/prometheus.tf @@ -23,7 +23,7 @@ resource "kubectl_manifest" "prometheus" { alerting: alertmanagers: - namespace: ${var.namespace} - name: alertmanager-alertmanager + name: ${var.alertmanager} port: http-web pathPrefix: "/" apiVersion: v2