Merge pull request #179 from DFE-Digital/659-grafana-cluster-health-d…

…ashboard-2 Added latest dashboards
DFE-Digital · Mar 19, 2024 · e90bea0 · e90bea0
2 parents e48b45f + 2526e6c
commit e90bea0
Show file tree

Hide file tree

Showing 11 changed files with 12,789 additions and 2,647 deletions.
diff --git a/cluster/terraform_kubernetes/config/dashboards/k8s-addons-prometheus.json b/cluster/terraform_kubernetes/config/dashboards/k8s-addons-prometheus.json
diff --git a/cluster/terraform_kubernetes/config/dashboards/k8s-system-api-server.json b/cluster/terraform_kubernetes/config/dashboards/k8s-system-api-server.json
diff --git a/cluster/terraform_kubernetes/config/dashboards/k8s-views-global.json b/cluster/terraform_kubernetes/config/dashboards/k8s-views-global.json
diff --git a/cluster/terraform_kubernetes/config/dashboards/k8s-views-namespaces.json b/cluster/terraform_kubernetes/config/dashboards/k8s-views-namespaces.json
diff --git a/cluster/terraform_kubernetes/config/dashboards/k8s-views-nodes.json b/cluster/terraform_kubernetes/config/dashboards/k8s-views-nodes.json
diff --git a/cluster/terraform_kubernetes/config/dashboards/kubernetes-cluster.json b/cluster/terraform_kubernetes/config/dashboards/kubernetes-cluster.json
diff --git a/cluster/terraform_kubernetes/config/prometheus/development.prometheus.yml b/cluster/terraform_kubernetes/config/prometheus/development.prometheus.yml
@@ -99,6 +99,8 @@ scrape_configs:
     - source_labels: [__meta_kubernetes_pod_name]
       action: replace
       target_label: kubernetes_pod_name
+    - source_labels: [__meta_kubernetes_pod_node_name]
+      target_label: nodename
 # Scrape config for kube-state-metrics.
   - job_name: 'kube-state-metrics'
     static_configs:

diff --git a/cluster/terraform_kubernetes/config/prometheus/platform-test.prometheus.yml b/cluster/terraform_kubernetes/config/prometheus/platform-test.prometheus.yml
@@ -99,6 +99,8 @@ scrape_configs:
     - source_labels: [__meta_kubernetes_pod_name]
       action: replace
       target_label: kubernetes_pod_name
+    - source_labels: [__meta_kubernetes_pod_node_name]
+      target_label: nodename
 # Scrape config for kube-state-metrics.
   - job_name: 'kube-state-metrics'
     static_configs:

diff --git a/cluster/terraform_kubernetes/config/prometheus/production.prometheus.yml b/cluster/terraform_kubernetes/config/prometheus/production.prometheus.yml
@@ -99,6 +99,8 @@ scrape_configs:
     - source_labels: [__meta_kubernetes_pod_name]
       action: replace
       target_label: kubernetes_pod_name
+    - source_labels: [__meta_kubernetes_pod_node_name]
+      target_label: nodename
 # Scrape config for kube-state-metrics.
   - job_name: 'kube-state-metrics'
     static_configs:

diff --git a/cluster/terraform_kubernetes/config/prometheus/test.prometheus.yml b/cluster/terraform_kubernetes/config/prometheus/test.prometheus.yml
@@ -99,6 +99,8 @@ scrape_configs:
     - source_labels: [__meta_kubernetes_pod_name]
       action: replace
       target_label: kubernetes_pod_name
+    - source_labels: [__meta_kubernetes_pod_node_name]
+      target_label: nodename
 # Scrape config for kube-state-metrics.
   - job_name: 'kube-state-metrics'
     static_configs:

diff --git a/cluster/terraform_kubernetes/grafana.tf b/cluster/terraform_kubernetes/grafana.tf
@@ -158,10 +158,14 @@ resource "kubernetes_config_map" "grafana_dashboards" {
   }
 
   data = {
-    "dashboard1.json" = file("${path.module}/config/dashboards/kubernetes-cluster.json")
+    "k8s-addons-prometheus.json" = file("${path.module}/config/dashboards/k8s-addons-prometheus.json")
+    "k8s-system-api-server.json" = file("${path.module}/config/dashboards/k8s-system-api-server.json")
+    "k8s-views-global.json"      = file("${path.module}/config/dashboards/k8s-views-global.json")
+    "k8s-views-namespaces.json"  = file("${path.module}/config/dashboards/k8s-views-namespaces.json")
+    "k8s-views-nodes.json"       = file("${path.module}/config/dashboards/k8s-views-nodes.json")
+
   }
 }
-
 resource "kubernetes_config_map" "grafana_dashboard_provisioning" {
   metadata {
     name      = "grafana-dashboard-provisioning"