do not ever attempt to access the real server, when a snapshot is loaded
Costa Tsaousis (ktsaou) committed
Nov 15, 2017 at 20:16 UTC
5f43bb629fa9fa06c175369e013292fdddb65957
2 files changed
+16
-9
web/dashboard.js
+7
@@ -4510,6 +4510,13 @@ var NETDATA = window.NETDATA || {};
4510
if(typeof callback === 'function')
4511
return callback();
4512
}
4513
+ else if(netdataSnapshotData !== null ) {
4514
+ NETDATA.error(404, that.chart_url);
4515
+ error('chart not found in snapshot');
4516
+
4517
+ if(typeof callback === 'function')
4518
+ return callback();
4519
+ }
4520
else {
4521
this.chart_url = "/api/v1/chart?chart=" + this.id;
4522
web/index.html
+9
-9
@@ -3077,11 +3077,11 @@
3077
if(typeof result.data_size === 'undefined')
3078
result.data_size = 0;
3079
3080
- document.getElementById('loadSnapshotFilename').innerHTML = '<b>' + files.item(0).name + '</b>';
3080
+ document.getElementById('loadSnapshotFilename').innerHTML = '<code>' + files.item(0).name + '</code>';
3081
document.getElementById('loadSnapshotHostname').innerHTML = '<b>' + result.hostname + '</b>, netdata version: <b>' + result.netdata_version.toString() + '</b>';
3082
document.getElementById('loadSnapshotURL').innerHTML = result.url;
3083
document.getElementById('loadSnapshotCharts').innerHTML = result.charts.charts_count.toString() + ' charts, ' + result.charts.dimensions_count.toString() + ' dimensions, ' + result.data_points.toString() + ' points per dimension, ' + Math.round(result.duration_ms / result.data_points).toString() + ' ms per point';
3084
- document.getElementById('loadSnapshotInfo').innerHTML = 'version: <b>' + result.snapshot_version.toString() + '</b>, includes <b>' + result.charts_ok.toString() + '</b> unique chart data queries ' + ((result.charts_failed > 0)?('<b>' + result.charts_failed.toString() + '</b> failed'):'').toString() + ', compressed with <b>' + result.compression.toString() + '</b>, data size ' + (Math.round(result.data_size * 100 / 1024 / 1024) / 100).toString() + ' MB';
3084
+ document.getElementById('loadSnapshotInfo').innerHTML = 'version: <b>' + result.snapshot_version.toString() + '</b>, includes <b>' + result.charts_ok.toString() + '</b> unique chart data queries ' + ((result.charts_failed > 0)?('<b>' + result.charts_failed.toString() + '</b> failed'):'').toString() + ', compressed with <code>' + result.compression.toString() + '</code>, data size ' + (Math.round(result.data_size * 100 / 1024 / 1024) / 100).toString() + ' MB';
3085
document.getElementById('loadSnapshotTimeRange').innerHTML = '<b>' + NETDATA.dateTime.localeDateString(date_after) + ' ' + NETDATA.dateTime.localeTimeString(date_after) + '</b> to <b>' + NETDATA.dateTime.localeDateString(date_before) + ' ' + NETDATA.dateTime.localeTimeString(date_before) + '</b>';
3086
document.getElementById('loadSnapshotComments').innerHTML = ((result.comments)?result.comments:'').toString();
3087
loadSnapshotModalLog('success', 'File loaded, click <b>Import</b> to render it!');
@@ -3142,7 +3142,7 @@
3142
msg = 'Hm... good luck...';
3143
}
3144
3145
- saveSnapshotModalLog(priority, 'The snapshot will have ' + points.toString() + ' points per dimension. Expected size on disk ' + sizemb + ' MB, on browser memory ' + memmb + ' MB.<br/>' + msg);
3145
+ saveSnapshotModalLog(priority, 'The snapshot will have ' + points.toString() + ' points per dimension. Expected size on disk ' + sizemb + ' MB, at browser memory ' + memmb + ' MB.<br/>' + msg);
3146
}
3147
3148
var saveSnapshotCompression = snapshotOptions.compressionDefault;
@@ -4161,13 +4161,13 @@
4161
</div>
4162
<div class="modal-body">
4163
<p>
4164
- netdata can save and load snapshots of netdata dashboards.<br/>
4165
- Any netdata dashboard can import a saved snapshot of the dashboard of any other netdata.<br/>
4166
- The snapshot data are not uploaded to a server. The snapshot is only loaded to your web browser.
4164
+ netdata can export and import dashboard snapshots.
4165
+ Any netdata can import the snapshot of any other netdata.
4166
+ The snapshots are not uploaded to a server. They are handled entirely by your web browser, on your computer.
4167
</p>
4168
- <p>
4168
+ <p style="text-align: center;">
4169
<label class="btn btn-default">
4170
- Click here to select a netdata snapshot file
4170
+ Click here to select the netdata snapshot file to import
4171
<input type="file" id="loadSnapshotSelectFiles" value="Import" style="display: none;"
4172
onchange="loadSnapshotPreflight();">
4173
</label>
@@ -5146,6 +5146,6 @@
5146
</div>
5147
</div>
5148
<div id="hiddenDownloadLinks" style="display: none;" hidden></div>
5149
- <script type="text/javascript" src="dashboard.js?v20171114-1"></script>
5149
+ <script type="text/javascript" src="dashboard.js?v20171115-1"></script>
5150
</body>
5151
</html>