updated deploy script to copy AdvantEDGE configuration files & monitoring dashboards (5bd9e2d5) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox Frontend

config/.meepctl-repocfg.yaml

+6 −1

Original line number	Original line	Diff line number	Diff line
	version: 1.6.4		version: 1.6.5
	repo:		repo:
	name: AdvantEDGE		name: AdvantEDGE

	@@ -68,6 +68,11 @@ repo:
	# OAuth k8s secret (data: client-id, secret)		# OAuth k8s secret (data: client-id, secret)
	secret: meep-oauth-gitlab		secret: meep-oauth-gitlab

			# Default monitoring dashboards
			dashboards:
			meep-session-info: dashboards/meep-session-info.json
			meep-node-exporter: dashboards/meep-node-exporter.json

	#------------------------------		#------------------------------
	# Resource Prerequisites		# Resource Prerequisites
	#------------------------------		#------------------------------

config/dashboards/meep-node-exporter.json

0 → 100644

+13623 −0

File added.

Preview size limit exceeded, changes collapsed.

config/dashboards/meep-session-info.json

0 → 100644

+807 −0

Original line number	Original line	Diff line number	Diff line
			{
			"annotations": {
			"list": [
			{
			"builtIn": 1,
			"datasource": "-- Grafana --",
			"enable": true,
			"hide": true,
			"iconColor": "rgba(0, 211, 255, 1)",
			"name": "Annotations & Alerts",
			"type": "dashboard"
			}
			]
			},
			"editable": true,
			"gnetId": null,
			"graphTooltip": 0,
			"links": [],
			"panels": [
			{
			"collapsed": false,
			"datasource": null,
			"gridPos": {
			"h": 1,
			"w": 24,
			"x": 0,
			"y": 0
			},
			"id": 4,
			"panels": [],
			"title": "Session Info",
			"type": "row"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"max": 10,
			"min": 0,
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "green",
			"value": null
			},
			{
			"color": "orange",
			"value": 7
			},
			{
			"color": "red",
			"value": 9
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 4,
			"x": 0,
			"y": 1
			},
			"id": 2,
			"options": {
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"showThresholdLabels": false,
			"showThresholdMarkers": true
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "auth_svc_session_active",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Active Sessions",
			"type": "gauge"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "green",
			"value": null
			},
			{
			"color": "orange",
			"value": 7
			},
			{
			"color": "red",
			"value": 10
			}
			]
			},
			"unit": "none"
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 3,
			"x": 4,
			"y": 1
			},
			"id": 20,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"textMode": "value"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "max(max_over_time(auth_svc_session_active[$__range]))",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Max Concurrent Sessions",
			"type": "stat"
			},
			{
			"datasource": "meep-influxdb",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"mappings": [],
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "blue",
			"value": null
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 4,
			"x": 7,
			"y": 1
			},
			"id": 28,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"mean"
			],
			"fields": "",
			"values": false
			},
			"textMode": "auto"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"groupBy": [
			{
			"params": [
			"$__interval"
			],
			"type": "time"
			},
			{
			"params": [
			"null"
			],
			"type": "fill"
			}
			],
			"orderByTime": "ASC",
			"policy": "default",
			"query": "SELECT count(distinct(userid)) FROM global_session_metrics.autogen.session",
			"rawQuery": true,
			"refId": "A",
			"resultFormat": "time_series",
			"select": [
			[
			{
			"params": [
			"value"
			],
			"type": "field"
			},
			{
			"params": [],
			"type": "mean"
			}
			]
			],
			"tags": []
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "All-time Unique Users",
			"type": "stat"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "blue",
			"value": null
			}
			]
			},
			"unit": "m"
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 4,
			"x": 11,
			"y": 1
			},
			"id": 14,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"textMode": "value"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "sum(increase(auth_svc_session_duration_sum [$__range])) / sum(increase(auth_svc_session_duration_count [$__range]))",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Average Session Duration",
			"type": "stat"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "green",
			"value": null
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 3,
			"x": 15,
			"y": 1
			},
			"id": 12,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"textMode": "value"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "sum(increase(auth_svc_session_success_total{container=\"meep-auth-svc\"} [$__range]))",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Sessions Created",
			"type": "stat"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "super-light-orange",
			"value": null
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 3,
			"x": 18,
			"y": 1
			},
			"id": 10,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"textMode": "value"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "sum(increase(auth_svc_session_timeout_total{container=\"meep-auth-svc\"} [$__range]))",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Session Timeouts",
			"type": "stat"
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"decimals": 0,
			"mappings": [],
			"noValue": "0",
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "red",
			"value": null
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 5,
			"w": 3,
			"x": 21,
			"y": 1
			},
			"id": 8,
			"options": {
			"colorMode": "value",
			"graphMode": "area",
			"justifyMode": "auto",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"lastNotNull"
			],
			"fields": "",
			"values": false
			},
			"textMode": "value"
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "sum(increase(auth_svc_session_fail_total{container=\"meep-auth-svc\"} [$__range]))",
			"instant": true,
			"interval": "",
			"intervalFactor": 1,
			"legendFormat": "",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Session Failures",
			"type": "stat"
			},
			{
			"aliasColors": {},
			"bars": false,
			"dashLength": 10,
			"dashes": false,
			"datasource": "Prometheus",
			"decimals": 0,
			"fieldConfig": {
			"defaults": {
			"custom": {}
			},
			"overrides": []
			},
			"fill": 1,
			"fillGradient": 7,
			"gridPos": {
			"h": 8,
			"w": 11,
			"x": 0,
			"y": 6
			},
			"hiddenSeries": false,
			"id": 6,
			"legend": {
			"alignAsTable": true,
			"avg": false,
			"current": true,
			"hideEmpty": false,
			"hideZero": false,
			"max": true,
			"min": false,
			"rightSide": false,
			"show": false,
			"total": false,
			"values": true
			},
			"lines": true,
			"linewidth": 1,
			"nullPointMode": "null",
			"options": {
			"alertThreshold": true
			},
			"percentage": false,
			"pluginVersion": "7.3.5",
			"pointradius": 2,
			"points": false,
			"renderer": "flot",
			"seriesOverrides": [],
			"spaceLength": 10,
			"stack": true,
			"steppedLine": false,
			"targets": [
			{
			"expr": "auth_svc_session_active",
			"hide": false,
			"instant": false,
			"interval": "",
			"legendFormat": "",
			"refId": "A"
			}
			],
			"thresholds": [],
			"timeFrom": null,
			"timeRegions": [],
			"timeShift": null,
			"title": "Active Sessions",
			"tooltip": {
			"shared": true,
			"sort": 0,
			"value_type": "individual"
			},
			"type": "graph",
			"xaxis": {
			"buckets": null,
			"mode": "time",
			"name": null,
			"show": true,
			"values": []
			},
			"yaxes": [
			{
			"decimals": 0,
			"format": "short",
			"label": null,
			"logBase": 1,
			"max": null,
			"min": "0",
			"show": true
			},
			{
			"format": "short",
			"label": null,
			"logBase": 1,
			"max": null,
			"min": null,
			"show": true
			}
			],
			"yaxis": {
			"align": false,
			"alignLevel": null
			}
			},
			{
			"datasource": "Prometheus",
			"fieldConfig": {
			"defaults": {
			"custom": {},
			"mappings": [],
			"thresholds": {
			"mode": "absolute",
			"steps": [
			{
			"color": "dark-blue",
			"value": null
			}
			]
			}
			},
			"overrides": []
			},
			"gridPos": {
			"h": 8,
			"w": 13,
			"x": 11,
			"y": 6
			},
			"id": 22,
			"options": {
			"displayMode": "gradient",
			"orientation": "auto",
			"reduceOptions": {
			"calcs": [
			"max"
			],
			"fields": "",
			"values": false
			},
			"showUnfilled": true
			},
			"pluginVersion": "7.3.5",
			"targets": [
			{
			"expr": "sum by (le) (max_over_time(auth_svc_session_duration_bucket[$__range]) - min_over_time(auth_svc_session_duration_bucket[$__range]))",
			"format": "heatmap",
			"instant": false,
			"interval": "",
			"legendFormat": "{{le}}",
			"refId": "A"
			}
			],
			"timeFrom": null,
			"timeShift": null,
			"title": "Session Duration Distribution (minutes)",
			"transformations": [],
			"type": "bargauge"
			},
			{
			"collapsed": false,
			"datasource": null,
			"gridPos": {
			"h": 1,
			"w": 24,
			"x": 0,
			"y": 14
			},
			"id": 26,
			"panels": [],
			"title": "Platform Status",
			"type": "row"
			},
			{
			"aliasColors": {},
			"bars": false,
			"dashLength": 10,
			"dashes": false,
			"datasource": "Prometheus",
			"decimals": 0,
			"fieldConfig": {
			"defaults": {
			"custom": {}
			},
			"overrides": []
			},
			"fill": 3,
			"fillGradient": 7,
			"gridPos": {
			"h": 8,
			"w": 11,
			"x": 0,
			"y": 15
			},
			"hiddenSeries": false,
			"id": 24,
			"legend": {
			"alignAsTable": true,
			"avg": false,
			"current": true,
			"max": true,
			"min": true,
			"rightSide": true,
			"show": true,
			"sideWidth": null,
			"total": false,
			"values": true
			},
			"lines": true,
			"linewidth": 2,
			"links": [],
			"nullPointMode": "null as zero",
			"options": {
			"alertThreshold": true
			},
			"percentage": false,
			"pluginVersion": "7.3.5",
			"pointradius": 5,
			"points": false,
			"renderer": "flot",
			"seriesOverrides": [],
			"spaceLength": 10,
			"stack": false,
			"steppedLine": false,
			"targets": [
			{
			"expr": "sum (kube_pod_status_phase{}) by (phase)",
			"format": "time_series",
			"hide": false,
			"interval": "",
			"intervalFactor": 2,
			"legendFormat": "{{ phase }}",
			"metric": "kube_pod_status_phase",
			"refId": "A",
			"step": 10
			},
			{
			"expr": "kubelet_running_pod_count{kubernetes_io_role =~ \".node.\"}",
			"format": "time_series",
			"intervalFactor": 2,
			"legendFormat": "{{ instance }}",
			"refId": "B",
			"step": 10
			}
			],
			"thresholds": [],
			"timeFrom": null,
			"timeRegions": [],
			"timeShift": null,
			"title": "K8s Pod States",
			"tooltip": {
			"shared": true,
			"sort": 0,
			"value_type": "individual"
			},
			"type": "graph",
			"xaxis": {
			"buckets": null,
			"mode": "time",
			"name": null,
			"show": true,
			"values": []
			},
			"yaxes": [
			{
			"format": "short",
			"label": null,
			"logBase": 1,
			"max": null,
			"min": "0",
			"show": true
			},
			{
			"format": "short",
			"label": null,
			"logBase": 1,
			"max": null,
			"min": null,
			"show": true
			}
			],
			"yaxis": {
			"align": false,
			"alignLevel": null
			}
			},
			{
			"collapsed": true,
			"datasource": null,
			"gridPos": {
			"h": 1,
			"w": 24,
			"x": 0,
			"y": 23
			},
			"id": 16,
			"panels": [],
			"title": "MEC Service API Usage",
			"type": "row"
			}
			],
			"refresh": "15s",
			"schemaVersion": 26,
			"style": "dark",
			"tags": [],
			"templating": {
			"list": []
			},
			"time": {
			"from": "now-1h",
			"to": "now"
			},
			"timepicker": {
			"refresh_intervals": [
			"5s",
			"10s",
			"15s",
			"30s",
			"1m",
			"5m",
			"15m",
			"30m",
			"1h",
			"2h",
			"1d"
			]
			},
			"timezone": "",
			"title": "MEC Sandbox Dashboard",
			"uid": "meep-session-info",
			"version": 1
			}
			No newline at end of file

deploy.sh

+27 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,12 @@
	SCRIPT=$(readlink -f "$0")		SCRIPT=$(readlink -f "$0")
	BASEDIR=$(dirname "$SCRIPT")		BASEDIR=$(dirname "$SCRIPT")

			MEEPDIR=~/AdvantEDGE
			CONFIGDIR=$MEEPDIR/config
			DASHBOARDDIR=$MEEPDIR/charts/grafana/dashboards
	FRONTENDDIR=~/.meep/user/frontend		FRONTENDDIR=~/.meep/user/frontend
	SWAGGERDIR=~/.meep/user/sandbox-swagger		SWAGGERDIR=~/.meep/user/sandbox-swagger
			VALUESDIR=~/.meep/user/values

	echo ""		echo ""
	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
	@@ -13,9 +17,22 @@ echo ">> Deploying MEC Sandbox Frontend"
	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
	echo ""		echo ""

			echo "+ Updating AdvantEDGE configuration"
			echo "$MEEPDIR"
			echo "$CONFIGDIR"
			cd $BASEDIR
			cp config/.meepctl-repocfg.yaml $MEEPDIR
			cp config/permissions.yaml $CONFIGDIR
			cp config/secrets.yaml $CONFIGDIR

			echo ""
			echo "+ Copying dashboards"
			echo "$DASHBOARDDIR"
			cp -r config/dashboards/* $DASHBOARDDIR

			echo ""
	echo "+ Deploying frontend"		echo "+ Deploying frontend"
	echo "$FRONTENDDIR"		echo "$FRONTENDDIR"
	cd $BASEDIR
	mkdir -p $FRONTENDDIR		mkdir -p $FRONTENDDIR
	rm -r $FRONTENDDIR/* 2> /dev/null		rm -r $FRONTENDDIR/* 2> /dev/null
	cp -r bin/frontend/* $FRONTENDDIR		cp -r bin/frontend/* $FRONTENDDIR
	@@ -27,5 +44,14 @@ mkdir -p $SWAGGERDIR
	rm -r $SWAGGERDIR/* 2> /dev/null		rm -r $SWAGGERDIR/* 2> /dev/null
	cp -r js-apps/swagger-ui/* $SWAGGERDIR		cp -r js-apps/swagger-ui/* $SWAGGERDIR

			# echo ""
			# echo "+ Updating configuration user values"
			# echo "$VALUESDIR"
			# mkdir -p $VALUESDIR
			# rm -r $VALUESDIR-bak 2> /dev/null
			# mkdir -p $VALUESDIR-bak
			# cp -r $VALUESDIR/* $VALUESDIR-bak
			# cp -r config/values/* $VALUESDIR

	echo ""		echo ""
	echo ">>> MEC Sandbox deployment completed"		echo ">>> MEC Sandbox deployment completed"