From 26f7c9c37f837f3d4e941c81c3b15655c40e4201 Mon Sep 17 00:00:00 2001 From: marcel-dempers Date: Sat, 14 Nov 2020 08:53:16 +1100 Subject: [PATCH] file refactor for grafana --- monitoring/prometheus/kubernetes/1.14.8/readme.md | 6 +++++- ...rter.yaml => dashboard-nodeexporter-custom.yaml} | Bin ...urces.yaml => grafana-dashboardDatasources.yaml} | 0 ...tions.yaml => grafana-dashboardDefinitions.yaml} | 0 ...d-sources.yaml => grafana-dashboardSources.yaml} | 0 .../{deployment.yaml => grafana-deployment.yaml} | 0 .../grafana/{service.yaml => grafana-service.yaml} | 0 ...ice-account.yaml => grafana-serviceAccount.yaml} | 0 .../prometheus/kubernetes/1.15-1.17/readme.md | 6 +++++- ...rter.yaml => dashboard-nodeexporter-custom.yaml} | Bin ...urces.yaml => grafana-dashboardDatasources.yaml} | 0 ...tions.yaml => grafana-dashboardDefinitions.yaml} | 0 ...d-sources.yaml => grafana-dashboardSources.yaml} | 0 .../{deployment.yaml => grafana-deployment.yaml} | 0 .../grafana/{service.yaml => grafana-service.yaml} | 0 ...ice-account.yaml => grafana-serviceAccount.yaml} | 0 monitoring/prometheus/kubernetes/1.18.4/readme.md | 6 +++++- 17 files changed, 15 insertions(+), 3 deletions(-) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{dashboard-nodeexporter.yaml => dashboard-nodeexporter-custom.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{dashboard-datasources.yaml => grafana-dashboardDatasources.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{dashboard-definitions.yaml => grafana-dashboardDefinitions.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{dashboard-sources.yaml => grafana-dashboardSources.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{deployment.yaml => grafana-deployment.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{service.yaml => grafana-service.yaml} (100%) rename monitoring/prometheus/kubernetes/1.15-1.17/grafana/{service-account.yaml => grafana-serviceAccount.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{dashboard-nodeexporter.yaml => dashboard-nodeexporter-custom.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{dashboard-datasources.yaml => grafana-dashboardDatasources.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{dashboard-definitions.yaml => grafana-dashboardDefinitions.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{dashboard-sources.yaml => grafana-dashboardSources.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{deployment.yaml => grafana-deployment.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{service.yaml => grafana-service.yaml} (100%) rename monitoring/prometheus/kubernetes/1.18.4/grafana/{service-account.yaml => grafana-serviceAccount.yaml} (100%) diff --git a/monitoring/prometheus/kubernetes/1.14.8/readme.md b/monitoring/prometheus/kubernetes/1.14.8/readme.md index 7707e50..aaabf20 100644 --- a/monitoring/prometheus/kubernetes/1.14.8/readme.md +++ b/monitoring/prometheus/kubernetes/1.14.8/readme.md @@ -24,4 +24,8 @@ kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/prometh # Dashboarding kubectl -n monitoring create -f ./monitoring/prometheus/kubernetes/1.14.8/grafana/ -``` \ No newline at end of file +``` + +# Sources + +The source code for monitoring Kubernetes 1.14 comes from the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/tree/v0.3.0/manifests) v0.3.0 tree diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter-custom.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter-custom.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardDatasources.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardDatasources.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardDefinitions.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardDefinitions.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardSources.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-dashboardSources.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/deployment.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-deployment.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/deployment.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-deployment.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-service.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-service.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/grafana/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-serviceAccount.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.15-1.17/grafana/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/grafana-serviceAccount.yaml diff --git a/monitoring/prometheus/kubernetes/1.15-1.17/readme.md b/monitoring/prometheus/kubernetes/1.15-1.17/readme.md index 6efe866..5a09103 100644 --- a/monitoring/prometheus/kubernetes/1.15-1.17/readme.md +++ b/monitoring/prometheus/kubernetes/1.15-1.17/readme.md @@ -35,4 +35,8 @@ kubectl -n monitoring port-forward prometheus-k8s-0 9090 # Dashboards kubectl -n monitoring port-forward 3000 -``` \ No newline at end of file +``` + +# Sources + +The source code for monitoring Kubernetes 1.15-1.17 comes from the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/tree/v0.3.0/manifests) v0.3.0 tree diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter-custom.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter-custom.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-datasources.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardDatasources.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-datasources.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardDatasources.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-definitions.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardDefinitions.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-definitions.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardDefinitions.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-sources.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardSources.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-sources.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-dashboardSources.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/deployment.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-deployment.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/deployment.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-deployment.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/service.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-service.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-service.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/grafana/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-serviceAccount.yaml similarity index 100% rename from monitoring/prometheus/kubernetes/1.18.4/grafana/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/grafana-serviceAccount.yaml diff --git a/monitoring/prometheus/kubernetes/1.18.4/readme.md b/monitoring/prometheus/kubernetes/1.18.4/readme.md index 54e43da..f29384e 100644 --- a/monitoring/prometheus/kubernetes/1.18.4/readme.md +++ b/monitoring/prometheus/kubernetes/1.18.4/readme.md @@ -22,4 +22,8 @@ kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/prometh # Dashboarding kubectl -n monitoring create -f ./monitoring/prometheus/kubernetes/1.18.4/grafana/ -``` \ No newline at end of file +``` + +# Sources + +The source code for monitoring Kubernetes 1.18.4 comes from the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/tree/v0.6.0/manifests) v0.6.0 tree \ No newline at end of file