fix

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

monitor/alertmanager/index.yaml

@@ -11,15 +11,10 @@ options:
     examples:
     - 1
     type: integer
-  domain:
+  ingress-class:
-    default: your-company
+    default: traefik
     examples:
-    - your-company
+    - traefik
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
     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:
+  issuer:
-    default: 120h
+    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:
+  retention:
-    default: monitor
+    default: 120h
     examples:
-    - monitor
+    - 120h
-    type: string
-  logLevel:
-    default: info
-    examples:
-    - info
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
     type: string
 dependencies:
 - dist: null

monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml

@@ -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"

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:

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:
+  alertmanager:
-    default:
+    default: alertmanager-alertmanager
-      accessMode: ReadWriteOnce
-      size: 10Gi
     examples:
-    - accessMode: ReadWriteOnce
+    - alertmanager-alertmanager
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
     type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
 dependencies: []
 providers:
   kubernetes: true

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:

monitor/prometheus/index.yaml

@@ -6,21 +6,51 @@ metadata:
   name: prometheus
   description: null
 options:
-  domain-name:
+  alertmanager:
-    default: your_company.com
+    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:
+  logLevel:
-    default: false
+    default: info
     examples:
-    - false
+    - info
-    type: boolean
+    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

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