Verified Commit 705567c8 authored by Xueshan Feng's avatar Xueshan Feng
Browse files

replaced kill-ui target with kill-port.sh script; added grafana,prometheus.

parent 8db751b9

makefile_parts/kube-addons.mk

+60 −10
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ delete-dashboard: kill-ui ## Delete dashboard 


.PHONY: ui

ui: dashboard ## kubectl proxy and open dashboard ui

	@pkill kubectl || true

	kubectl --kubeconfig=$$HOME/.kube/${CLUSTER_NAME} proxy -p 8001 &> /dev/null &

	@${SCRIPTS_DIR}/kill-port.sh 8001; kubectl --kubeconfig=$$HOME/.kube/${CLUSTER_NAME} proxy -p 8001 &> /dev/null &

	@while ! kubectl get pods -n kube-system -o json -l k8s-app=kubernetes-dashboard | jq .items'[]'.status.containerStatuses'[]'.ready | grep -q true; \

	do \

		echo Waitting for UI ; \
@@ -67,14 +66,6 @@ admin-token: TOKEN_NAME=$$(kubectl get sa -n kube-system ${SA_NAME} -o json | jq 
admin-token: ## Get admin-token to login to dashboard

	kubectl describe secret -n kube-system ${TOKEN_NAME} | grep ^token:



.PHONY: kill-ui

kill-ui:  ## Close Kube dashboard connection

	@if pgrep -f 8001 &> /dev/null ; \

	then \

	  echo Killed Proxy on port 8001 ; \

		kill $(shell pgrep -f 8001) ; \

	fi



########################

## Tiller agent for helm

#########################
@@ -170,6 +161,65 @@ upgrade-fluentd-cloudwatch: fluentd-cloudwatch-secret ## Upgrade fluentd-cloudwa 
delete-fluentd-cloudwatch: ## Delete fluentd-cloudwatch

	helm del --purge fluentd-cloudwatch





#######################

## Prometheus

########################



.PHONY: prometheus

prometheus:  ## Deploy prometheus

	@helm install --name prometheus --namespace svc-monitoring  \

		 --set server.persistentVolume.storageClass=${AWS_DEFAULT_SC} \

		 --set alertmanager.persistentVolume.storageClass=${AWS_DEFAULT_SC} \

		 stable/prometheus



.PHONY: upgrade-prometheus

upgrade-prometheus:  ## Upgrade prometheu

	helm upgrade --recreate-pods \

		--set server.persistentVolume.storageClass=${AWS_DEFAULT_SC} \

		--set alertmanager.persistentVolume.storageClass=${AWS_DEFAULT_SC} \

		prometheus stable/prometheus



.PHONY: prometheus-ui

prometheus-ui: POD_NAME=$$(kubectl get pods --namespace svc-monitoring -l "app=prometheus,component=server" -o jsonpath="{.items[0].metadata.name}")

prometheus-ui: ## Proxy to prometheus UI

	${SCRIPTS_DIR}/kill-port.sh 9090; kubectl --namespace svc-monitoring port-forward ${POD_NAME} 9090



.PHONY: delete-prometheus

delete-prometheus : ## Delete prometheus

	helm del --purge prometheus



#######################

## Grafana

########################

.PHONY: grafana

grafana:  ## Deploy grafana

	@helm install --name grafana --namespace svc-monitoring  \

		 --set persistence.storageClassName=${AWS_DEFAULT_SC} \

			--set persistend=true \

		 stable/grafana



.PHONY: upgrade-grafana

upgrade-grafana:  ## Upgrade grafana

	helm upgrade --recreate-pods \

		--set persistence.storageClassName=${AWS_DEFAULT_SC} \

		--set persistend=true \

		grafana stable/grafana



.PHONY: grafana-ui

grafana-ui: POD_NAME=$$(kubectl get pods --namespace svc-monitoring -l "app=grafana" -o jsonpath="{.items[0].metadata.name}")

grafana-ui: ## Proxy to prometheus UI

	${SCRIPTS_DIR}/kill-port.sh 3000; kubectl --namespace svc-monitoring port-forward ${POD_NAME} 3000



PHONY: grafana-admin

grafana-admin: ## Get grafana admin pass

	kubectl get secret --namespace svc-monitoring grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo



.PHONY: delete-grafana

delete-grafana : ## Delete grafana

	helm del --purge grafana





##############################

## nginx-ingress

##############################