From afe6c6f0b62ec269d8764b05a410aab47610ca2d Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 16 Nov 2020 17:25:45 -0600 Subject: [PATCH 1/8] fix: replace tag if needed --- .github/workflows/release-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 069ac4c..b505048 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -28,6 +28,7 @@ jobs: # Uncomment for NPM publishing. VERSION="`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g' | cut -d'-' -f1`" + git push --delete origin "v$VERSION" yarn lerna version $VERSION --no-git-tag-version -y git commit -am "v$VERSION" git push From 9a75f4458cb9566ae7bdb3a0c0c0aae9baf163d7 Mon Sep 17 00:00:00 2001 From: DXOS Date: Mon, 16 Nov 2020 23:28:26 +0000 Subject: [PATCH 2/8] v1.2.0-alpha.4 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index cac4ba1..ce0020a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-alpha.3", + "version": "1.2.0-alpha.4", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index 20b4724..f03ad7f 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.0-alpha.3", + "version": "1.2.0-alpha.4", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index 8e486df..bf49b65 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.0-alpha.3", + "version": "1.2.0-alpha.4", "description": "Kubenet Console Server", "main": "dist/es/index.js", "bin": { @@ -31,7 +31,7 @@ "dependencies": { "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.8.7", - "@dxos/console-app": "^1.2.0-alpha.3", + "@dxos/console-app": "^1.2.0-alpha.4", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", From 47b8960aff34f218d60fdfbddbaf62d916c5b57e Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 16 Nov 2020 17:36:27 -0600 Subject: [PATCH 3/8] Update release-publish.yml --- .github/workflows/release-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index b505048..68abc04 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -28,7 +28,7 @@ jobs: # Uncomment for NPM publishing. VERSION="`cat lerna.json | grep '"version":' | awk '{ print $2 }' | sed 's/[",]//g' | cut -d'-' -f1`" - git push --delete origin "v$VERSION" + git push --delete origin "v$VERSION" || true yarn lerna version $VERSION --no-git-tag-version -y git commit -am "v$VERSION" git push From 1e835be0c96c5c2ee23714a784e48a0c146be973 Mon Sep 17 00:00:00 2001 From: DXOS Date: Mon, 16 Nov 2020 23:39:08 +0000 Subject: [PATCH 4/8] v1.2.0-alpha.5 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index ce0020a..e7b5c87 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-alpha.4", + "version": "1.2.0-alpha.5", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index f03ad7f..8526032 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.0-alpha.4", + "version": "1.2.0-alpha.5", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index bf49b65..8beefb5 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.0-alpha.4", + "version": "1.2.0-alpha.5", "description": "Kubenet Console Server", "main": "dist/es/index.js", "bin": { @@ -31,7 +31,7 @@ "dependencies": { "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.8.7", - "@dxos/console-app": "^1.2.0-alpha.4", + "@dxos/console-app": "^1.2.0-alpha.5", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", From f54e2fac8047907f67a67045ad37af8dddf9d9ba Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 19 Nov 2020 15:20:50 -0600 Subject: [PATCH 5/8] fix: hostnames --- packages/console-app/config-testnet.yml | 18 +++++++++--------- .../containers/panels/signal/SignalServers.js | 13 +++++++++---- .../console-app/src/gql/signal_status.graphql | 6 ++++++ packages/console-app/src/version.json | 4 ++-- .../console-server/src/resolvers/system.js | 11 +++++++++++ 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/packages/console-app/config-testnet.yml b/packages/console-app/config-testnet.yml index 45ac94c..8da01e6 100644 --- a/packages/console-app/config-testnet.yml +++ b/packages/console-app/config-testnet.yml @@ -11,7 +11,7 @@ app: publicUrl: '/console' api: - server: 'https://apollo1.kube.moon.dxos.network' + server: 'https://alpha.kube.moon.dxos.network' path: '/api' intervalLog: 5000 pollInterval: 10000 @@ -22,19 +22,19 @@ system: services: app: prefix: '/app' - server: 'https://apollo1.kube.moon.dxos.network' + server: 'https://alpha.kube.moon.dxos.network' wns: - server: 'https://apollo1.kube.moon.dxos.network/dxos/wns/api' - webui: 'https://apollo1.kube.moon.dxos.network/dxos/wns/console' + server: 'https://alpha.kube.moon.dxos.network/dxos/wns/api' + webui: 'https://alpha.kube.moon.dxos.network/dxos/wns/console' signal: - server: 'wss://apollo1.kube.moon.dxos.network/dxos/signal' - api: 'https://apollo1.kube.moon.dxos.network/dxos/signal/api' + server: 'wss://alpha.kube.moon.dxos.network/dxos/signal' + api: 'https://alpha.kube.moon.dxos.network/dxos/signal/api' ipfs: - server: 'https://apollo1.kube.moon.dxos.network/dxos/ipfs/api' - gateway: 'https://apollo1.kube.moon.dxos.network/dxos/ipfs/gateway' + server: 'https://alpha.kube.moon.dxos.network/dxos/ipfs/api' + gateway: 'https://alpha.kube.moon.dxos.network/dxos/ipfs/gateway' wellknown: - endpoint: 'https://apollo1.kube.moon.dxos.network/.well-known/dxos' + endpoint: 'https://alpha.kube.moon.dxos.network/.well-known/dxos' diff --git a/packages/console-app/src/containers/panels/signal/SignalServers.js b/packages/console-app/src/containers/panels/signal/SignalServers.js index 1a82c9e..4f8a893 100644 --- a/packages/console-app/src/containers/panels/signal/SignalServers.js +++ b/packages/console-app/src/containers/panels/signal/SignalServers.js @@ -6,6 +6,7 @@ import React, { useContext, useRef, useEffect, useState, useCallback } from 'rea import { useQuery } from '@apollo/react-hooks'; import useComponentSize from '@rehooks/component-size'; import moment from 'moment'; +import get from 'lodash.get'; import Grid from '@material-ui/core/Grid'; import TableBody from '@material-ui/core/TableBody'; @@ -40,8 +41,12 @@ const buildDataGraph = (rootId, prevGraph, nodes) => { } } + const hostname = get(node, 'kubeStatus.system.network.hostname'); + const shortId = node.id.slice(0, NODE_ID_LENGTH).toUpperCase(); + const label = hostname || shortId; + const oldNode = prevGraph.nodes.find(n => n.id === node.id) || {}; - const newNode = { ...oldNode, id: node.id, label: node.id.slice(0, NODE_ID_LENGTH).toUpperCase(), type, data: node }; + const newNode = { ...oldNode, id: node.id, label, type, data: node }; if (type === 'root') { newNode.fx = 0; newNode.fy = 0; @@ -97,9 +102,9 @@ function Row (props) { <> {row.id.slice(0, NODE_ID_LENGTH).toUpperCase()} + {system?.network?.hostname} {row.signal.topics.reduce((prev, curr) => prev + curr.peers.length, 0)} {system?.version || '-'} - {system?.nodejs?.version || '-'} {system?.memory?.used || '-'} {system?.memory?.total || '-'} {system?.time?.up ? moment(system?.time?.up).format('lll') : '-'} @@ -154,10 +159,10 @@ function SignalServers () { - Signal + ID + Hostname Peers (WebRTC) Kube version - Node.JS version Memory usage Memory total Uptime diff --git a/packages/console-app/src/gql/signal_status.graphql b/packages/console-app/src/gql/signal_status.graphql index de3869b..7c90f83 100644 --- a/packages/console-app/src/gql/signal_status.graphql +++ b/packages/console-app/src/gql/signal_status.graphql @@ -10,11 +10,17 @@ query { id kubeStatus { system { + version + memory { total used } + network { + hostname + } + time { up } diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index 3eada8f..31c5e76 100644 --- a/packages/console-app/src/version.json +++ b/packages/console-app/src/version.json @@ -1,7 +1,7 @@ { "build": { "name": "@dxos/console-app", - "buildDate": "2020-11-16T20:04:29.098Z", - "version": "1.1.0-beta.16" + "buildDate": "2020-11-19T21:15:16.619Z", + "version": "1.2.0-alpha.5" } } diff --git a/packages/console-server/src/resolvers/system.js b/packages/console-server/src/resolvers/system.js index 312d89c..1d1b377 100644 --- a/packages/console-server/src/resolvers/system.js +++ b/packages/console-server/src/resolvers/system.js @@ -33,6 +33,14 @@ const getVersionInfo = () => { return undefined; }; +const getCliVersionInfo = () => { + const command = 'wire'; + const args = ['version']; + + const child = spawnSync(command, args, { encoding: 'utf8' }); + return { version: child.stdout }; +}; + /** * Get system inforamtion. * https://www.npmjs.com/package/systeminformation @@ -89,6 +97,9 @@ const getSystemInfo = async () => { dxos: { kube: { version: getVersionInfo() + }, + wire: { + version: getCliVersionInfo() } } }; From 69de5e12c36c74da406e1e5b3cccd4805852adff Mon Sep 17 00:00:00 2001 From: DXOS Date: Thu, 19 Nov 2020 21:23:51 +0000 Subject: [PATCH 6/8] v1.2.0-alpha.6 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index e7b5c87..9aa4ad1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-alpha.5", + "version": "1.2.0-alpha.6", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index 8526032..05a77a5 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.0-alpha.5", + "version": "1.2.0-alpha.6", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index 8beefb5..b6d6754 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.0-alpha.5", + "version": "1.2.0-alpha.6", "description": "Kubenet Console Server", "main": "dist/es/index.js", "bin": { @@ -31,7 +31,7 @@ "dependencies": { "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.8.7", - "@dxos/console-app": "^1.2.0-alpha.5", + "@dxos/console-app": "^1.2.0-alpha.6", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", From b35a26a01f7036383e6f8c8f3d4ea236980ef42b Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 19 Nov 2020 15:28:38 -0600 Subject: [PATCH 7/8] fix: bump version --- lerna.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 9aa4ad1..a402a97 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.0-alpha.6", + "version": "1.2.1-alpha.0", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/package.json b/package.json index 9e3aa98..6c90e3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console", - "version": "1.2.0-alpha.0", + "version": "1.2.1-alpha.0", "description": "Console", "main": "index.js", "private": true, From fafe784ba1d0292f30ab06799fd833a96dbd9073 Mon Sep 17 00:00:00 2001 From: DXOS Date: Thu, 19 Nov 2020 21:31:36 +0000 Subject: [PATCH 8/8] v1.2.1-alpha.1 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index a402a97..2e233e3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.1-alpha.0", + "version": "1.2.1-alpha.1", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index 05a77a5..d3d3f79 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.0-alpha.6", + "version": "1.2.1-alpha.1", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index b6d6754..f403813 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.0-alpha.6", + "version": "1.2.1-alpha.1", "description": "Kubenet Console Server", "main": "dist/es/index.js", "bin": { @@ -31,7 +31,7 @@ "dependencies": { "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.8.7", - "@dxos/console-app": "^1.2.0-alpha.6", + "@dxos/console-app": "^1.2.1-alpha.1", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1",