diff --git a/README.md b/README.md index 39ed2af..240b51f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Source code for Part #6 https://github.com/marcel-dempers/docker-development- Application and Server monitoring
Let's take a look how to monitor application code using Prometheus. -See the [Prometheus Monitoring](./prometheus-monitoring/readme.md) readme guide for detailed steps +See the [Prometheus Monitoring](./monitoring/prometheus/readme.md) readme guide for detailed steps ## Kubernetes Development Basics diff --git a/prometheus-monitoring/docker-compose.yaml b/monitoring/prometheus/docker-compose.yaml similarity index 100% rename from prometheus-monitoring/docker-compose.yaml rename to monitoring/prometheus/docker-compose.yaml diff --git a/prometheus-monitoring/dotnet-application/dockerfile b/monitoring/prometheus/dotnet-application/dockerfile similarity index 100% rename from prometheus-monitoring/dotnet-application/dockerfile rename to monitoring/prometheus/dotnet-application/dockerfile diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Error.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Error.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Error.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Error.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Error.cshtml.cs b/monitoring/prometheus/dotnet-application/src/Pages/Error.cshtml.cs similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Error.cshtml.cs rename to monitoring/prometheus/dotnet-application/src/Pages/Error.cshtml.cs diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Index.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Index.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Index.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Index.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Index.cshtml.cs b/monitoring/prometheus/dotnet-application/src/Pages/Index.cshtml.cs similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Index.cshtml.cs rename to monitoring/prometheus/dotnet-application/src/Pages/Index.cshtml.cs diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Privacy.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Privacy.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Privacy.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Privacy.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Privacy.cshtml.cs b/monitoring/prometheus/dotnet-application/src/Pages/Privacy.cshtml.cs similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Privacy.cshtml.cs rename to monitoring/prometheus/dotnet-application/src/Pages/Privacy.cshtml.cs diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Shared/_CookieConsentPartial.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Shared/_CookieConsentPartial.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Shared/_CookieConsentPartial.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Shared/_CookieConsentPartial.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Shared/_Layout.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Shared/_Layout.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Shared/_Layout.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Shared/_Layout.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/Shared/_ValidationScriptsPartial.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/Shared/_ValidationScriptsPartial.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/Shared/_ValidationScriptsPartial.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/_ViewImports.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/_ViewImports.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/_ViewImports.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/_ViewImports.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Pages/_ViewStart.cshtml b/monitoring/prometheus/dotnet-application/src/Pages/_ViewStart.cshtml similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Pages/_ViewStart.cshtml rename to monitoring/prometheus/dotnet-application/src/Pages/_ViewStart.cshtml diff --git a/prometheus-monitoring/dotnet-application/src/Program.cs b/monitoring/prometheus/dotnet-application/src/Program.cs similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Program.cs rename to monitoring/prometheus/dotnet-application/src/Program.cs diff --git a/prometheus-monitoring/dotnet-application/src/Properties/launchSettings.json b/monitoring/prometheus/dotnet-application/src/Properties/launchSettings.json similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Properties/launchSettings.json rename to monitoring/prometheus/dotnet-application/src/Properties/launchSettings.json diff --git a/prometheus-monitoring/dotnet-application/src/Startup.cs b/monitoring/prometheus/dotnet-application/src/Startup.cs similarity index 100% rename from prometheus-monitoring/dotnet-application/src/Startup.cs rename to monitoring/prometheus/dotnet-application/src/Startup.cs diff --git a/prometheus-monitoring/dotnet-application/src/appsettings.Development.json b/monitoring/prometheus/dotnet-application/src/appsettings.Development.json similarity index 100% rename from prometheus-monitoring/dotnet-application/src/appsettings.Development.json rename to monitoring/prometheus/dotnet-application/src/appsettings.Development.json diff --git a/prometheus-monitoring/dotnet-application/src/appsettings.json b/monitoring/prometheus/dotnet-application/src/appsettings.json similarity index 100% rename from prometheus-monitoring/dotnet-application/src/appsettings.json rename to monitoring/prometheus/dotnet-application/src/appsettings.json diff --git a/prometheus-monitoring/dotnet-application/src/work.csproj b/monitoring/prometheus/dotnet-application/src/work.csproj similarity index 100% rename from prometheus-monitoring/dotnet-application/src/work.csproj rename to monitoring/prometheus/dotnet-application/src/work.csproj diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/css/site.css b/monitoring/prometheus/dotnet-application/src/wwwroot/css/site.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/css/site.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/css/site.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/favicon.ico b/monitoring/prometheus/dotnet-application/src/wwwroot/favicon.ico similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/favicon.ico rename to monitoring/prometheus/dotnet-application/src/wwwroot/favicon.ico diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/js/site.js b/monitoring/prometheus/dotnet-application/src/wwwroot/js/site.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/js/site.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/js/site.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/LICENSE b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/LICENSE rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/LICENSE diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/LICENSE.md b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/LICENSE.md rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/LICENSE.txt b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/LICENSE.txt rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/LICENSE.txt diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.js b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.js rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.map b/monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from prometheus-monitoring/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.map rename to monitoring/prometheus/dotnet-application/src/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/prometheus-monitoring/go-application/dockerfile b/monitoring/prometheus/go-application/dockerfile similarity index 100% rename from prometheus-monitoring/go-application/dockerfile rename to monitoring/prometheus/go-application/dockerfile diff --git a/prometheus-monitoring/go-application/main.go b/monitoring/prometheus/go-application/main.go similarity index 100% rename from prometheus-monitoring/go-application/main.go rename to monitoring/prometheus/go-application/main.go diff --git a/prometheus-monitoring/grafana-data/dashboard.json b/monitoring/prometheus/grafana-data/dashboard.json similarity index 100% rename from prometheus-monitoring/grafana-data/dashboard.json rename to monitoring/prometheus/grafana-data/dashboard.json diff --git a/prometheus-monitoring/grafana-data/datasources.json b/monitoring/prometheus/grafana-data/datasources.json similarity index 100% rename from prometheus-monitoring/grafana-data/datasources.json rename to monitoring/prometheus/grafana-data/datasources.json diff --git a/prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.secret.yaml b/monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.secret.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.secret.yaml rename to monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.secret.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.sericeaccount.yaml b/monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.sericeaccount.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.sericeaccount.yaml rename to monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.sericeaccount.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.service.yaml b/monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.yaml b/monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/alertmanager/alertmanager.yaml rename to monitoring/prometheus/kubernetes/1.14.8/alertmanager/alertmanager.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-deployment.yaml b/monitoring/prometheus/kubernetes/1.14.8/grafana/grafana-deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-deployment.yaml rename to monitoring/prometheus/kubernetes/1.14.8/grafana/grafana-deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-service.yaml b/monitoring/prometheus/kubernetes/1.14.8/grafana/grafana-service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/grafana/grafana-service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.configmap.yaml b/monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.configmap.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.configmap.yaml rename to monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.configmap.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml b/monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml rename to monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.serviceaccount.yaml b/monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.serviceaccount.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.serviceaccount.yaml rename to monitoring/prometheus/kubernetes/1.14.8/grafana/grafana.serviceaccount.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/deployment.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/deployment.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service-account.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service-account.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service.yaml b/monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/node-exporter/node-exporter.yaml b/monitoring/prometheus/kubernetes/1.14.8/node-exporter/node-exporter.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/node-exporter/node-exporter.yaml rename to monitoring/prometheus/kubernetes/1.14.8/node-exporter/node-exporter.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/node-exporter/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/node-exporter/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/node-exporter/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/node-exporter/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus-alerts.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus-alerts.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus-alerts.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus-alerts.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/deployment.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/deployment.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-account.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-account.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.service.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/prometheus.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.service.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/prometheus.service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml b/monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml rename to monitoring/prometheus/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/readme.md b/monitoring/prometheus/kubernetes/1.14.8/readme.md similarity index 64% rename from prometheus-monitoring/kubernetes/1.14.8/readme.md rename to monitoring/prometheus/kubernetes/1.14.8/readme.md index f6df843..7707e50 100644 --- a/prometheus-monitoring/kubernetes/1.14.8/readme.md +++ b/monitoring/prometheus/kubernetes/1.14.8/readme.md @@ -11,17 +11,17 @@ kubectl create ns monitoring # Create the operator to instanciate all CRDs # Note: You will see error: no matches for kind "ServiceMonitor" ... # Wait till the operator is running, then rerun the command -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/prometheus-operator/ # Deploy monitoring components -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.14.8/node-exporter/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.14.8/kube-state-metrics/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.14.8/alertmanager +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/node-exporter/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/kube-state-metrics/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/alertmanager # Deploy prometheus instance and all the service monitors for targets -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.14.8/prometheus-cluster-monitoring/ # Dashboarding -kubectl -n monitoring create -f ./prometheus-monitoring/kubernetes/1.14.8/grafana/ +kubectl -n monitoring create -f ./monitoring/prometheus/kubernetes/1.14.8/grafana/ ``` \ No newline at end of file diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-secret.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-secret.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-secret.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-secret.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-sericeaccount.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-sericeaccount.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-sericeaccount.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-sericeaccount.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager-servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager-servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/alertmanager/alertmanager.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/alertmanager/alertmanager.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-datasources.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-definitions.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-nodeexporter.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/dashboard-sources.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/deployment.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/deployment.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/grafana/service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/grafana/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/grafana/service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/grafana/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/deployment.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/deployment.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/role-binding.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/role-binding.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/role.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/role.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/role.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/daemonset.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/daemonset.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/daemonset.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/daemonset.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.rules.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.rules.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.rules.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.rules.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-apiserver.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-apiserver.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-apiserver.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-apiserver.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-kubelet.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-kubelet.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-kubelet.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/servicemonitor-kubelet.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-alertmanager.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-alertmanager.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-alertmanager.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-alertmanager.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-podmonitor.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-podmonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-podmonitor.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-podmonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-prometheus.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-prometheus.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-prometheusrule.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-prometheusrule.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-prometheusrule.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-prometheusrule.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/crd-servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/crd-servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/deployment.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/deployment.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/namepace.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/namepace.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/namepace.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/namepace.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/service-account.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/service-account.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/service.yaml b/monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/service.yaml rename to monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.15-1.17/readme.md b/monitoring/prometheus/kubernetes/1.15-1.17/readme.md similarity index 69% rename from prometheus-monitoring/kubernetes/1.15-1.17/readme.md rename to monitoring/prometheus/kubernetes/1.15-1.17/readme.md index 58980eb..6efe866 100644 --- a/prometheus-monitoring/kubernetes/1.15-1.17/readme.md +++ b/monitoring/prometheus/kubernetes/1.15-1.17/readme.md @@ -12,18 +12,18 @@ kind create cluster --name prometheus --image kindest/node:v1.16.9 kubectl create ns monitoring # Create the operator to instanciate all CRDs -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.15-1.17/prometheus-operator/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.15-1.17/prometheus-operator/ # Deploy monitoring components -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.15-1.17/node-exporter/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.15-1.17/kube-state-metrics/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.15-1.17/alertmanager +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.15-1.17/node-exporter/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.15-1.17/kube-state-metrics/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.15-1.17/alertmanager # Deploy prometheus instance and all the service monitors for targets -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.15-1.17/prometheus-cluster-monitoring/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.15-1.17/prometheus-cluster-monitoring/ # Dashboarding -kubectl -n monitoring create -f ./prometheus-monitoring/kubernetes/1.15-1.17/grafana/ +kubectl -n monitoring create -f ./monitoring/prometheus/kubernetes/1.15-1.17/grafana/ # Check the pods kubectl -n monitoring get pods diff --git a/prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-secret.yaml b/monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-secret.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-secret.yaml rename to monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-secret.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-sericeaccount.yaml b/monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-sericeaccount.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-sericeaccount.yaml rename to monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-sericeaccount.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-service.yaml b/monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager-servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager-servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager.yaml b/monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/alertmanager/alertmanager.yaml rename to monitoring/prometheus/kubernetes/1.18.4/alertmanager/alertmanager.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-datasources.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-datasources.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-datasources.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-datasources.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-definitions.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-definitions.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-definitions.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-definitions.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-nodeexporter.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-sources.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-sources.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/dashboard-sources.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/dashboard-sources.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/deployment.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/deployment.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/grafana/service.yaml b/monitoring/prometheus/kubernetes/1.18.4/grafana/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/grafana/service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/grafana/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/deployment.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/deployment.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service.yaml b/monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/daemonset.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/daemonset.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/daemonset.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/daemonset.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/service-monitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/service-monitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/node-exporter/service.yaml b/monitoring/prometheus/kubernetes/1.18.4/node-exporter/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/node-exporter/service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/node-exporter/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/apiserver.servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/kubelet.servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus-alerts.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus-alerts.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus-alerts.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus-alerts.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.rules.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.rules.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.rules.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.rules.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.service.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/cluster-role-binding.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/cluster-role-binding.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/cluster-role.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/cluster-role.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-alertmanager.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-alertmanager.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-alertmanager.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-alertmanager.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-podmonitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-podmonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-podmonitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-podmonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-prometheus.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-prometheus.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-prometheus.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-prometheusrule.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-prometheusrule.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-prometheusrule.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-prometheusrule.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-servicemonitor.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-servicemonitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-servicemonitor.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-servicemonitor.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-thanosruler.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-thanosruler.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/crd-thanosruler.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/crd-thanosruler.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/deployment.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/deployment.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/deployment.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/namepace.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/namepace.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/namepace.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/namepace.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/service-account.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/service-account.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/service-account.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/service.yaml b/monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/service.yaml rename to monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.18.4/readme.md b/monitoring/prometheus/kubernetes/1.18.4/readme.md similarity index 59% rename from prometheus-monitoring/kubernetes/1.18.4/readme.md rename to monitoring/prometheus/kubernetes/1.18.4/readme.md index f1ed4c6..54e43da 100644 --- a/prometheus-monitoring/kubernetes/1.18.4/readme.md +++ b/monitoring/prometheus/kubernetes/1.18.4/readme.md @@ -9,17 +9,17 @@ kind create cluster --name prometheus --image kindest/node:v1.18.4 kubectl create ns monitoring # Create the operator to instanciate all CRDs -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.18.4/prometheus-operator/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/prometheus-operator/ # Deploy monitoring components -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.18.4/node-exporter/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.18.4/kube-state-metrics/ -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.18.4/alertmanager +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/node-exporter/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/kube-state-metrics/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/alertmanager # Deploy prometheus instance and all the service monitors for targets -kubectl -n monitoring apply -f ./prometheus-monitoring/kubernetes/1.18.4/prometheus-cluster-monitoring/ +kubectl -n monitoring apply -f ./monitoring/prometheus/kubernetes/1.18.4/prometheus-cluster-monitoring/ # Dashboarding -kubectl -n monitoring create -f ./prometheus-monitoring/kubernetes/1.18.4/grafana/ +kubectl -n monitoring create -f ./monitoring/prometheus/kubernetes/1.18.4/grafana/ ``` \ No newline at end of file diff --git a/prometheus-monitoring/kubernetes/readme.md b/monitoring/prometheus/kubernetes/readme.md similarity index 100% rename from prometheus-monitoring/kubernetes/readme.md rename to monitoring/prometheus/kubernetes/readme.md diff --git a/prometheus-monitoring/nodejs-application/dockerfile b/monitoring/prometheus/nodejs-application/dockerfile similarity index 100% rename from prometheus-monitoring/nodejs-application/dockerfile rename to monitoring/prometheus/nodejs-application/dockerfile diff --git a/prometheus-monitoring/nodejs-application/src/package-lock.json b/monitoring/prometheus/nodejs-application/src/package-lock.json similarity index 100% rename from prometheus-monitoring/nodejs-application/src/package-lock.json rename to monitoring/prometheus/nodejs-application/src/package-lock.json diff --git a/prometheus-monitoring/nodejs-application/src/package.json b/monitoring/prometheus/nodejs-application/src/package.json similarity index 100% rename from prometheus-monitoring/nodejs-application/src/package.json rename to monitoring/prometheus/nodejs-application/src/package.json diff --git a/prometheus-monitoring/nodejs-application/src/server.js b/monitoring/prometheus/nodejs-application/src/server.js similarity index 100% rename from prometheus-monitoring/nodejs-application/src/server.js rename to monitoring/prometheus/nodejs-application/src/server.js diff --git a/prometheus-monitoring/prometheus.yaml b/monitoring/prometheus/prometheus.yaml similarity index 100% rename from prometheus-monitoring/prometheus.yaml rename to monitoring/prometheus/prometheus.yaml diff --git a/prometheus-monitoring/python-application/dockerfile b/monitoring/prometheus/python-application/dockerfile similarity index 100% rename from prometheus-monitoring/python-application/dockerfile rename to monitoring/prometheus/python-application/dockerfile diff --git a/prometheus-monitoring/python-application/src/requirements.txt b/monitoring/prometheus/python-application/src/requirements.txt similarity index 100% rename from prometheus-monitoring/python-application/src/requirements.txt rename to monitoring/prometheus/python-application/src/requirements.txt diff --git a/prometheus-monitoring/python-application/src/server.py b/monitoring/prometheus/python-application/src/server.py similarity index 100% rename from prometheus-monitoring/python-application/src/server.py rename to monitoring/prometheus/python-application/src/server.py diff --git a/prometheus-monitoring/readme.md b/monitoring/prometheus/readme.md similarity index 100% rename from prometheus-monitoring/readme.md rename to monitoring/prometheus/readme.md