Add hpz440 host configuration and SSH setup for Windows; update Prometheus targets and variables

terraform/apps/dev-01/config.tf

@@ -92,6 +92,11 @@ locals {
           type    = "A"
           content = "10.5.5.2"
         },
+        {
+          name    = "hpz440"
+          type    = "A"
+          content = "10.19.4.121"
+        },
       ]
     }
   ]

terraform/apps/dev-01/resources/prometheus.yml

@@ -3,10 +3,10 @@ scrape_configs:
     scrape_interval: 10s
     static_configs:
       - targets:
-          - "node-exporter.kube-system.svc.cluster.local:9100"
+          - "node-exporter.prometheus.svc.cluster.local:9100"
           - "10.19.4.1:9100"
   - job_name: auth-exporter
     scrape_interval: 10s
     static_configs:
       - targets:
-          - "auth-exporter.kube-system.svc.cluster.local:9100"
+          - "auth-exporter.prometheus.svc.cluster.local:9100"

terraform/apps/prod-01/resources/prometheus.yml

@@ -2,13 +2,15 @@ scrape_configs:
   - job_name: node-exporter
     scrape_interval: 10s
     static_configs:
-      - targets: ["node-exporter.kube-system.svc.cluster.local:9100"]
+      - targets:
+          - "node-exporter.prometheus.svc.cluster.local:9100"
   - job_name: fail2ban
     scrape_interval: 60s
     static_configs:
-      - targets: ["fail2ban-exporter.kube-system.svc.cluster.local:9100"]
+      - targets:
+          - "fail2ban-exporter.prometheus.svc.cluster.local:9100"
   - job_name: auth-exporter
     scrape_interval: 10s
     static_configs:
       - targets:
-          - "auth-exporter.kube-system.svc.cluster.local:9100"
+          - "auth-exporter.prometheus.svc.cluster.local:9100"

terraform/modules/apps/grafana/resources/prometheus.bak.yml

@@ -1,126 +0,0 @@
-global:
-  scrape_interval: 5s
-  evaluation_interval: 5s
-rule_files:
-  - /etc/prometheus/prometheus.rules
-alerting:
-  alertmanagers:
-    - scheme: http
-      static_configs:
-        - targets:
-            - "alertmanager.monitoring.svc:9093"
-scrape_configs:
-  - job_name: "node-exporter"
-    kubernetes_sd_configs:
-      - role: endpoints
-    relabel_configs:
-      - source_labels: [__meta_kubernetes_endpoints_name]
-        regex: "node-exporter"
-        action: keep
-  - job_name: "kubernetes-apiservers"
-    kubernetes_sd_configs:
-      - role: endpoints
-    scheme: https
-    tls_config:
-      ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-    bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-    relabel_configs:
-      - source_labels:
-          [
-            __meta_kubernetes_namespace,
-            __meta_kubernetes_service_name,
-            __meta_kubernetes_endpoint_port_name,
-          ]
-        action: keep
-        regex: default;kubernetes;https
-  - job_name: "kubernetes-nodes"
-    scheme: https
-    tls_config:
-      ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-    bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-    kubernetes_sd_configs:
-      - role: node
-    relabel_configs:
-      - action: labelmap
-        regex: __meta_kubernetes_node_label_(.+)
-      - target_label: __address__
-        replacement: kubernetes.default.svc:443
-      - source_labels: [__meta_kubernetes_node_name]
-        regex: (.+)
-        target_label: __metrics_path__
-        replacement: /api/v1/nodes/$${1}/proxy/metrics
-  - job_name: "kubernetes-pods"
-    kubernetes_sd_configs:
-      - role: pod
-    relabel_configs:
-      - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
-        action: keep
-        regex: true
-      - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
-        action: replace
-        target_label: __metrics_path__
-        regex: (.+)
-      - source_labels:
-          [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
-        action: replace
-        regex: ([^:]+)(?::\d+)?;(\d+)
-        replacement: $1:$2
-        target_label: __address__
-      - action: labelmap
-        regex: __meta_kubernetes_pod_label_(.+)
-      - source_labels: [__meta_kubernetes_namespace]
-        action: replace
-        target_label: kubernetes_namespace
-      - source_labels: [__meta_kubernetes_pod_name]
-        action: replace
-        target_label: kubernetes_pod_name
-  - job_name: "kube-state-metrics"
-    static_configs:
-      - targets: ["kube-state-metrics.kube-system.svc.cluster.local:8080"]
-  - job_name: "kubernetes-cadvisor"
-    scheme: https
-    tls_config:
-      ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-    bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-    kubernetes_sd_configs:
-      - role: node
-    relabel_configs:
-      - action: labelmap
-        regex: __meta_kubernetes_node_label_(.+)
-      - target_label: __address__
-        replacement: kubernetes.default.svc:443
-      - source_labels: [__meta_kubernetes_node_name]
-        regex: (.+)
-        target_label: __metrics_path__
-        replacement: /api/v1/nodes/$${1}/proxy/metrics/cadvisor
-  - job_name: "kubernetes-service-endpoints"
-    kubernetes_sd_configs:
-      - role: endpoints
-    relabel_configs:
-      - source_labels:
-          [__meta_kubernetes_service_annotation_prometheus_io_scrape]
-        action: keep
-        regex: true
-      - source_labels:
-          [__meta_kubernetes_service_annotation_prometheus_io_scheme]
-        action: replace
-        target_label: __scheme__
-        regex: (https?)
-      - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
-        action: replace
-        target_label: __metrics_path__
-        regex: (.+)
-      - source_labels:
-          [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
-        action: replace
-        target_label: __address__
-        regex: ([^:]+)(?::\d+)?;(\d+)
-        replacement: $1:$2
-      - action: labelmap
-        regex: __meta_kubernetes_service_label_(.+)
-      - source_labels: [__meta_kubernetes_namespace]
-        action: replace
-        target_label: kubernetes_namespace
-      - source_labels: [__meta_kubernetes_service_name]
-        action: replace
-        target_label: kubernetes_name

terraform/modules/utils/auth-exporter/variables.tf

@@ -7,7 +7,7 @@ variable "tag" {
 variable "namespace" {
   description = "Kubernetes namespace to deploy the prometheus exporter"
   type        = string
-  default     = "kube-system"
+  default     = "prometheus"
 }
 
 variable "persistent_folder" {

terraform/modules/utils/fail2ban-exporter/variables.tf

@@ -7,5 +7,5 @@ variable "tag" {
 variable "namespace" {
   description = "Kubernetes namespace to deploy the Fail2Ban exporter"
   type        = string
-  default     = "kube-system"
+  default     = "prometheus"
 }

terraform/modules/utils/node-exporter/variables.tf

@@ -7,5 +7,5 @@ variable "tag" {
 variable "namespace" {
   description = "Kubernetes namespace to deploy the Fail2Ban exporter"
   type        = string
-  default     = "kube-system"
+  default     = "prometheus"
 }