From 61d0027904ee9c040985b1642ca228737d616d03 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2019 20:55:22 +0200 Subject: Adding upstream version 1.15.0. Signed-off-by: Daniel Baumann --- web/gui/main.js | 255 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 155 insertions(+), 100 deletions(-) (limited to 'web/gui/main.js') diff --git a/web/gui/main.js b/web/gui/main.js index 8a61673ea..277ae840a 100644 --- a/web/gui/main.js +++ b/web/gui/main.js @@ -258,7 +258,7 @@ var urlOptions = { $('.highlight-tooltip').tooltip({ html: true, - delay: {show: 500, hide: 0}, + delay: { show: 500, hide: 0 }, container: 'body' }); } else { @@ -588,20 +588,20 @@ function renderMachines(machinesArray) { const alternateUrlItems = ( ``); } +function openAuthenticatedUrl(url) { + if (isSignedIn()) { + window.open(url); + } else { + window.open(`${NETDATA.registry.cloudBaseURL}/account/sign-in-agent?id=${NETDATA.registry.machine_guid}&name=${encodeURIComponent(NETDATA.registry.hostname)}&origin=${encodeURIComponent(window.location.origin + "/")}`); + } +} + function renderMyNetdataMenu(machinesArray) { const el = document.getElementById('my-netdata-dropdown-content'); el.classList.add(`theme-${netdataTheme}`); @@ -766,6 +774,11 @@ function renderMyNetdataMenu(machinesArray) { if (!isSignedIn()) { html += ( `
+ + Nodes beta +
+
+
Switch Identity
@@ -779,6 +792,11 @@ function renderMyNetdataMenu(machinesArray) { } else { html += ( `
+ + Nodes beta +
+
+
Synchronize with netdata.cloud
@@ -991,7 +1009,7 @@ function notifyForSwitchRegistry() { } } -var deleteRegistryGuid = null; +var deleteRegistryGuid = null; var deleteRegistryUrl = null; function deleteRegistryModalHandler(guid, name, url) { @@ -1004,7 +1022,7 @@ function deleteRegistryModalHandler(guid, name, url) { document.getElementById('deleteRegistryServerName2').innerHTML = name; document.getElementById('deleteRegistryServerURL').innerHTML = url; document.getElementById('deleteRegistryResponse').innerHTML = ''; - + $('#deleteRegistryModal').modal('show'); } @@ -1027,7 +1045,7 @@ function notifyForDeleteRegistry() { deleteRegistryUrl = null; $('#deleteRegistryModal').modal('hide'); NETDATA.registry.init(); - }); + }); }); } else { NETDATA.registry.delete(deleteRegistryUrl, function (result) { @@ -1038,7 +1056,7 @@ function notifyForDeleteRegistry() { } else { responseEl.innerHTML = "Sorry, this command was rejected by the registry server!"; } - }); + }); } } } @@ -1119,7 +1137,7 @@ function scrollToId(hash) { var offset = $('#' + hash).offset(); if (typeof offset !== 'undefined') { //console.log('scrolling to ' + hash + ' at ' + offset.top.toString()); - $('html, body').animate({scrollTop: offset.top - 30}, 0); + $('html, body').animate({ scrollTop: offset.top - 30 }, 0); } } @@ -1171,7 +1189,7 @@ var netdataDashboard = { } if (typeof this.sparklines_registry[key] === 'undefined') { - this.sparklines_registry[key] = {count: 1}; + this.sparklines_registry[key] = { count: 1 }; } else { this.sparklines_registry[key].count++; } @@ -1772,7 +1790,7 @@ function renderPage(menus, data) { sidebar += '
  • add more charts
    • '; sidebar += '
  • add more alarms
    • '; - sidebar += '
  • netdata on ' + data.hostname.toString() + ', collects every ' + ((data.update_every === 1) ? 'second' : data.update_every.toString() + ' seconds') + ' ' + data.dimensions_count.toLocaleString() + ' metrics, presented as ' + data.charts_count.toLocaleString() + ' charts and monitored by ' + data.alarms_count.toLocaleString() + ' alarms, using ' + Math.round(data.rrd_memory_bytes / 1024 / 1024).toLocaleString() + ' MB of memory for ' + NETDATA.seconds4human(data.update_every * data.history, {space: ' '}) + ' of real-time history.
     
    netdata
    ' + data.version.toString() + '
    • '; + sidebar += '
  • netdata on ' + data.hostname.toString() + ', collects every ' + ((data.update_every === 1) ? 'second' : data.update_every.toString() + ' seconds') + ' ' + data.dimensions_count.toLocaleString() + ' metrics, presented as ' + data.charts_count.toLocaleString() + ' charts and monitored by ' + data.alarms_count.toLocaleString() + ' alarms, using ' + Math.round(data.rrd_memory_bytes / 1024 / 1024).toLocaleString() + ' MB of memory for ' + NETDATA.seconds4human(data.update_every * data.history, { space: ' ' }) + ' of real-time history.
     
    netdata
    ' + data.version.toString() + '
    • '; sidebar += ''; div.innerHTML = html; document.getElementById('sidebar').innerHTML = sidebar; @@ -1886,7 +1904,7 @@ function loadJs(url, callback) { url: url, cache: true, dataType: "script", - xhrFields: {withCredentials: true} // required for the cookie + xhrFields: { withCredentials: true } // required for the cookie }) .fail(function () { alert('Cannot load required JS library: ' + url); @@ -1988,8 +2006,8 @@ function alarmsUpdateModal() { if (data === null) { document.getElementById('alarms_active').innerHTML = document.getElementById('alarms_all').innerHTML = - document.getElementById('alarms_log').innerHTML = - 'failed to load alarm data!'; + document.getElementById('alarms_log').innerHTML = + 'failed to load alarm data!'; return; } @@ -2039,7 +2057,7 @@ function alarmsUpdateModal() { return '' + alarm.lookup_method + ' ' + dimensions + ', of chart ' + alarm.chart + '' - + ', starting ' + NETDATA.seconds4human(alarm.lookup_after + alarm.lookup_before, {space: ' '}) + ' and up to ' + NETDATA.seconds4human(alarm.lookup_before, {space: ' '}) + '' + + ', starting ' + NETDATA.seconds4human(alarm.lookup_after + alarm.lookup_before, { space: ' ' }) + ' and up to ' + NETDATA.seconds4human(alarm.lookup_before, { space: ' ' }) + '' + ((alarm.lookup_options) ? (', with options ' + alarm.lookup_options.replace(/ /g, ', ') + '') : '') + '.'; } @@ -2115,9 +2133,9 @@ function alarmsUpdateModal() { } html += 'check every' + NETDATA.seconds4human(alarm.update_every, { - space: ' ', - negative_suffix: '' - }) + '' + space: ' ', + negative_suffix: '' + }) + '' + ((has_alarm === true) ? ('execute' + alarm.exec + '' + delay + '') : '') + 'source' + alarm.source + '' + ''; @@ -2162,7 +2180,7 @@ function alarmsUpdateModal() { // not found - this should never happen! if (typeof chart === 'undefined') { console.log('WARNING: alarm ' + x + ' is linked to chart ' + alarm.chart + ', which is not found in the list of chart got from the server.'); - chart = {priority: 9999999}; + chart = { priority: 9999999 }; } else if (typeof chart.menu !== 'undefined' && typeof chart.submenu !== 'undefined') // the family based on the chart @@ -2299,16 +2317,16 @@ function alarmsUpdateModal() { switch (row.status) { case 'CRITICAL': - return {classes: 'danger'}; + return { classes: 'danger' }; break; case 'WARNING': - return {classes: 'warning'}; + return { classes: 'warning' }; break; case 'UNDEFINED': - return {classes: 'info'}; + return { classes: 'info' }; break; case 'CLEAR': - return {classes: 'success'}; + return { classes: 'success' }; break; } return {}; @@ -2496,7 +2514,7 @@ function alarmsUpdateModal() { formatter: function (value, row, index) { void (row); void (index); - return NETDATA.seconds4human(value, {negative_suffix: '', space: ' ', now: 'no time'}); + return NETDATA.seconds4human(value, { negative_suffix: '', space: ' ', now: 'no time' }); }, align: 'center', valign: 'middle', @@ -2510,7 +2528,7 @@ function alarmsUpdateModal() { formatter: function (value, row, index) { void (row); void (index); - return NETDATA.seconds4human(value, {negative_suffix: '', space: ' ', now: 'no time'}); + return NETDATA.seconds4human(value, { negative_suffix: '', space: ' ', now: 'no time' }); }, align: 'center', valign: 'middle', @@ -2642,7 +2660,7 @@ function alarmsUpdateModal() { void (row); void (index); - return NETDATA.seconds4human(value, {negative_suffix: '', space: ' ', now: 'no time'}); + return NETDATA.seconds4human(value, { negative_suffix: '', space: ' ', now: 'no time' }); }, align: 'center', valign: 'middle', @@ -2846,32 +2864,32 @@ function versionsMatch(v1, v2) { if (v1 == v2) { return true; } else { - let s1=v1.split('.'); - let s2=v2.split('.'); + let s1 = v1.split('.'); + let s2 = v2.split('.'); // Check major version - let n1 = parseInt(s1[0].substring(1,2),10); - let n2 = parseInt(s2[0].substring(1,2), 10); - if ( n1 < n2 ) return false; - else if ( n1 > n2 ) return true; + let n1 = parseInt(s1[0].substring(1, 2), 10); + let n2 = parseInt(s2[0].substring(1, 2), 10); + if (n1 < n2) return false; + else if (n1 > n2) return true; // Check minor version - n1 = parseInt(s1[1],10); - n2 = parseInt(s2[1],10); - if ( n1 < n2 ) return false; - else if ( n1 > n2 ) return true; + n1 = parseInt(s1[1], 10); + n2 = parseInt(s2[1], 10); + if (n1 < n2) return false; + else if (n1 > n2) return true; // Split patch: format could be e.g. 0-22-nightly - s1=s1[2].split('-'); - s2=s2[2].split('-'); + s1 = s1[2].split('-'); + s2 = s2[2].split('-'); - n1 = parseInt(s1[0],10); - n2 = parseInt(s2[0],10); - if ( n1 < n2 ) return false; - else if ( n1 > n2 ) return true; + n1 = parseInt(s1[0], 10); + n2 = parseInt(s2[0], 10); + if (n1 < n2) return false; + else if (n1 > n2) return true; - n1 = (s1.length > 1) ? parseInt(s1[1],10) : 0; - n2 = (s2.length > 1) ? parseInt(s2[1],10) : 0; - if ( n1 < n2 ) return false; + n1 = (s1.length > 1) ? parseInt(s1[1], 10) : 0; + n2 = (s2.length > 1) ? parseInt(s2[1], 10) : 0; + if (n1 < n2) return false; else return true; } } @@ -3119,7 +3137,7 @@ var snapshotOptions = { bytes_per_point_disk: 1.9, compress: function (s) { - return btoa(pako.deflate(s, {to: 'string'})); + return btoa(pako.deflate(s, { to: 'string' })); }, compressed_length: function (s) { @@ -3127,7 +3145,7 @@ var snapshotOptions = { }, uncompress: function (s) { - return pako.inflate(atob(s), {to: 'string'}); + return pako.inflate(atob(s), { to: 'string' }); } }, @@ -3136,7 +3154,7 @@ var snapshotOptions = { bytes_per_point_disk: 3.2, compress: function (s) { - return pako.deflate(s, {to: 'string'}); + return pako.deflate(s, { to: 'string' }); }, compressed_length: function (s) { @@ -3144,7 +3162,7 @@ var snapshotOptions = { }, uncompress: function (s) { - return pako.inflate(s, {to: 'string'}); + return pako.inflate(s, { to: 'string' }); } }, @@ -3937,7 +3955,7 @@ function enableTooltipsAndPopovers() { animated: 'fade', trigger: 'hover', html: true, - delay: {show: 500, hide: 0}, + delay: { show: 500, hide: 0 }, container: 'body' }); $('[data-toggle="popover"]').popover(); @@ -4015,7 +4033,7 @@ function runOnceOnDashboardWithjQuery() { // scroll to the position we had open before the modal $('html, body') - .animate({scrollTop: scrollPos}, 0); + .animate({ scrollTop: scrollPos }, 0); // unpause netdata, if we paused it if (netdata_paused_on_modal === true) { @@ -4181,8 +4199,8 @@ function runOnceOnDashboardWithjQuery() { .on('hidden.bs.modal', function () { document.getElementById('alarms_active').innerHTML = document.getElementById('alarms_all').innerHTML = - document.getElementById('alarms_log').innerHTML = - 'loading...'; + document.getElementById('alarms_log').innerHTML = + 'loading...'; }); // ------------------------------------------------------------------------ @@ -4232,7 +4250,7 @@ function runOnceOnDashboardWithjQuery() { if ($this.hasClass('less')) { $this.removeClass('less'); $this.html(config.moreText); - $this.parent().prev().animate({'height': '0' + '%'}, 0, function () { + $this.parent().prev().animate({ 'height': '0' + '%' }, 0, function () { $this.parent().prev().prev().show(); }).hide(0, function () { config.onLess(); @@ -4240,7 +4258,7 @@ function runOnceOnDashboardWithjQuery() { } else { $this.addClass('less'); $this.html(config.lessText); - $this.parent().prev().animate({'height': '100' + '%'}, 0, function () { + $this.parent().prev().animate({ 'height': '100' + '%' }, 0, function () { $this.parent().prev().prev().hide(); }).show(0, function () { config.onMore(); @@ -4563,7 +4581,7 @@ function getCloudAccountAgents() { if (!isSignedIn()) { return []; } - + return fetch( `${NETDATA.registry.cloudBaseURL}/api/v1/accounts/${cloudAccountID}/agents`, { @@ -4573,7 +4591,7 @@ function getCloudAccountAgents() { "Authorization": `Bearer ${cloudToken}` } } - ).then((response) => { + ).then((response) => { if (!response.ok) { throw Error("Cannot fetch known accounts"); } @@ -4599,6 +4617,36 @@ function getCloudAccountAgents() { }); } +/** Updates the lastAccessTime and accessCount properties of the agent for the account. */ +function touchAgent() { + if (!isSignedIn()) { + return []; + } + + const touchUrl = `${NETDATA.registry.cloudBaseURL}/api/v1/agents/${NETDATA.registry.machine_guid}/touch?account_id=${cloudAccountID}`; + return fetch( + touchUrl, + { + method: "post", + body: "", + mode: "cors", + headers: { + "Authorization": `Bearer ${cloudToken}` + } + } + ).then((response) => { + if (!response.ok) { + throw Error("Cannot touch agent" + JSON.stringify(response)); + } + return response.json(); + }).then((payload) => { + + }).catch(function (error) { + console.log(error); + return null; + }); +} + // https://github.com/netdata/hub/issues/128 function postCloudAccountAgents(agentsToSync) { if (!isSignedIn()) { @@ -4622,7 +4670,7 @@ function postCloudAccountAgents(agentsToSync) { "agents": agents, "merge": false, }; - + return fetch( `${NETDATA.registry.cloudBaseURL}/api/v1/accounts/${cloudAccountID}/agents`, { @@ -4650,7 +4698,7 @@ function postCloudAccountAgents(agentsToSync) { "url": a.urls[0], "alternate_urls": a.urls } - }) + }) }); } @@ -4727,7 +4775,7 @@ function updateMyNetdataAfterFilterChange() { if (options.hosts.length > 1) { const streamedEl = document.getElementById("my-netdata-menu-streamed") - streamedEl.innerHTML = renderStreamedHosts(options); + streamedEl.innerHTML = renderStreamedHosts(options); } } @@ -4742,7 +4790,7 @@ function myNetdataFilterDidChange(e) { const inputEl = e.target; setTimeout(() => { myNetdataMenuFilterValue = inputEl.value; - updateMyNetdataAfterFilterChange(); + updateMyNetdataAfterFilterChange(); }, 1); } @@ -4753,9 +4801,9 @@ function myNetdataFilterClearDidClick(e) { const inputEl = document.getElementById("my-netdata-menu-filter-input"); inputEl.value = ""; myNetdataMenuFilterValue = ""; - - updateMyNetdataAfterFilterChange(); - + + updateMyNetdataAfterFilterChange(); + inputEl.focus(); } @@ -4792,12 +4840,18 @@ function renderAccountUI() { container.removeAttribute("title"); container.removeAttribute("data-original-title"); container.removeAttribute("data-placement"); + // container.innerHTML = ( ` -