deep-stack/laconic-console
3
0
Fork 0
forked from cerc-io/laconic-console
Code Pull Requests Activity

xbox -> kube

Browse Source
This commit is contained in:
Thomas E Lackey 2020-06-22 14:20:52 -05:00
parent 950f79dfc2
commit 85657ceab6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/console-app/config.yml.kube
View File

@ -11,7 +11,7 @@ app:
publicUrl: '/console' publicUrl: '/console'
api: api:
server: 'https://xbox.local' server: 'https://kube.local'
path: '/api' path: '/api'
intervalLog: 5000 intervalLog: 5000
pollInterval: 10000 pollInterval: 10000
@ -22,19 +22,19 @@ system:
services: services:
app: app:
prefix: '/app' prefix: '/app'
server: 'https://xbox.local' server: 'https://kube.local'
wns: wns:
server: 'https://xbox.local/dxos/wns/api' server: 'https://kube.local/dxos/wns/api'
webui: 'https://xbox.local/dxos/wns/console' webui: 'https://kube.local/dxos/wns/console'
signal: signal:
server: 'wss://xbox.local/dxos/signal' server: 'wss://kube.local/dxos/signal'
api: 'https://xbox.local/dxos/signal' api: 'https://kube.local/dxos/signal'
ipfs: ipfs:
server: 'https://xbox.local/dxos/ipfs/api' server: 'https://kube.local/dxos/ipfs/api'
gateway: 'https://xbox.local/dxos/ipfs/gateway' gateway: 'https://kube.local/dxos/ipfs/gateway'
wellknown: wellknown:
endpoint: 'https://xbox.local:9000/.well-known/dxos' endpoint: 'https://kube.local:9000/.well-known/dxos'

4
packages/console-app/src/containers/VersionCheck.js
View File

@ -39,12 +39,12 @@ const VersionCheck = () => {
const statusData = JSON.parse(statusResponse.system_status.json); const statusData = JSON.parse(statusResponse.system_status.json);
const wnsData = JSON.parse(wnsResponse.wns_records.json); const wnsData = JSON.parse(wnsResponse.wns_records.json);
const current = get(statusData, 'dxos.xbox.version', '0.0.0'); const current = get(statusData, 'dxos.kube.version', '0.0.0');
let latest = current; let latest = current;
wnsData.forEach(({ attributes: { name, version } }) => { wnsData.forEach(({ attributes: { name, version } }) => {
// TODO(burdon): Filter by type (WRN?) // TODO(burdon): Filter by type (WRN?)
if (name.startsWith('dxos/xbox:')) { if (name.startsWith('dxos/kube:')) {
if (compareVersions(version, latest) > 0) { if (compareVersions(version, latest) > 0) {
latest = version; latest = version;
} }

2
packages/console-app/src/containers/panels/wns/WNSRecords.js
View File

@ -25,7 +25,7 @@ import AppLink from '../../../components/AppLink';
const types = [ const types = [
{ key: null, label: 'ALL' }, { key: null, label: 'ALL' },
{ key: 'wrn:xbox', label: 'XBox' }, { key: 'wrn:kube', label: 'Kube' },
{ key: 'wrn:resource', label: 'Resource' }, { key: 'wrn:resource', label: 'Resource' },
{ key: 'wrn:service', label: 'Service' }, { key: 'wrn:service', label: 'Service' },
{ key: 'wrn:app', label: 'App' }, { key: 'wrn:app', label: 'App' },

0
packages/console-server/config.yml.xbox → packages/console-server/config.yml.kube
View File

4
packages/console-server/src/resolvers/system.js
View File

@ -26,7 +26,7 @@ const size = (n, unit) => {
const getVersionInfo = () => { const getVersionInfo = () => {
// TODO(telackey): Get from config (or figure out a better way to do this). // TODO(telackey): Get from config (or figure out a better way to do this).
const versionFile = '/opt/xbox/VERSION'; const versionFile = '/opt/kube/VERSION';
if (fs.existsSync(versionFile)) { if (fs.existsSync(versionFile)) {
return fs.readFileSync(versionFile, { encoding: 'UTF8' }).replace(/^\s+|\s+$/g, ''); return fs.readFileSync(versionFile, { encoding: 'UTF8' }).replace(/^\s+|\s+$/g, '');
} }
@ -87,7 +87,7 @@ const getSystemInfo = async () => {
}, },
dxos: { dxos: {
xbox: { kube: {
version: getVersionInfo() version: getVersionInfo()
} }
} }