Merge #882

882: [jjo] merge #881 from master into release-1.6 (grafana dashboard fixes) r=jjo a=jjo Co-authored-by: JuanJo Ciarlante <juanjosec@gmail.com>
vmware-archive · Jul 22, 2020 · 0219bb0 · 0219bb0
2 parents 33c9b23 + d6deee3
commit 0219bb0
Show file tree

Hide file tree

Showing 24 changed files with 5,992 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/manifests/components/grafana-dashboards b/manifests/components/grafana-dashboards
diff --git a/manifests/components/grafana.jsonnet b/manifests/components/grafana.jsonnet
@@ -123,9 +123,9 @@ local GRAFANA_DATA_MOUNTPOINT = "/opt/bitnami/grafana/data";
   kubernetes_dashboards: utils.HashedConfigMap($.p + "grafana-kubernetes-dashboards") + $.metadata {
     local this = self,
     data+: {
-      "k8s_cluster_capacity.json": importstr "grafana-dashboards/handcrafted/kubernetes/k8s_cluster_capacity.json",
-      "k8s_cluster_workloads_summary.json": importstr "grafana-dashboards/handcrafted/kubernetes/k8s_cluster_workloads_summary.json",
-      "k8s_resource_usage_namespace_pods.json": importstr "grafana-dashboards/handcrafted/kubernetes/k8s_resource_usage_namespace_pods.json",
+      "k8s_cluster_capacity.json": importstr "../vendor/kubernetes-grafana-dashboards/handcrafted/kubernetes/k8s_cluster_capacity.json",
+      "k8s_cluster_workloads_summary.json": importstr "../vendor/kubernetes-grafana-dashboards/handcrafted/kubernetes/k8s_cluster_workloads_summary.json",
+      "k8s_resource_usage_namespace_pods.json": importstr "../vendor/kubernetes-grafana-dashboards/handcrafted/kubernetes/k8s_resource_usage_namespace_pods.json",
     },
   },
 

diff --git a/manifests/jsonnetfile.json b/manifests/jsonnetfile.json
@@ -10,6 +10,16 @@
       },
       "version": "v1.14.3",
       "name": "kube-libsonnet"
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/bitnami-labs/kubernetes-grafana-dashboards",
+          "subdir": ""
+        }
+      },
+      "version": "a2c22c0858ffd6ad1aef5ae344831711456b5b01",
+      "name": "kubernetes-grafana-dashboards"
     }
   ],
   "legacyImports": true

diff --git a/manifests/jsonnetfile.lock.json b/manifests/jsonnetfile.lock.json
@@ -10,6 +10,16 @@
       },
       "version": "724b7ae3c3fdc270f6f67f66965eaae3a8fd81d3",
       "sum": "wGkeAgKXnDhZngw09PW8+U2x2GWyI0ZxAZF/Q7i49bE="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/bitnami-labs/kubernetes-grafana-dashboards",
+          "subdir": ""
+        }
+      },
+      "version": "a2c22c0858ffd6ad1aef5ae344831711456b5b01",
+      "sum": "SPPYXZApI8JiXDKwq2GqwQUZCpud0CLWqrEIxVdlsLE="
     }
   ],
   "legacyImports": false

diff --git a/manifests/vendor/github.com/bitnami-labs/kubernetes-grafana-dashboards/.gitmodules b/manifests/vendor/github.com/bitnami-labs/kubernetes-grafana-dashboards/.gitmodules
diff --git a/manifests/vendor/github.com/bitnami-labs/kubernetes-grafana-dashboards/CODEOWNERS b/manifests/vendor/github.com/bitnami-labs/kubernetes-grafana-dashboards/CODEOWNERS
diff --git a/...dor/github.com/bitnami-labs/kubernetes-grafana-dashboards/handcrafted/README.md b/...dor/github.com/bitnami-labs/kubernetes-grafana-dashboards/handcrafted/README.md