Merge branch 'master' into terraform-aws-eks

README.md

@@ -37,7 +37,7 @@ Source code for Part #6    https://github.com/marcel-dempers/docker-development-
 Application and Server monitoring <br/>
 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
 

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/
 
 ```