diff --git a/meshcentral.js b/meshcentral.js index 2e5cc313..ed5362df 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -2084,14 +2084,18 @@ function CreateMeshCentralServer(config, args) { ca: Object.keys(obj.webserver.wsagents).length, cu: Object.keys(obj.webserver.wssessions).length, us: Object.keys(obj.webserver.wssessions2).length, - rs: obj.webserver.relaySessionCount + rs: obj.webserver.relaySessionCount, + am: 0 }, traffic: trafficStats.delta }; try { data.cpu = require('os').loadavg(); } catch (ex) { } if (obj.mpsserver != null) { - data.conn.am = 0; - for (var i in obj.mpsserver.ciraConnections) { data.conn.am += obj.mpsserver.ciraConnections[i].length; } + data.conn.amc = 0; + for (var i in obj.mpsserver.ciraConnections) { data.conn.amc += obj.mpsserver.ciraConnections[i].length; } + } + for (var i in obj.connectivityByNode) { + if (obj.connectivityByNode[i].connectivity == 4) { data.conn.am++; } } if (obj.firstStats === true) { delete obj.firstStats; data.first = true; } if (obj.multiServer != null) { data.s = obj.multiServer.serverid; } diff --git a/meshuser.js b/meshuser.js index eec5ba8d..7f22194d 100644 --- a/meshuser.js +++ b/meshuser.js @@ -503,12 +503,16 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use ConnectedUsers: Object.keys(parent.wssessions).length, UsersSessions: Object.keys(parent.wssessions2).length, RelaySessions: parent.relaySessionCount, - RelayCount: Object.keys(parent.wsrelays).length + RelayCount: Object.keys(parent.wsrelays).length, + ConnectedIntelAMT: 0 }; if (parent.relaySessionErrorCount != 0) { serverStats.RelayErrors = parent.relaySessionErrorCount; } if (parent.parent.mpsserver != null) { - serverStats.ConnectedIntelAMT = 0; - for (var i in parent.parent.mpsserver.ciraConnections) { serverStats.ConnectedIntelAMT += parent.parent.mpsserver.ciraConnections[i].length; } + serverStats.ConnectedIntelAMTCira = 0; + for (var i in parent.parent.mpsserver.ciraConnections) { serverStats.ConnectedIntelAMTCira += parent.parent.mpsserver.ciraConnections[i].length; } + } + for (var i in parent.parent.connectivityByNode) { + if (parent.parent.connectivityByNode[i].connectivity == 4) { serverStats.ConnectedIntelAMT++; } } // Take a look at agent errors diff --git a/monitoring.js b/monitoring.js index ffb03da7..12a8f6c8 100644 --- a/monitoring.js +++ b/monitoring.js @@ -33,7 +33,8 @@ module.exports.CreateMonitoring = function (parent, args) { blockedAgents: { description: "Blocked Agents" }, // blockedAgents }; obj.gaugeMetrics = { // Gauge Metrics always start at 0 and can increase and decrease - ConnectedIntelAMT: { description: "Connected Intel AMT" }, // parent.mpsserver.ciraConnections[i].length + ConnectedIntelAMT: { description: "Connected Intel AMT" }, // parent.parent.connectivityByNode[i].connectivity == 4 + ConnectedIntelAMTCira: { description: "Connected Intel AMT CIRA" }, // parent.mpsserver.ciraConnections[i].length UserAccounts: { description: "User Accounts" }, // Object.keys(parent.webserver.users).length DeviceGroups: { description: "Device Groups" }, // parent.webserver.meshes (ONLY WHERE deleted=null) AgentSessions: { description: "Agent Sessions" }, // Object.keys(parent.webserver.wsagents).length @@ -79,10 +80,14 @@ module.exports.CreateMonitoring = function (parent, args) { ConnectedIntelAMT: 0 }; if (parent.mpsserver != null) { + gauges.ConnectedIntelAMTCira = 0; for (var i in parent.mpsserver.ciraConnections) { - gauges.ConnectedIntelAMT += parent.mpsserver.ciraConnections[i].length; + gauges.ConnectedIntelAMTCira += parent.mpsserver.ciraConnections[i].length; } } + for (var i in parent.connectivityByNode) { + if (parent.connectivityByNode[i].connectivity == 4) { gauges.ConnectedIntelAMT++; } + } for (const key in gauges) { obj.gaugeMetrics[key].prometheus.set(gauges[key]); } // Take a look at agent errors var agentstats = parent.webserver.getAgentStats(); diff --git a/translate/translate.json b/translate/translate.json index e234f57b..9393d6c0 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -5527,8 +5527,8 @@ "zh-chs": "操作系统", "zh-cht": "AMT操作系統", "xloc": [ - "default.handlebars->47->3347", - "default3.handlebars->35->3335" + "default.handlebars->47->3348", + "default3.handlebars->35->3336" ] }, { @@ -6074,14 +6074,14 @@ "default-mobile.handlebars->container->page_content->column_l->p3->p3info->3->p3AccountActions->p2AccountSecurity->1->0", "default.handlebars->47->2105", "default.handlebars->47->2107", - "default.handlebars->47->3401", + "default.handlebars->47->3403", "default.handlebars->47->739", "default.handlebars->47->886", "default.handlebars->47->888", "default3.handlebars->35->2107", "default3.handlebars->35->2108", - "default3.handlebars->35->3387", "default3.handlebars->35->3389", + "default3.handlebars->35->3391", "default3.handlebars->35->736", "default3.handlebars->35->883", "default3.handlebars->35->885" @@ -6740,7 +6740,7 @@ "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1", "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1", "default3.handlebars->35->1016", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3" ] @@ -8931,14 +8931,14 @@ "default-mobile.handlebars->container->page_content->column_l->p10->p10console->consoleTable->1->4->1->1->1->0->p15outputselecttd->p15outputselect->p15outputselect1", "default.handlebars->47->2463", "default.handlebars->47->2476", - "default.handlebars->47->3345", + "default.handlebars->47->3346", "default.handlebars->47->421", "default.handlebars->47->727", "default.handlebars->container->column_l->p15->consoleTable->1->6->1->1->1->0->p15outputselecttd->p15outputselect->p15outputselect1", "default.handlebars->container->dialog->dialogBody->dialog7->1->td7meshkvm", "default3.handlebars->35->2460", "default3.handlebars->35->2473", - "default3.handlebars->35->3333", + "default3.handlebars->35->3334", "default3.handlebars->35->418", "default3.handlebars->35->724", "default3.handlebars->container->column_l->p15->consoleTable->1->6->1->1->1->0->p15outputselecttd->p15outputselect->p15outputselect1", @@ -9320,8 +9320,8 @@ "zh-chs": "代理会话", "zh-cht": "代理時段", "xloc": [ - "default.handlebars->47->3330", - "default3.handlebars->35->3318" + "default.handlebars->47->3331", + "default3.handlebars->35->3319" ] }, { @@ -10010,10 +10010,10 @@ "zh-cht": "代理", "xloc": [ "default.handlebars->47->2431", - "default.handlebars->47->3358", + "default.handlebars->47->3359", "default.handlebars->47->587", "default3.handlebars->35->2428", - "default3.handlebars->35->3346", + "default3.handlebars->35->3347", "default3.handlebars->35->584" ] }, @@ -10646,7 +10646,7 @@ "default.handlebars->rfbPortContextMenu->1", "default.handlebars->sshPortContextMenu->1", "default3.handlebars->altPortContextMenu->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->5->1->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->5->1->0", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan->5->1->0", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectsspan->5->1->0", "default3.handlebars->httpPortContextMenu->1", @@ -12314,8 +12314,8 @@ "zh-chs": "您确定要{0}插件吗:{1}", "zh-cht": "你確定要{0}外掛嗎:{1}", "xloc": [ - "default.handlebars->47->3410", - "default3.handlebars->35->3398" + "default.handlebars->47->3412", + "default3.handlebars->35->3400" ] }, { @@ -12469,7 +12469,7 @@ "xloc": [ "default.handlebars->deskConnectContextMenu->3", "default.handlebars->filesShellContextMenu->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->3->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->3->0", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->5->1->0" ] }, @@ -12500,7 +12500,7 @@ "zh-cht": "詢問同意+工具欄", "xloc": [ "default.handlebars->deskConnectContextMenu->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->1->0" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->1->0" ] }, { @@ -13199,7 +13199,7 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3", "default.handlebars->container->column_l->p12->termTable->1->1->0->1->3", "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->3", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->autoconnectbutton2", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13AutoConnect", "sharing-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->0->1->3", @@ -13380,8 +13380,8 @@ "zh-chs": "可用內存", "zh-cht": "可用內存", "xloc": [ - "default.handlebars->47->3339", - "default3.handlebars->35->3327" + "default.handlebars->47->3340", + "default3.handlebars->35->3328" ] }, { @@ -14830,10 +14830,10 @@ "zh-cht": "CIRA", "xloc": [ "default-mobile.handlebars->11->478", - "default.handlebars->47->3346", + "default.handlebars->47->3347", "default.handlebars->47->423", "default.handlebars->47->729", - "default3.handlebars->35->3334", + "default3.handlebars->35->3335", "default3.handlebars->35->420", "default3.handlebars->35->726" ] @@ -14864,8 +14864,8 @@ "zh-chs": "CIRA服务器", "zh-cht": "CIRA伺服器", "xloc": [ - "default.handlebars->47->3394", - "default3.handlebars->35->3382" + "default.handlebars->47->3396", + "default3.handlebars->35->3384" ] }, { @@ -14894,8 +14894,8 @@ "zh-chs": "CIRA服务器命令", "zh-cht": "CIRA伺服器指令", "xloc": [ - "default.handlebars->47->3395", - "default3.handlebars->35->3383" + "default.handlebars->47->3397", + "default3.handlebars->35->3385" ] }, { @@ -14987,11 +14987,11 @@ "default-mobile.handlebars->11->849", "default.handlebars->47->1609", "default.handlebars->47->1693", - "default.handlebars->47->3370", + "default.handlebars->47->3372", "default.handlebars->container->column_l->p40->3->1->p40type->5", "default3.handlebars->35->1594", "default3.handlebars->35->1676", - "default3.handlebars->35->3358", + "default3.handlebars->35->3360", "default3.handlebars->container->column_l->p40->3->3->p40type->5" ] }, @@ -15021,8 +15021,8 @@ "zh-chs": "CPU负载", "zh-cht": "CPU負載", "xloc": [ - "default.handlebars->47->3335", - "default3.handlebars->35->3323" + "default.handlebars->47->3336", + "default3.handlebars->35->3324" ] }, { @@ -15051,8 +15051,8 @@ "zh-chs": "最近15分钟的CPU负载", "zh-cht": "最近15分鐘的CPU負載", "xloc": [ - "default.handlebars->47->3338", - "default3.handlebars->35->3326" + "default.handlebars->47->3339", + "default3.handlebars->35->3327" ] }, { @@ -15081,8 +15081,8 @@ "zh-chs": "最近5分钟的CPU负载", "zh-cht": "最近5分鐘的CPU負載", "xloc": [ - "default.handlebars->47->3337", - "default3.handlebars->35->3325" + "default.handlebars->47->3338", + "default3.handlebars->35->3326" ] }, { @@ -15111,8 +15111,8 @@ "zh-chs": "最近一分钟的CPU负载", "zh-cht": "最近一分鐘的CPU負載", "xloc": [ - "default.handlebars->47->3336", - "default3.handlebars->35->3324" + "default.handlebars->47->3337", + "default3.handlebars->35->3325" ] }, { @@ -15278,8 +15278,8 @@ "zh-chs": "呼叫错误", "zh-cht": "呼叫錯誤", "xloc": [ - "default.handlebars->47->3411", - "default3.handlebars->35->3399" + "default.handlebars->47->3413", + "default3.handlebars->35->3401" ] }, { @@ -15358,7 +15358,7 @@ "default-mobile.handlebars->11->331", "default-mobile.handlebars->dialog->idx_dlgButtonBar", "default.handlebars->47->2158", - "default.handlebars->47->3400", + "default.handlebars->47->3402", "default.handlebars->47->547", "default.handlebars->container->dialog->idx_dlgButtonBar", "default3.handlebars->35->544", @@ -16128,7 +16128,7 @@ "zh-cht": "更改遠程機器的電源狀態", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3" ] }, { @@ -16730,9 +16730,9 @@ "zh-cht": "檢查...", "xloc": [ "default.handlebars->47->1853", - "default.handlebars->47->3405", + "default.handlebars->47->3407", "default3.handlebars->35->1834", - "default3.handlebars->35->3393" + "default3.handlebars->35->3395" ] }, { @@ -17979,7 +17979,7 @@ "zh-cht": "剪貼板", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1", "sharing.handlebars->p11->deskarea0->deskarea4->3" ] }, @@ -18015,7 +18015,7 @@ "default.handlebars->47->1557", "default.handlebars->47->241", "default.handlebars->47->250", - "default.handlebars->47->3399", + "default.handlebars->47->3401", "default3.handlebars->35->1471", "default3.handlebars->35->1542", "sharing.handlebars->11->52" @@ -19634,7 +19634,7 @@ "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->3", "default3.handlebars->35->2206", "default3.handlebars->35->983", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->connectbutton1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->connectbutton1", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span->connectbutton2", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->p13Connect", "mstsc.handlebars->main->1->3->1->12->1->0", @@ -19879,8 +19879,8 @@ "zh-cht": "使用 MeshAgent 遠程桌面連接", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1span", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan", @@ -19914,7 +19914,7 @@ "zh-cht": "使用 RDP 連接", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1rspan", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan" ] }, { @@ -19943,7 +19943,7 @@ "zh-cht": "使用硬件 KVM 連接", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1hspan" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1hspan" ] }, { @@ -20013,6 +20013,36 @@ "default3.handlebars->35->3314" ] }, + { + "bs": "Povezani Intel® AMT CIRA", + "ca": "Intel® AMT CIRA connectat", + "cs": "Připojené Intel® AMT CIRA", + "da": "Forbundne Intel® AMT CIRA", + "de": "Verbunden per Intel® AMT CIRA", + "en": "Connected Intel® AMT CIRA", + "es": "Conectado Intel® AMT CIRA", + "fi": "Yhdistetyt Intel® AMT CIRA", + "fr": "Nombre d'appareils Intel® AMT CIRA connectés", + "hi": "कनेक्टेड Intel® AMT CIRA", + "hu": "Csatlakozott Intel® AMT CIRA", + "it": "Connesso Intel® AMT CIRA", + "ja": "接続されたインテル®AMT CIRA", + "ko": "연결된 Intel® AMT CIRA", + "nl": "Verbonden Intel® AMT CIRA", + "pl": "Połączono Intel® AMT CIRA", + "pt": "Intel® AMT CIRA conectado", + "pt-br": "Intel® AMT CIRA conectado", + "ru": "Подключено Intel® AMT CIRA", + "sv": "Ansluten Intel® AMT CIRA", + "tr": "Bağlı Intel® AMT CIRA", + "uk": "Підключено Intel® AMT CIRA", + "zh-chs": "已连接的英特尔®AMT CIRA", + "zh-cht": "已連接的Intel® AMT CIRA", + "xloc": [ + "default.handlebars->47->3327", + "default3.handlebars->35->3315" + ] + }, { "bs": "Povezani korisnici", "ca": "Usuaris connectats", @@ -20039,8 +20069,8 @@ "zh-chs": "已连接的用户", "zh-cht": "已连接的用户", "xloc": [ - "default.handlebars->47->3331", - "default3.handlebars->35->3319" + "default.handlebars->47->3332", + "default3.handlebars->35->3320" ] }, { @@ -20313,8 +20343,8 @@ "zh-chs": "连接数量", "zh-cht": "連接數量", "xloc": [ - "default.handlebars->47->3357", - "default3.handlebars->35->3345" + "default.handlebars->47->3358", + "default3.handlebars->35->3346" ] }, { @@ -20378,8 +20408,8 @@ "zh-chs": "连接转发器", "zh-cht": "連接轉發器", "xloc": [ - "default.handlebars->47->3393", - "default3.handlebars->35->3381" + "default.handlebars->47->3395", + "default3.handlebars->35->3383" ] }, { @@ -20666,8 +20696,8 @@ "zh-chs": "Cookie编码器", "zh-cht": "Cookie編碼器", "xloc": [ - "default.handlebars->47->3376", - "default3.handlebars->35->3364" + "default.handlebars->47->3378", + "default3.handlebars->35->3366" ] }, { @@ -21377,8 +21407,8 @@ "zh-chs": "核心服务器", "zh-cht": "核心伺服器", "xloc": [ - "default.handlebars->47->3375", - "default3.handlebars->35->3363" + "default.handlebars->47->3377", + "default3.handlebars->35->3365" ] }, { @@ -24167,7 +24197,7 @@ "default.handlebars->47->3146", "default.handlebars->47->3206", "default.handlebars->47->3256", - "default.handlebars->47->3351", + "default.handlebars->47->3352", "default.handlebars->47->870", "default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevDesktop", "default.handlebars->contextMenu->cxdesktop", @@ -24179,7 +24209,7 @@ "default3.handlebars->35->3134", "default3.handlebars->35->3194", "default3.handlebars->35->3244", - "default3.handlebars->35->3339", + "default3.handlebars->35->3340", "default3.handlebars->35->867", "default3.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevDesktop", "default3.handlebars->contextMenu->cxdesktop", @@ -24344,8 +24374,8 @@ "zh-chs": "桌面复用", "zh-cht": "桌面多路復用", "xloc": [ - "default.handlebars->47->3356", - "default3.handlebars->35->3344" + "default.handlebars->47->3357", + "default3.handlebars->35->3345" ] }, { @@ -24513,7 +24543,7 @@ "zh-cht": "桌面會話延遲", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3", "sharing.handlebars->p11->deskarea0->deskarea4->1" ] }, @@ -25173,13 +25203,13 @@ "default.handlebars->47->2847", "default.handlebars->47->2891", "default.handlebars->47->2980", - "default.handlebars->47->3329", + "default.handlebars->47->3330", "default.handlebars->container->column_l->p2->p2info->9", "default3.handlebars->35->2725", "default3.handlebars->35->2841", "default3.handlebars->35->2885", "default3.handlebars->35->2974", - "default3.handlebars->35->3317", + "default3.handlebars->35->3318", "default3.handlebars->container->column_l->p2->p2info->9" ] }, @@ -27095,8 +27125,8 @@ "default.handlebars->deskDisconnectContextMenu->3", "default3.handlebars->35->2207", "default3.handlebars->35->984", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->5->3->0", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->disconnectbutton1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->5->3->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->disconnectbutton1", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->disconnectbutton2span->disconnectbutton2", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Disconnect", "sharing-mobile.handlebars->11->62", @@ -27166,7 +27196,7 @@ "zh-cht": "斷開連接並鎖定", "xloc": [ "default.handlebars->deskDisconnectContextMenu->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->5->1->0" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->5->1->0" ] }, { @@ -27284,7 +27314,7 @@ "default3.handlebars->35->446", "default3.handlebars->35->486", "default3.handlebars->35->8", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->deskstatus", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->deskstatus", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->termstatus", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Status", "sharing-mobile.handlebars->11->1", @@ -27463,7 +27493,7 @@ "zh-cht": "在遠程電腦上顯示通知", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -28530,7 +28560,7 @@ "zh-cht": "將遠程剪貼板下載到本地剪貼板", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -29542,7 +29572,7 @@ "default-mobile.handlebars->container->page_content->column_l->p10->p10terminal->termTable->termarea4->1->3", "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5", "default.handlebars->container->column_l->p12->termTable->1->1->4->1->3", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1", "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->1", "sharing.handlebars->p12->9->3" ] @@ -30254,7 +30284,7 @@ "zh-cht": "編輯遠程桌面設置", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "sharing.handlebars->p11->deskarea0->deskarea1->1" ] }, @@ -31041,8 +31071,8 @@ "zh-chs": "电子邮件/短信/推送流量", "zh-cht": "電子郵件/短信/推送流量", "xloc": [ - "default.handlebars->47->3384", - "default3.handlebars->35->3372" + "default.handlebars->47->3386", + "default3.handlebars->35->3374" ] }, { @@ -33422,8 +33452,8 @@ "zh-chs": "外部", "zh-cht": "外部", "xloc": [ - "default.handlebars->47->3364", - "default3.handlebars->35->3352" + "default.handlebars->47->3366", + "default3.handlebars->35->3354" ] }, { @@ -34238,7 +34268,7 @@ "default.handlebars->47->3147", "default.handlebars->47->3207", "default.handlebars->47->3257", - "default.handlebars->47->3352", + "default.handlebars->47->3353", "default.handlebars->47->472", "default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevFiles", "default.handlebars->contextMenu->cxfiles", @@ -34249,7 +34279,7 @@ "default3.handlebars->35->3135", "default3.handlebars->35->3195", "default3.handlebars->35->3245", - "default3.handlebars->35->3340", + "default3.handlebars->35->3341", "default3.handlebars->35->469", "default3.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevFiles", "default3.handlebars->contextMenu->cxfiles", @@ -34804,7 +34834,7 @@ "zh-cht": "全部關注", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3" ] }, { @@ -35987,7 +36017,7 @@ "default.handlebars->container->column_l->p11->p11title->p11deviceNameHeader->devListToolbarViewIcons", "default.handlebars->container->column_l->p12->p12title->devListToolbarViewIcons2", "default.handlebars->container->column_l->p14->p14title->devListToolbarViewIcons", - "default3.handlebars->container->column_l->p11->p11title->devListToolbarViewIcons", + "default3.handlebars->container->column_l->p11->p11title->devListToolbarViewIcons11", "default3.handlebars->container->column_l->p12->p12title->devListToolbarViewIcons2", "default3.handlebars->container->column_l->p14->p14title->devListToolbarViewIcons" ] @@ -37875,11 +37905,11 @@ "default-mobile.handlebars->11->561", "default.handlebars->47->1051", "default.handlebars->47->1219", - "default.handlebars->47->3348", + "default.handlebars->47->3349", "default.handlebars->47->450", "default3.handlebars->35->1048", "default3.handlebars->35->1214", - "default3.handlebars->35->3336", + "default3.handlebars->35->3337", "default3.handlebars->35->447" ] }, @@ -38166,7 +38196,7 @@ "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3", "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan", "default.handlebars->container->column_l->p12->termTable->1->1->0->1->3->connectbutton2hspan", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1hspan->connectbutton1h", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1hspan->connectbutton1h", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2hspan->connectbutton2h", "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3", "sharing.handlebars->p11->deskarea0->deskarea1->3->connectbutton1hspan" @@ -38397,8 +38427,8 @@ "zh-chs": "堆总数", "zh-cht": "堆總數", "xloc": [ - "default.handlebars->47->3366", - "default3.handlebars->35->3354" + "default.handlebars->47->3368", + "default3.handlebars->35->3356" ] }, { @@ -38427,8 +38457,8 @@ "zh-chs": "堆使用", "zh-cht": "堆使用", "xloc": [ - "default.handlebars->47->3365", - "default3.handlebars->35->3353" + "default.handlebars->47->3367", + "default3.handlebars->35->3355" ] }, { @@ -40842,7 +40872,7 @@ "xloc": [ "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3->11->DeskControlSpan", "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5->11->DeskControlSpan", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1->DeskControlSpan->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1->DeskControlSpan->1", "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3->5->DeskControlSpan", "sharing.handlebars->p11->deskarea0->deskarea4->3->9->DeskControlSpan" ] @@ -41196,8 +41226,15 @@ "zh-chs": "英特尔AMT", "zh-cht": "英特爾AMT", "xloc": [ - "default.handlebars->47->3362", - "default3.handlebars->35->3350" + "default.handlebars->47->3363", + "default3.handlebars->35->3351" + ] + }, + { + "en": "Intel AMT CIRA", + "xloc": [ + "default.handlebars->47->3364", + "default3.handlebars->35->3352" ] }, { @@ -41372,8 +41409,8 @@ "zh-chs": "英特尔 AMT 经理", "zh-cht": "英特爾 AMT 經理", "xloc": [ - "default.handlebars->47->3392", - "default3.handlebars->35->3380" + "default.handlebars->47->3394", + "default3.handlebars->35->3382" ] }, { @@ -41467,7 +41504,7 @@ "default.handlebars->47->2226", "default.handlebars->47->2464", "default.handlebars->47->2477", - "default.handlebars->47->3391", + "default.handlebars->47->3393", "default.handlebars->47->872", "default.handlebars->47->939", "default.handlebars->47->988", @@ -41477,7 +41514,7 @@ "default3.handlebars->35->2222", "default3.handlebars->35->2461", "default3.handlebars->35->2474", - "default3.handlebars->35->3379", + "default3.handlebars->35->3381", "default3.handlebars->35->869", "default3.handlebars->35->936", "default3.handlebars->35->985", @@ -49062,7 +49099,7 @@ "zh-cht": "鎖定遠程計算機", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -50449,8 +50486,8 @@ "zh-chs": "主服务器信息", "zh-cht": "主伺服器訊息", "xloc": [ - "default.handlebars->47->3378", - "default3.handlebars->35->3366" + "default.handlebars->47->3380", + "default3.handlebars->35->3368" ] }, { @@ -51566,11 +51603,11 @@ "zh-chs": "Megabyte", "zh-cht": "Megabyte", "xloc": [ - "default.handlebars->47->3363", - "default.handlebars->47->3368", + "default.handlebars->47->3365", + "default.handlebars->47->3370", "default.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sizedropdown->7", - "default3.handlebars->35->3351", - "default3.handlebars->35->3356", + "default3.handlebars->35->3353", + "default3.handlebars->35->3358", "default3.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sizedropdown->7" ] }, @@ -51607,13 +51644,13 @@ "default.handlebars->47->1714", "default.handlebars->47->1720", "default.handlebars->47->1726", - "default.handlebars->47->3342", + "default.handlebars->47->3343", "default.handlebars->container->column_l->p40->3->1->p40type->3", "default3.handlebars->35->1595", "default3.handlebars->35->1697", "default3.handlebars->35->1703", "default3.handlebars->35->1709", - "default3.handlebars->35->3330", + "default3.handlebars->35->3331", "default3.handlebars->container->column_l->p40->3->3->p40type->3" ] }, @@ -51919,8 +51956,8 @@ "zh-chs": "MeshAgent流量", "zh-cht": "MeshAgent流量", "xloc": [ - "default.handlebars->47->3380", - "default3.handlebars->35->3368" + "default.handlebars->47->3382", + "default3.handlebars->35->3370" ] }, { @@ -51949,8 +51986,8 @@ "zh-chs": "MeshAgent更新", "zh-cht": "MeshAgent更新", "xloc": [ - "default.handlebars->47->3381", - "default3.handlebars->35->3369" + "default.handlebars->47->3383", + "default3.handlebars->35->3371" ] }, { @@ -52472,8 +52509,8 @@ "zh-chs": "MeshCentral服务器同级化", "zh-cht": "MeshCentral伺服器同級化", "xloc": [ - "default.handlebars->47->3379", - "default3.handlebars->35->3367" + "default.handlebars->47->3381", + "default3.handlebars->35->3369" ] }, { @@ -53077,8 +53114,8 @@ "zh-chs": "消息调度器", "zh-cht": "電郵調度器", "xloc": [ - "default.handlebars->47->3377", - "default3.handlebars->35->3365" + "default.handlebars->47->3379", + "default3.handlebars->35->3367" ] }, { @@ -54715,8 +54752,8 @@ "default3.handlebars->35->2932", "default3.handlebars->35->341", "default3.handlebars->35->892", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->3", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->3", "default3.handlebars->container->column_l->p42->p42tbl->1->0->5" ] }, @@ -58729,8 +58766,8 @@ "zh-chs": "空值", "zh-cht": "無效的", "xloc": [ - "default.handlebars->47->3371", - "default3.handlebars->35->3359" + "default.handlebars->47->3373", + "default3.handlebars->35->3361" ] }, { @@ -59659,7 +59696,7 @@ "zh-cht": "在遠程電腦上打開一個網址", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -59691,7 +59728,7 @@ "default.handlebars->47->1030", "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", "default3.handlebars->35->1027", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -60354,7 +60391,7 @@ "default.handlebars->47->1470", "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1", "default3.handlebars->35->1456", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1" ] }, { @@ -61830,7 +61867,7 @@ "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1", "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1", "default3.handlebars->35->1017", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3" ] @@ -62444,9 +62481,9 @@ "zh-cht": "外掛指令", "xloc": [ "default.handlebars->47->329", - "default.handlebars->47->3409", + "default.handlebars->47->3411", "default3.handlebars->35->326", - "default3.handlebars->35->3397" + "default3.handlebars->35->3399" ] }, { @@ -63033,7 +63070,7 @@ "xloc": [ "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3", "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3" ] }, { @@ -63610,7 +63647,7 @@ "zh-cht": "隱私欄", "xloc": [ "default.handlebars->deskConnectContextMenu->5", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->5->0" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->5->0" ] }, { @@ -63846,7 +63883,7 @@ "zh-cht": "進程", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess" ] }, { @@ -64661,7 +64698,7 @@ "zh-cht": "RDP 連接", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1rspan", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->connectbutton1r" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->connectbutton1r" ] }, { @@ -64921,8 +64958,8 @@ "zh-chs": "RSS", "zh-cht": "RSS", "xloc": [ - "default.handlebars->47->3367", - "default3.handlebars->35->3355" + "default.handlebars->47->3369", + "default3.handlebars->35->3357" ] }, { @@ -65309,7 +65346,7 @@ "zh-cht": "將遠程桌面會話記錄到檔案", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -65669,7 +65706,7 @@ "default.handlebars->container->column_l->p40->3->3", "default.handlebars->container->column_l->p52->3->1->0->3->3", "default3.handlebars->35->872", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->DeskToolsRefreshButton", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->DeskToolsRefreshButton", "default3.handlebars->container->column_l->p13->p13toolbar->1->2->1->3", "default3.handlebars->container->column_l->p40->3->1", "default3.handlebars->container->column_l->p52->3->1->0->1->1", @@ -65734,7 +65771,7 @@ "zh-cht": "刷新桌面", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -65767,14 +65804,14 @@ "default.handlebars->47->1154", "default.handlebars->47->1179", "default.handlebars->47->2417", - "default.handlebars->47->3349", + "default.handlebars->47->3350", "default.handlebars->47->427", "default.handlebars->47->431", "default.handlebars->47->733", "default3.handlebars->35->1149", "default3.handlebars->35->1174", "default3.handlebars->35->2414", - "default3.handlebars->35->3337", + "default3.handlebars->35->3338", "default3.handlebars->35->424", "default3.handlebars->35->428", "default3.handlebars->35->730" @@ -65806,8 +65843,8 @@ "zh-chs": "中继数量", "zh-cht": "中繼數量", "xloc": [ - "default.handlebars->47->3334", - "default3.handlebars->35->3322" + "default.handlebars->47->3335", + "default3.handlebars->35->3323" ] }, { @@ -65872,8 +65909,8 @@ "zh-chs": "中继错误", "zh-cht": "中繼錯誤", "xloc": [ - "default.handlebars->47->3327", - "default3.handlebars->35->3315" + "default.handlebars->47->3328", + "default3.handlebars->35->3316" ] }, { @@ -65942,10 +65979,10 @@ "zh-chs": "中继连接", "zh-cht": "中繼連接", "xloc": [ - "default.handlebars->47->3333", - "default.handlebars->47->3361", - "default3.handlebars->35->3321", - "default3.handlebars->35->3349" + "default.handlebars->47->3334", + "default.handlebars->47->3362", + "default3.handlebars->35->3322", + "default3.handlebars->35->3350" ] }, { @@ -67440,7 +67477,7 @@ "zh-cht": "遠程輸入被鎖定", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -67470,7 +67507,7 @@ "zh-cht": "遠程輸入已解鎖", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -70173,7 +70210,7 @@ "zh-cht": "向左旋轉", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "sharing.handlebars->p11->deskarea0->deskarea1->1" ] }, @@ -70204,7 +70241,7 @@ "zh-cht": "向右旋轉", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "sharing.handlebars->p11->deskarea0->deskarea1->1" ] }, @@ -70400,7 +70437,7 @@ "uk": "Запустити сценарій на цьому комп'ютері", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -71930,7 +71967,7 @@ "zh-cht": "保存遠程桌面的屏幕截圖", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3", "sharing.handlebars->p11->deskarea0->deskarea4->1" ] }, @@ -73199,7 +73236,7 @@ "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5", "default.handlebars->container->column_l->p12->termTable->1->1->4->1->1->specialKeyDropDown", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1", "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->3", "messenger.handlebars->xbottom->1->1->0->3", "sharing.handlebars->p11->deskarea0->deskarea4->3", @@ -74025,8 +74062,8 @@ "zh-chs": "服务器证书", "zh-cht": "伺服器憑證", "xloc": [ - "default.handlebars->47->3382", - "default3.handlebars->35->3370" + "default.handlebars->47->3384", + "default3.handlebars->35->3372" ] }, { @@ -74100,8 +74137,8 @@ "zh-chs": "服务器数据库", "zh-cht": "伺服器數據庫", "xloc": [ - "default.handlebars->47->3383", - "default3.handlebars->35->3371" + "default.handlebars->47->3385", + "default3.handlebars->35->3373" ] }, { @@ -74455,8 +74492,8 @@ "zh-chs": "服务器跟踪", "zh-cht": "伺服器追蹤", "xloc": [ - "default.handlebars->47->3396", - "default3.handlebars->35->3384" + "default.handlebars->47->3398", + "default3.handlebars->35->3386" ] }, { @@ -74485,8 +74522,8 @@ "zh-chs": "服务器跟踪事件", "zh-cht": "服務器跟踪事件", "xloc": [ - "default.handlebars->47->3374", - "default3.handlebars->35->3362" + "default.handlebars->47->3376", + "default3.handlebars->35->3364" ] }, { @@ -74797,7 +74834,7 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1", "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3", "messenger.handlebars->xtop->3", @@ -74937,8 +74974,8 @@ "zh-chs": "ServerStats.csv", "zh-cht": "ServerStats.csv", "xloc": [ - "default.handlebars->47->3373", - "default3.handlebars->35->3361" + "default.handlebars->47->3375", + "default3.handlebars->35->3363" ] }, { @@ -75017,7 +75054,7 @@ "zh-cht": "服務", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService" ] }, { @@ -75208,7 +75245,7 @@ "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", "default.handlebars->container->column_l->p12->termTable->1->1->4->1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3", "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->3", "sharing.handlebars->p11->deskarea0->deskarea4->1", "sharing.handlebars->p12->9->1" @@ -75515,7 +75552,7 @@ "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3", "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->kvmListToolbar", "default3.handlebars->container->column_l->p1->devListToolbarSpan->kvmListToolbar", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "default3.handlebars->container->column_l->p4->3->1->0->1->3", "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3" ] @@ -75854,7 +75891,7 @@ "zh-cht": "與訪客共享設備", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -78173,8 +78210,8 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader", "default.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sortdropdown->1", "default.handlebars->container->column_l->p5->p5toolbar->1->2->p5filesubhead->1->p5sortdropdown->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader", "default3.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sortdropdown->1", "default3.handlebars->container->column_l->p5->p5toolbar->1->2->p5filesubhead->3->p5sortdropdown->1", "sharing-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->4->1->1->1->0->3->p13sortdropdown->1", @@ -78208,7 +78245,7 @@ "zh-cht": "按進程ID排序", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader" ] }, { @@ -78274,7 +78311,7 @@ "zh-cht": "按狀態排序", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader" ] }, { @@ -79803,7 +79840,7 @@ "default.handlebars->47->1469", "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1", "default3.handlebars->35->1455", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1" ] }, { @@ -81631,7 +81668,7 @@ "default.handlebars->47->3145", "default.handlebars->47->3205", "default.handlebars->47->3255", - "default.handlebars->47->3350", + "default.handlebars->47->3351", "default.handlebars->47->468", "default.handlebars->47->871", "default.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevTerminal", @@ -81643,7 +81680,7 @@ "default3.handlebars->35->3133", "default3.handlebars->35->3193", "default3.handlebars->35->3243", - "default3.handlebars->35->3338", + "default3.handlebars->35->3339", "default3.handlebars->35->465", "default3.handlebars->35->868", "default3.handlebars->container->topbar->1->1->MainSubMenuSpan->MainSubMenu->1->0->MainDevTerminal", @@ -83796,9 +83833,9 @@ { "en": "Toggle Dropdown", "xloc": [ - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->connectbutton1rd->0", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->connectbutton1d->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->diconnectbutton1d->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->connectbutton1rd->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->connectbutton1d->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->diconnectbutton1d->1", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span->connectbutton2d->0", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan->connectbutton2sd->0", "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->p13Connectdrop->0", @@ -83900,7 +83937,7 @@ "zh-cht": "切換查看模式", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3", "player.handlebars->p11->deskarea0->deskarea1->1", "sharing.handlebars->p11->deskarea0->deskarea1->1" ] @@ -83962,7 +83999,7 @@ "zh-cht": "切換焦點模式,現用中僅更新鼠標周圍的區域", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3" ] }, { @@ -84022,7 +84059,7 @@ "zh-cht": "切換鼠標和鍵盤輸入", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5->11", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1", "sharing.handlebars->p11->deskarea0->deskarea4->3->9" ] }, @@ -84088,7 +84125,7 @@ "zh-cht": "切換遠程桌面背景", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -84175,7 +84212,7 @@ "zh-cht": "切換工具視圖", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -84355,7 +84392,7 @@ "zh-cht": "工具", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -85097,7 +85134,7 @@ "default3.handlebars->35->2276", "default3.handlebars->35->3158", "default3.handlebars->35->506", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1", "sharing.handlebars->p11->deskarea0->deskarea4->3" ] }, @@ -85458,7 +85495,7 @@ "xloc": [ "default-mobile.handlebars->11->357", "default-mobile.handlebars->11->99", - "default3.handlebars->35->3388" + "default3.handlebars->35->3390" ] }, { @@ -85488,7 +85525,7 @@ "zh-cht": "在啟用兩因素身份驗證之前,無法訪問此功能。這是額外的安全性所必需的。轉到“我的帳戶”標籤,然後查看“帳戶安全性”部分。", "xloc": [ "default.handlebars->47->2108", - "default.handlebars->47->3402", + "default.handlebars->47->3404", "default.handlebars->47->740", "default.handlebars->47->889", "default3.handlebars->35->737", @@ -86912,8 +86949,8 @@ "zh-chs": "最新", "zh-cht": "最新", "xloc": [ - "default.handlebars->47->3407", - "default3.handlebars->35->3395" + "default.handlebars->47->3409", + "default3.handlebars->35->3397" ] }, { @@ -87249,7 +87286,7 @@ "zh-cht": "將本地剪貼板上傳到遠程裝置", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3" + "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3" ] }, { @@ -87590,8 +87627,8 @@ "zh-chs": "用法", "zh-cht": "用法", "xloc": [ - "default.handlebars->47->3369", - "default3.handlebars->35->3357" + "default.handlebars->47->3371", + "default3.handlebars->35->3359" ] }, { @@ -88008,8 +88045,8 @@ "zh-chs": "用户帐户", "zh-cht": "用戶帳戶", "xloc": [ - "default.handlebars->47->3328", - "default3.handlebars->35->3316" + "default.handlebars->47->3329", + "default3.handlebars->35->3317" ] }, { @@ -88024,8 +88061,8 @@ "pl": "Dziennik Autentykacji Użytkownika", "uk": "Журнал Автентифікації Користувача", "xloc": [ - "default.handlebars->47->3390", - "default3.handlebars->35->3378" + "default.handlebars->47->3392", + "default3.handlebars->35->3380" ] }, { @@ -88565,8 +88602,8 @@ "zh-chs": "用户会话", "zh-cht": "用戶節", "xloc": [ - "default.handlebars->47->3360", - "default3.handlebars->35->3348" + "default.handlebars->47->3361", + "default3.handlebars->35->3349" ] }, { @@ -89390,11 +89427,11 @@ "xloc": [ "default.handlebars->47->2846", "default.handlebars->47->2890", - "default.handlebars->47->3359", + "default.handlebars->47->3360", "default.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGeneral", "default3.handlebars->35->2840", "default3.handlebars->35->2884", - "default3.handlebars->35->3347", + "default3.handlebars->35->3348", "default3.handlebars->container->topbar->1->1->UsersSubMenuSpan->UsersSubMenu->1->0->UsersGeneral" ] }, @@ -89424,8 +89461,8 @@ "zh-chs": "用户会话", "zh-cht": "用戶節", "xloc": [ - "default.handlebars->47->3332", - "default3.handlebars->35->3320" + "default.handlebars->47->3333", + "default3.handlebars->35->3321" ] }, { @@ -90134,9 +90171,9 @@ "zh-chs": "版本不兼容,请先升级您的MeshCentral", "zh-cht": "版本不兼容,請先升級你的MeshCentral", "xloc": [ - "default.handlebars->47->3403", - "default3.handlebars->35->3390", - "default3.handlebars->35->3391" + "default.handlebars->47->3405", + "default3.handlebars->35->3392", + "default3.handlebars->35->3393" ] }, { @@ -90373,10 +90410,10 @@ "zh-chs": "查看变更日志", "zh-cht": "查看變更日誌", "xloc": [ - "default.handlebars->47->3406", "default.handlebars->47->3408", - "default3.handlebars->35->3394", - "default3.handlebars->35->3396" + "default.handlebars->47->3410", + "default3.handlebars->35->3396", + "default3.handlebars->35->3398" ] }, { @@ -91166,10 +91203,10 @@ "zh-chs": "网络服务器", "zh-cht": "網絡伺服器", "xloc": [ - "default.handlebars->47->3385", - "default.handlebars->47->3386", - "default3.handlebars->35->3373", - "default3.handlebars->35->3374" + "default.handlebars->47->3387", + "default.handlebars->47->3388", + "default3.handlebars->35->3375", + "default3.handlebars->35->3376" ] }, { @@ -91198,8 +91235,8 @@ "zh-chs": "Web 服务器 HTTP 标头", "zh-cht": "Web 服務器 HTTP 標頭", "xloc": [ - "default.handlebars->47->3389", - "default3.handlebars->35->3377" + "default.handlebars->47->3391", + "default3.handlebars->35->3379" ] }, { @@ -91228,8 +91265,8 @@ "zh-chs": "Web服务器请求", "zh-cht": "Web伺服器請求", "xloc": [ - "default.handlebars->47->3387", - "default3.handlebars->35->3375" + "default.handlebars->47->3389", + "default3.handlebars->35->3377" ] }, { @@ -91258,8 +91295,8 @@ "zh-chs": "Web套接字中继", "zh-cht": "Web插座中繼", "xloc": [ - "default.handlebars->47->3388", - "default3.handlebars->35->3376" + "default.handlebars->47->3390", + "default3.handlebars->35->3378" ] }, { @@ -91420,8 +91457,8 @@ "zh-chs": "网络RDP", "zh-cht": "WebRDP", "xloc": [ - "default.handlebars->47->3353", - "default3.handlebars->35->3341" + "default.handlebars->47->3354", + "default3.handlebars->35->3342" ] }, { @@ -91450,8 +91487,8 @@ "zh-chs": "网络SSH", "zh-cht": "網絡SSH", "xloc": [ - "default.handlebars->47->3354", - "default3.handlebars->35->3342" + "default.handlebars->47->3355", + "default3.handlebars->35->3343" ] }, { @@ -91510,8 +91547,8 @@ "zh-chs": "网络VNC", "zh-cht": "網絡VNC", "xloc": [ - "default.handlebars->47->3355", - "default3.handlebars->35->3343" + "default.handlebars->47->3356", + "default3.handlebars->35->3344" ] }, { @@ -94440,8 +94477,8 @@ "zh-chs": "\\\\'", "zh-cht": "\\\\'", "xloc": [ - "default.handlebars->47->3404", - "default3.handlebars->35->3392" + "default.handlebars->47->3406", + "default3.handlebars->35->3394" ] }, { @@ -95420,10 +95457,10 @@ "zh-chs": "空闲", "zh-cht": "免費", "xloc": [ - "default.handlebars->47->3340", - "default.handlebars->47->3343", - "default3.handlebars->35->3328", - "default3.handlebars->35->3331" + "default.handlebars->47->3341", + "default.handlebars->47->3344", + "default3.handlebars->35->3329", + "default3.handlebars->35->3332" ] }, { @@ -96753,8 +96790,8 @@ "zh-chs": "servertrace.csv", "zh-cht": "servertrace.csv", "xloc": [ - "default.handlebars->47->3398", - "default3.handlebars->35->3386" + "default.handlebars->47->3400", + "default3.handlebars->35->3388" ] }, { @@ -96918,8 +96955,8 @@ "zh-chs": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss", "zh-cht": "time, conn.agent, conn.users, conn.usersessions, conn.relaysession, conn.intelamt, mem.external, mem.heapused, mem.heaptotal, mem.rss", "xloc": [ - "default.handlebars->47->3372", - "default3.handlebars->35->3360" + "default.handlebars->47->3374", + "default3.handlebars->35->3362" ] }, { @@ -96948,8 +96985,8 @@ "zh-chs": "时间,来源,信息", "zh-cht": "時間,來源,訊息", "xloc": [ - "default.handlebars->47->3397", - "default3.handlebars->35->3385" + "default.handlebars->47->3399", + "default3.handlebars->35->3387" ] }, { @@ -97019,10 +97056,10 @@ "zh-chs": "总计", "zh-cht": "總", "xloc": [ - "default.handlebars->47->3341", - "default.handlebars->47->3344", - "default3.handlebars->35->3329", - "default3.handlebars->35->3332" + "default.handlebars->47->3342", + "default.handlebars->47->3345", + "default3.handlebars->35->3330", + "default3.handlebars->35->3333" ] }, { @@ -99552,7 +99589,7 @@ "ru": "⇲", "xloc": [ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1->5", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3->19", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3->19", "player.handlebars->p11->deskarea0->deskarea1->1->1", "sharing.handlebars->p11->deskarea0->deskarea1->1->3" ] @@ -99704,7 +99741,7 @@ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsGoogleBackup->0->p2ServerActionsGoogleBackupCheck->0", "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsRestore->0->0->0", "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsVersion->0->0->0", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigok->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->p11bigok->0", "default3.handlebars->container->column_l->p13->p13filetable->p13bigok->0", "default3.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageAuthApp->1->authAppSetupCheck->0", "default3.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageDuoApp->1->authDuoSetupCheck->0", @@ -99748,7 +99785,7 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1->idx_deskFullBtn2", "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1->idx_termFullBtn2", "default.handlebars->container->dialog->dialogHeader->id_dialogclose", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3->idx_deskFullBtn2", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3->idx_deskFullBtn2", "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3->idx_termFullBtn2", "player.handlebars->p11->dialog->dialogHeader->id_dialogclose", "sharing.handlebars->dialog->dialogHeader->id_dialogclose", @@ -99778,7 +99815,7 @@ "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigfail->0", "default.handlebars->container->column_l->p13->p13filetable->p13bigfail->0", "default.handlebars->container->column_l->p5->p5filetable->bigfail->0", - "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigfail->0", + "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->p11bigfail->0", "default3.handlebars->container->column_l->p13->p13filetable->p13bigfail->0", "default3.handlebars->container->column_l->p5->p5filetable->bigfail->0", "player.handlebars->p11->deskarea0->deskarea3x->bigfail->0", diff --git a/views/default.handlebars b/views/default.handlebars index 3277a682..2c209821 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -18174,6 +18174,7 @@ InvalidDeviceGroupType: "Invalid Device Group Type", DuplicateAgent: "Duplicate Agent", ConnectedIntelAMT: "Connected Intel® AMT", + ConnectedIntelAMTCira: "Connected Intel® AMT CIRA", RelayErrors: "Relay Errors", UserAccounts: "User Accounts", DeviceGroups: "Device Groups", @@ -18260,7 +18261,8 @@ serverTimelineConfig.data.datasets[1].data.push({ x: stats.time, y: stats.conn.cu }); serverTimelineConfig.data.datasets[2].data.push({ x: stats.time, y: stats.conn.us }); serverTimelineConfig.data.datasets[3].data.push({ x: stats.time, y: stats.conn.rs }); - if (stats.conn.am != null) { serverTimelineConfig.data.datasets[4].data.push({ x: stats.time, y: stats.conn.am }); } + serverTimelineConfig.data.datasets[4].data.push({ x: stats.time, y: stats.conn.am }); + if (stats.conn.amc != null) { serverTimelineConfig.data.datasets[5].data.push({ x: stats.time, y: stats.conn.amc }); } } else if (chartType == 1) { // Memory serverTimelineConfig.data.datasets[0].data.push({ x: stats.time, y: stats.mem.external / (1024 * 1024) }); serverTimelineConfig.data.datasets[1].data.push({ x: stats.time, y: stats.mem.heapUsed / (1024 * 1024) }); @@ -18307,7 +18309,8 @@ { label: "Users", data: [], backgroundColor: 'rgba(16, 84, 158, .1)', borderColor: 'rgb(16, 84, 158)', fill: true }, { label: "User Sessions", data: [], backgroundColor: 'rgba(255, 99, 132, .1)', borderColor: 'rgb(255, 99, 132)', fill: true }, { label: "Relay Sessions", data: [], backgroundColor: 'rgba(39, 158, 16, .1)', borderColor: 'rgb(39, 158, 16)', fill: true }, - { label: "Intel AMT", data: [], backgroundColor: 'rgba(134, 16, 158, .1)', borderColor: 'rgb(134, 16, 158)', fill: true } + { label: "Intel AMT", data: [], backgroundColor: 'rgba(134, 16, 158, .1)', borderColor: 'rgb(134, 16, 158)', fill: true }, + { label: "Intel AMT CIRA", data: [], backgroundColor: 'rgba(255, 155, 0, .1)', borderColor: 'rgb(255, 155, 0)', fill: true } ] }; for (var i = 0; i < serverTimelineStats.length; i++) { @@ -18324,13 +18327,15 @@ data.datasets[2].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); data.datasets[3].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); data.datasets[4].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); + data.datasets[5].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); } if (serverTimelineStats[i].conn) { data.datasets[0].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.ca }); data.datasets[1].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.cu }); data.datasets[2].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.us }); data.datasets[3].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.rs }); - if (serverTimelineStats[i].conn.am != null) { data.datasets[4].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.am }); } + data.datasets[4].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.am }); + if (serverTimelineStats[i].conn.amc != null) { data.datasets[5].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.amc }); } } } } else if (chartType == 1) { // Memory diff --git a/views/default3.handlebars b/views/default3.handlebars index 5d61127e..7240d387 100644 --- a/views/default3.handlebars +++ b/views/default3.handlebars @@ -19450,6 +19450,7 @@ InvalidDeviceGroupType: "Invalid Device Group Type", DuplicateAgent: "Duplicate Agent", ConnectedIntelAMT: "Connected Intel® AMT", + ConnectedIntelAMTCira: "Connected Intel® AMT CIRA", RelayErrors: "Relay Errors", UserAccounts: "User Accounts", DeviceGroups: "Device Groups", @@ -19538,7 +19539,8 @@ serverTimelineConfig.data.datasets[1].data.push({ x: stats.time, y: stats.conn.cu }); serverTimelineConfig.data.datasets[2].data.push({ x: stats.time, y: stats.conn.us }); serverTimelineConfig.data.datasets[3].data.push({ x: stats.time, y: stats.conn.rs }); - if (stats.conn.am != null) { serverTimelineConfig.data.datasets[4].data.push({ x: stats.time, y: stats.conn.am }); } + serverTimelineConfig.data.datasets[4].data.push({ x: stats.time, y: stats.conn.am }); + if (stats.conn.amc != null) { serverTimelineConfig.data.datasets[5].data.push({ x: stats.time, y: stats.conn.amc }); } } else if (chartType == 1) { // Memory serverTimelineConfig.data.datasets[0].data.push({ x: stats.time, y: stats.mem.external / (1024 * 1024) }); serverTimelineConfig.data.datasets[1].data.push({ x: stats.time, y: stats.mem.heapUsed / (1024 * 1024) }); @@ -19585,7 +19587,8 @@ { label: "Users", data: [], backgroundColor: 'rgba(16, 84, 158, .1)', borderColor: 'rgb(16, 84, 158)', fill: true }, { label: "User Sessions", data: [], backgroundColor: 'rgba(255, 99, 132, .1)', borderColor: 'rgb(255, 99, 132)', fill: true }, { label: "Relay Sessions", data: [], backgroundColor: 'rgba(39, 158, 16, .1)', borderColor: 'rgb(39, 158, 16)', fill: true }, - { label: "Intel AMT", data: [], backgroundColor: 'rgba(134, 16, 158, .1)', borderColor: 'rgb(134, 16, 158)', fill: true } + { label: "Intel AMT", data: [], backgroundColor: 'rgba(134, 16, 158, .1)', borderColor: 'rgb(134, 16, 158)', fill: true }, + { label: "Intel AMT CIRA", data: [], backgroundColor: 'rgba(255, 155, 0, .1)', borderColor: 'rgb(255, 155, 0)', fill: true } ] }; for (var i = 0; i < serverTimelineStats.length; i++) { @@ -19602,13 +19605,15 @@ data.datasets[2].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); data.datasets[3].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); data.datasets[4].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); + data.datasets[5].data.push({ x: serverTimelineStats[i].time - 1, y: NaN }); } if (serverTimelineStats[i].conn) { data.datasets[0].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.ca }); data.datasets[1].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.cu }); data.datasets[2].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.us }); data.datasets[3].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.rs }); - if (serverTimelineStats[i].conn.am != null) { data.datasets[4].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.am }); } + data.datasets[4].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.am }); + if (serverTimelineStats[i].conn.amc != null) { data.datasets[5].data.push({ x: serverTimelineStats[i].time, y: serverTimelineStats[i].conn.amc }); } } } } else if (chartType == 1) { // Memory