fix

monitor/prometheus/index.yaml

@@ -6,41 +6,21 @@ metadata:
   name: prometheus
   description: null
 options:
-  app-group:
-    default: monitor
+  domain-name:
+    default: your_company.com
     examples:
-    - monitor
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  listenLocal:
-    default: false
-    examples:
-    - false
-    type: boolean
-  enableAdminAPI:
-    default: false
-    examples:
-    - false
-    type: boolean
-  retention:
-    default: 10d
-    examples:
-    - 10d
-    type: string
-  logLevel:
-    default: info
-    examples:
-    - info
+    - your_company.com
     type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   images:
     default:
       prometheus:
@@ -80,30 +60,50 @@ 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
-  domain-name:
-    default: your_company.com
+  logLevel:
+    default: info
     examples:
-    - your_company.com
+    - info
     type: string
-  issuer:
-    default: letsencrypt-prod
+  listenLocal:
+    default: false
     examples:
-    - letsencrypt-prod
+    - false
+    type: boolean
+  enableAdminAPI:
+    default: false
+    examples:
+    - false
+    type: boolean
+  retention:
+    default: 10d
+    examples:
+    - 10d
     type: string
   sub-domain:
     default: prometheus
     examples:
     - prometheus
     type: string
-  ingress-class:
-    default: traefik
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - traefik
+    - letsencrypt-prod
     type: string
 dependencies:
 - dist: null

monitor/prometheus/prometheus.tf

@@ -9,7 +9,7 @@ resource "kubectl_manifest" "prometheus" {
     spec:
       image: "${var.images.prometheus.registry}/${var.images.prometheus.repository}:${var.images.prometheus.tag}"
       version: ${var.images.prometheus.tag}
-      externalUrl: http://prometheus-operated.${var.namespace}:9090
+      externalUrl: http://${var.component}-${var.instance}.${var.namespace}:9090
       replicas: ${var.replicas}
       shards: ${var.shards}
       logLevel:  ${var.logLevel}
@@ -23,7 +23,7 @@ resource "kubectl_manifest" "prometheus" {
       alerting:
         alertmanagers:
           - namespace: ${var.namespace}
-            name: prometheus-community-kube-alertmanager
+            name: alertmanager-alertmanager
             port: http-web
             pathPrefix: "/"
             apiVersion: v2