Merge pull request #66 from dilallkx/kd_sp38_frontend (d0adb89c) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

charts/grafana/dashboards/network-metrics-aggregation.json

0 → 100644

+698 −0

Original line number	Diff line number	Diff line
		{
		"annotations": {
		"list": [
		{
		"builtIn": 1,
		"datasource": "$datasource",
		"enable": true,
		"hide": false,
		"iconColor": "rgba(0, 211, 255, 1)",
		"limit": 100,
		"name": "Mobility Events",
		"query": "SELECT type,description from $database.autogen.events WHERE type='MOBILITY' AND $timeFilter ORDER BY time ASC LIMIT 100",
		"showIn": 0,
		"tagsColumn": "type",
		"textColumn": "",
		"type": "dashboard"
		},
		{
		"datasource": "$datasource",
		"enable": true,
		"hide": false,
		"iconColor": "#FF9830",
		"name": "Net Char Events",
		"query": "SELECT type,description from $database.autogen.events WHERE type='NETWORK-CHARACTERISTICS-UPDATE' AND $timeFilter ORDER BY time ASC LIMIT 100",
		"showIn": 0,
		"tagsColumn": "type"
		}
		]
		},
		"editable": true,
		"gnetId": null,
		"graphTooltip": 0,
		"iteration": 1582319088471,
		"links": [],
		"panels": [
		{
		"collapsed": false,
		"datasource": null,
		"gridPos": {
		"h": 1,
		"w": 24,
		"x": 0,
		"y": 0
		},
		"id": 18,
		"panels": [],
		"title": "Inter-process Latency Aggregation",
		"type": "row"
		},
		{
		"aliasColors": {},
		"bars": false,
		"cacheTimeout": null,
		"dashLength": 10,
		"dashes": false,
		"datasource": "$datasource",
		"description": "Shows latency & Throughput between source & destination applications",
		"fill": 0,
		"fillGradient": 1,
		"gridPos": {
		"h": 10,
		"w": 24,
		"x": 0,
		"y": 1
		},
		"hiddenSeries": false,
		"id": 2,
		"interval": "",
		"legend": {
		"avg": false,
		"current": false,
		"max": false,
		"min": false,
		"show": true,
		"total": false,
		"values": false
		},
		"lines": true,
		"linewidth": 2,
		"links": [],
		"nullPointMode": "connected",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pluginVersion": "6.4.2",
		"pointradius": 2,
		"points": false,
		"renderer": "flot",
		"seriesOverrides": [],
		"spaceLength": 10,
		"stack": false,
		"steppedLine": false,
		"targets": [
		{
		"alias": "[[tag_dest]]",
		"groupBy": [
		{
		"params": [
		"1s"
		],
		"type": "time"
		},
		{
		"params": [
		"null"
		],
		"type": "fill"
		}
		],
		"hide": false,
		"measurement": "/^$scenario$/",
		"orderByTime": "ASC",
		"policy": "default",
		"query": "SELECT lat FROM $database.autogen.network WHERE (\"src\" =~ /^$src$/) AND $timeFilter GROUP BY dest",
		"rawQuery": true,
		"refId": "A",
		"resultFormat": "time_series",
		"select": [
		[
		{
		"params": [
		"lat"
		],
		"type": "field"
		},
		{
		"params": [],
		"type": "mean"
		}
		]
		],
		"tags": [
		{
		"key": "src",
		"operator": "=~",
		"value": "/^$src$/"
		},
		{
		"condition": "AND",
		"key": "dest",
		"operator": "=~",
		"value": "/^$dest$/"
		}
		]
		}
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Latencies",
		"tooltip": {
		"shared": true,
		"sort": 0,
		"value_type": "individual"
		},
		"type": "graph",
		"xaxis": {
		"buckets": null,
		"mode": "time",
		"name": null,
		"show": true,
		"values": []
		},
		"yaxes": [
		{
		"format": "short",
		"label": "Latency (ms)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": true
		},
		{
		"format": "short",
		"label": "Throughput (Mbps)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": false
		}
		],
		"yaxis": {
		"align": false,
		"alignLevel": null
		}
		},
		{
		"collapsed": false,
		"datasource": null,
		"gridPos": {
		"h": 1,
		"w": 24,
		"x": 0,
		"y": 11
		},
		"id": 20,
		"panels": [],
		"title": "Inter-process Throughput Aggregation",
		"type": "row"
		},
		{
		"aliasColors": {},
		"bars": false,
		"cacheTimeout": null,
		"dashLength": 10,
		"dashes": false,
		"datasource": "$datasource",
		"description": "Shows Up-Link Throughput from selected source",
		"fill": 0,
		"fillGradient": 4,
		"gridPos": {
		"h": 9,
		"w": 12,
		"x": 0,
		"y": 12
		},
		"hiddenSeries": false,
		"id": 15,
		"interval": "",
		"legend": {
		"avg": false,
		"current": false,
		"max": false,
		"min": false,
		"show": true,
		"total": false,
		"values": false
		},
		"lines": true,
		"linewidth": 2,
		"links": [],
		"nullPointMode": "connected",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pluginVersion": "6.4.2",
		"pointradius": 2,
		"points": false,
		"renderer": "flot",
		"seriesOverrides": [],
		"spaceLength": 10,
		"stack": false,
		"steppedLine": false,
		"targets": [
		{
		"alias": "[[tag_dest]]",
		"groupBy": [
		{
		"params": [
		"$__interval"
		],
		"type": "time"
		},
		{
		"params": [
		"null"
		],
		"type": "fill"
		}
		],
		"hide": false,
		"measurement": "network",
		"orderByTime": "ASC",
		"policy": "default",
		"query": "SELECT ul FROM $database.autogen.network WHERE (\"src\" =~ /^$src$/) AND $timeFilter GROUP BY dest",
		"rawQuery": true,
		"refId": "B",
		"resultFormat": "time_series",
		"select": [
		[
		{
		"params": [
		"ul"
		],
		"type": "field"
		},
		{
		"params": [],
		"type": "mean"
		}
		]
		],
		"tags": [
		{
		"key": "src",
		"operator": "=~",
		"value": "/^$src$/"
		},
		{
		"condition": "AND",
		"key": "dest",
		"operator": "=~",
		"value": "/^$dest$/"
		}
		]
		}
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Up-Link",
		"tooltip": {
		"shared": true,
		"sort": 0,
		"value_type": "individual"
		},
		"type": "graph",
		"xaxis": {
		"buckets": null,
		"mode": "time",
		"name": null,
		"show": true,
		"values": []
		},
		"yaxes": [
		{
		"decimals": 2,
		"format": "short",
		"label": "Throughput (Mbps)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": true
		},
		{
		"format": "short",
		"label": "Throughput (Mbps)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": false
		}
		],
		"yaxis": {
		"align": false,
		"alignLevel": null
		}
		},
		{
		"aliasColors": {},
		"bars": false,
		"cacheTimeout": null,
		"dashLength": 10,
		"dashes": false,
		"datasource": "$datasource",
		"description": "Shows Down-Link Throughput to selected source",
		"fill": 0,
		"fillGradient": 4,
		"gridPos": {
		"h": 9,
		"w": 12,
		"x": 12,
		"y": 12
		},
		"hiddenSeries": false,
		"id": 16,
		"interval": "",
		"legend": {
		"avg": false,
		"current": false,
		"max": false,
		"min": false,
		"show": true,
		"total": false,
		"values": false
		},
		"lines": true,
		"linewidth": 2,
		"links": [],
		"nullPointMode": "connected",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pluginVersion": "6.4.2",
		"pointradius": 2,
		"points": false,
		"renderer": "flot",
		"seriesOverrides": [],
		"spaceLength": 10,
		"stack": false,
		"steppedLine": false,
		"targets": [
		{
		"alias": "[[tag_dest]]",
		"groupBy": [
		{
		"params": [
		"$__interval"
		],
		"type": "time"
		},
		{
		"params": [
		"null"
		],
		"type": "fill"
		}
		],
		"hide": false,
		"measurement": "network",
		"orderByTime": "ASC",
		"policy": "default",
		"query": "SELECT dl FROM $database.autogen.network WHERE (\"src\" =~ /^$src$/) AND $timeFilter GROUP BY dest",
		"rawQuery": true,
		"refId": "C",
		"resultFormat": "time_series",
		"select": [
		[
		{
		"params": [
		"dl"
		],
		"type": "field"
		},
		{
		"params": [],
		"type": "mean"
		}
		]
		],
		"tags": [
		{
		"key": "src",
		"operator": "=~",
		"value": "/^$src$/"
		},
		{
		"condition": "AND",
		"key": "dest",
		"operator": "=~",
		"value": "/^$dest$/"
		}
		]
		}
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Down-Link",
		"tooltip": {
		"shared": true,
		"sort": 0,
		"value_type": "individual"
		},
		"type": "graph",
		"xaxis": {
		"buckets": null,
		"mode": "time",
		"name": null,
		"show": true,
		"values": []
		},
		"yaxes": [
		{
		"decimals": 2,
		"format": "short",
		"label": "Throughput (Mbps)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": true
		},
		{
		"format": "short",
		"label": "Throughput (Mbps)",
		"logBase": 1,
		"max": null,
		"min": "0",
		"show": false
		}
		],
		"yaxis": {
		"align": false,
		"alignLevel": null
		}
		},
		{
		"collapsed": false,
		"datasource": null,
		"gridPos": {
		"h": 1,
		"w": 24,
		"x": 0,
		"y": 21
		},
		"id": 22,
		"panels": [],
		"title": "Events",
		"type": "row"
		},
		{
		"cacheTimeout": null,
		"columns": [],
		"datasource": "$datasource",
		"fontSize": "100%",
		"gridPos": {
		"h": 6,
		"w": 24,
		"x": 0,
		"y": 22
		},
		"id": 4,
		"links": [],
		"options": {},
		"pageSize": null,
		"pluginVersion": "6.4.2",
		"showHeader": true,
		"sort": {
		"col": 0,
		"desc": true
		},
		"styles": [
		{
		"alias": "Time",
		"dateFormat": "YYYY-MM-DD HH:mm:ss",
		"pattern": "Time",
		"type": "date"
		},
		{
		"alias": "Type",
		"colorMode": null,
		"colors": [
		"#C4162A",
		"rgba(237, 129, 40, 0.89)",
		"rgba(50, 172, 45, 0.97)"
		],
		"dateFormat": "YYYY-MM-DD HH:mm:ss",
		"decimals": 2,
		"mappingType": 1,
		"pattern": "events.type",
		"thresholds": [],
		"type": "string",
		"unit": "short",
		"valueMaps": [
		{
		"text": "Net Char",
		"value": "NETWORK-CHARACTERISTICS-UPDATE"
		},
		{
		"text": "Mobility",
		"value": "MOBILITY"
		}
		]
		},
		{
		"alias": "Description",
		"colorMode": null,
		"colors": [
		"rgba(245, 54, 54, 0.9)",
		"rgba(237, 129, 40, 0.89)",
		"rgba(50, 172, 45, 0.97)"
		],
		"decimals": 2,
		"mappingType": 1,
		"pattern": "events.description",
		"thresholds": [],
		"type": "string",
		"unit": "short",
		"valueMaps": []
		}
		],
		"targets": [
		{
		"groupBy": [],
		"hide": false,
		"measurement": "events",
		"orderByTime": "ASC",
		"policy": "default",
		"query": "SELECT type,description FROM $database.autogen.events WHERE $timeFilter ORDER BY time desc LIMIT 100",
		"rawQuery": true,
		"refId": "A",
		"resultFormat": "time_series",
		"select": [
		[
		{
		"params": [
		"event"
		],
		"type": "field"
		}
		]
		],
		"tags": []
		}
		],
		"timeFrom": null,
		"timeShift": null,
		"title": "Events",
		"transform": "timeseries_to_columns",
		"type": "table"
		}
		],
		"refresh": "1s",
		"schemaVersion": 21,
		"style": "dark",
		"tags": [],
		"templating": {
		"list": [
		{
		"current": {
		"text": "meep-influxdb",
		"value": "meep-influxdb"
		},
		"hide": 0,
		"includeAll": false,
		"label": "",
		"multi": false,
		"name": "datasource",
		"options": [],
		"query": "influxdb",
		"refresh": 1,
		"regex": "",
		"skipUrlSync": false,
		"type": "datasource"
		},
		{
		"allValue": null,
		"current": {
		"text": "demo1",
		"value": "demo1"
		},
		"datasource": "$datasource",
		"definition": "show databases",
		"hide": 0,
		"includeAll": false,
		"label": null,
		"multi": false,
		"name": "database",
		"options": [],
		"query": "show databases",
		"refresh": 1,
		"regex": "",
		"skipUrlSync": false,
		"sort": 0,
		"tagValuesQuery": "",
		"tags": [],
		"tagsQuery": "",
		"type": "query",
		"useTags": false
		},
		{
		"allValue": null,
		"current": {
		"text": "ue1-iperf",
		"value": "ue1-iperf"
		},
		"datasource": "$datasource",
		"definition": "show tag values on $database from network with key = \"src\"",
		"hide": 0,
		"includeAll": false,
		"label": "",
		"multi": false,
		"name": "src",
		"options": [],
		"query": "show tag values on $database from network with key = \"src\"",
		"refresh": 1,
		"regex": "",
		"skipUrlSync": false,
		"sort": 0,
		"tagValuesQuery": "",
		"tags": [],
		"tagsQuery": "",
		"type": "query",
		"useTags": false
		}
		]
		},
		"time": {
		"from": "now-1m",
		"to": "now"
		},
		"timepicker": {
		"hidden": false,
		"refresh_intervals": [
		"1s",
		"5s",
		"10s",
		"30s",
		"1m",
		"5m",
		"15m",
		"30m",
		"1h",
		"2h",
		"1d"
		]
		},
		"timezone": "",
		"title": "Network Metrics Aggregation",
		"uid": "2",
		"version": 3
		}
		No newline at end of file

charts/grafana/dashboards/metrics.json→charts/grafana/dashboards/network-metrics-point-to-point.json

+5 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@
		"editable": true,
		"gnetId": null,
		"graphTooltip": 0,
		"iteration": 1579876961492,
		"id": 1,
		"iteration": 1581094956679,
		"links": [],
		"panels": [
		{
		@@ -914,7 +915,7 @@
		]
		},
		"timezone": "",
		"title": "Metrics Dashboard",
		"uid": "100",
		"version": 4
		"title": "Network Metrics Point-to-Point",
		"uid": "1",
		"version": 5
		}
		No newline at end of file

charts/grafana/values.yaml

+4 −2

Original line number	Diff line number	Diff line
		@@ -375,8 +375,10 @@ dashboardProviders:
		##
		dashboards:
		default:
		custom-dashboard:
		file: dashboards/metrics.json
		network-metrics-point-to-point:
		file: dashboards/network-metrics-point-to-point.json
		network-metrics-aggregation:
		file: dashboards/network-metrics-aggregation.json
		# some-dashboard:
		# json: \|
		# $RAW_JSON

go-apps/meepctl/cmd/build.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ func build(targetName string, cobraCmd *cobra.Command) {
		func buildFrontend(targetName string, cobraCmd *cobra.Command) {
		fmt.Println("--", targetName, "--")
		target := utils.RepoCfg.GetStringMapString("repo.core." + targetName)
		version := utils.RepoCfg.GetString("version")
		gitDir := viper.GetString("meep.gitdir")
		srcDir := gitDir + "/" + target["src"]
		binDir := gitDir + "/" + target["bin"]
		@@ -198,7 +199,7 @@ func buildFrontend(targetName string, cobraCmd *cobra.Command) {

		//build
		fmt.Println(" + building " + targetName)
		cmd = exec.Command("npm", "run", "build", "--", "--output-path="+binDir)
		cmd = exec.Command("npm", "run", "build", "--", "--output-path="+binDir, "--env.VERSION=v"+version)
		cmd.Dir = srcDir
		out, err = utils.ExecuteCmd(cmd, cobraCmd)
		if err != nil {

js-apps/meep-frontend/package.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		"test:verbose": "jest --verbose true",
		"test:coverage": "jest --verbose true --coverage --colors",
		"build": "webpack",
		"build:dev": "webpack-serve --port 8091 --host 10.3.16.78"
		"build:dev": "webpack-serve --port 8091 --host 10.3.16.105"
		},
		"author": "",
		"license": "ISC",