openstack/magnum
Code Issues Proposed changes

Merge "Add prometheus-monitoring namespace" into stable/rocky

Browse Source
This commit is contained in:
Zuul 2018-10-29 14:30:01 +00:00 committed by Gerrit Code Review
commit 52beaa41af
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
View File

@ -280,6 +280,19 @@ EOF
) )
writeFile $prometheusService_file "$prometheusService_content" writeFile $prometheusService_file "$prometheusService_content"
# Write the file for prometheus-monitoring namespace
prometheusNamespace_file=/srv/magnum/kubernetes/monitoring/prometheusNamespace.yaml
prometheusNamespace_content=$(cat <<EOF
apiVersion: v1
kind: Namespace
metadata:
labels:
name: prometheus-monitoring
name: prometheus-monitoring
EOF
)
writeFile $prometheusNamespace_file "$prometheusNamespace_content"
grafanaService_file=/srv/magnum/kubernetes/monitoring/grafanaService.yaml grafanaService_file=/srv/magnum/kubernetes/monitoring/grafanaService.yaml
grafanaService_content=$(cat <<EOF grafanaService_content=$(cat <<EOF
apiVersion: v1 apiVersion: v1
@ -375,6 +388,13 @@ do
sleep 5 sleep 5
done done
# Check if prometheus-monitoring namespace exist already before creating the namespace
kubectl get namespace prometheus-monitoring
if [ "$?" != "0" ] && \
[ -f "'''${PROMETHEUS_MON_BASE_DIR}'''/prometheusNamespace.yaml" ]; then
kubectl create -f '''${PROMETHEUS_MON_BASE_DIR}'''/prometheusNamespace.yaml
fi
# Check if all resources exist already before creating them # Check if all resources exist already before creating them
# Check if configmap Prometheus exists # Check if configmap Prometheus exists
kubectl get configmap prometheus -n prometheus-monitoring kubectl get configmap prometheus -n prometheus-monitoring