Feature: Allow xySat monitoring to be disabled for some or all servers.

Author: jhuckaby

htdocs/js/pages/ServerUtils.class.js

@@ -776,6 +776,7 @@ Page.ServerUtils = class ServerUtils extends Page.PageUtils {
 	getProcessTable(snapshot) {
 		// get initial html for sortable proc table
 		var self = this;
+		if (this.dummy) return '';
 
 		var proc_opts = {
 			id: 't_snap_procs',
@@ -804,6 +805,7 @@ Page.ServerUtils = class ServerUtils extends Page.PageUtils {
 	getConnectionTable(snapshot) {
 		// get initial html for sortable conn table
 		var self = this;
+		if (this.dummy) return '';
 
 		var conn_opts = {
 			id: 't_snap_conns',
@@ -833,6 +835,7 @@ Page.ServerUtils = class ServerUtils extends Page.PageUtils {
 	getInterfaceTable(snapshot) {
 		// get initial html for sortable iface table
 		var self = this;
+		if (this.dummy) return '';
 
 		var iface_opts = {
 			id: 't_snap_ifaces',
@@ -866,6 +869,7 @@ Page.ServerUtils = class ServerUtils extends Page.PageUtils {
 	getMountTable(snapshot) {
 		// get initial html for sortable mount table
 		var self = this;
+		if (this.dummy) return '';
 
 		var fs_opts = {
 			id: 't_snap_fs',
@@ -1845,6 +1849,7 @@ Page.ServerUtils = class ServerUtils extends Page.PageUtils {
 
 			var snapshot = server.snapshot || {};
 			if (!snapshot.data || !snapshot.data.docker) return;
+			if (snapshot.data.dummy) return;
 
 			snapshot.data.docker.containers.forEach( function(cont) {
 				cont_list.push({ ...cont,

htdocs/js/pages/Servers.class.js

@@ -840,6 +840,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
 		this.server = server;
 		var snapshot = this.snapshot = data;
 		this.online = online;
+		this.dummy = snapshot.data && snapshot.data.dummy;
 		this.charts = {};
 
 		this.updateHeaderNav();
@@ -1119,6 +1120,10 @@ Page.Servers = class Servers extends Page.ServerUtils {
 
 		SingleSelect.init( this.div.find('select.sel_chart_size') );
 
+		if (this.dummy) {
+			this.div.find('#d_vs_quickmon, #d_vs_mem, #d_vs_cpus, #d_vs_dash_grid, #d_vs_monitors, #d_vs_conts, #d_vs_procs, #d_vs_conns, #d_vs_ifaces, #d_vs_fs').hide();
+		}
+		
 		this.updateServerStats();
 		this.renderMonitorGrid();
 		this.renderMemDetails();
@@ -1146,6 +1151,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
 
 	renderContainers() {
 		// show containers if server is a docker host
+		if (this.dummy) return;
 		if (!this.snapshot || !this.snapshot.data || !this.snapshot.data.docker) {
 			this.div.find('#d_vs_conts').hide();
 			return;
@@ -1544,16 +1550,19 @@ Page.Servers = class Servers extends Page.ServerUtils {
 
 	renderMonitorGrid() {
 		// show grid of monitors
+		if (this.dummy) return;
 		this.div.find('#d_vs_dash_grid').html( this.getMonitorGrid(this.snapshot) );
 	}
 
 	renderMemDetails() {
 		// show memory details
+		if (this.dummy) return;
 		this.div.find('#d_vs_mem > .box_content').html( this.getMemDetails(this.snapshot) );
 	}
 
 	renderCPUDetails() {
 		// show cpu details
+		if (this.dummy) return;
 		this.div.find('#d_vs_cpus > .box_content').html( this.getCPUDetails(this.snapshot) );
 	}
 
@@ -1565,6 +1574,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
 
 		// check for quickmon support on server
 		if (!server.info.quickmon) return;
+		if (this.dummy) return;
 
 		html += '<div class="chart_grid_horiz ' + (app.getPref('chart_size_quick') || 'medium') + '">';
 
@@ -1784,6 +1794,8 @@ Page.Servers = class Servers extends Page.ServerUtils {
 		var monitors = this.monitors = [];
 		var min_epoch = app.epoch - 3600;
 		var html = '';
+		if (this.dummy) return;
+		
 		html += '<div class="chart_grid_horiz ' + (app.getPref('chart_size') || 'medium') + '">';
 
 		app.monitors.forEach( function(mon_def) {

lib/monitor.js

@@ -175,6 +175,15 @@ class Monitoring {
 		params.data.monitors = {};
 		params.data.deltas = {};
 
+		// special quick exit for dummy record (i.e. monitoring disabled on server)
+		if (params.data.dummy) {
+			this.logMonitor(9, "Saving dummy record for disabled monitoring: " + server.id);
+			this.storage.put( 'hosts/' + server.id + '/data', params, function(err) {
+				if (err) self.logError('monitor', "Failed to submit data: " + (err.message || err), {});
+			} );
+			return;
+		}
+		
 		monitor_defs.forEach( function(mon_def) {
 			if (mon_def.groups && mon_def.groups.length && !Tools.includesAny(mon_def.groups, params.groups)) return;
 
@@ -573,7 +582,7 @@ class Monitoring {
 				self.storage.unlock( host_key );
 				if (err) {
 					// silence double-submit errors, as they are benign
-					if (err.code != 'DOUBLE') self.logError('submit', "Failed to submit data: " + (err.message || err), {});
+					if (err.code != 'DOUBLE') self.logError('monitor', "Failed to submit monitoring data: " + (err.message || err), {});
 				}
 				else {
 					self.logMonitor(6, "Data submission complete for: " + params.hostname, { id: server.id });
@@ -742,6 +751,10 @@ class Monitoring {
 		this.storage.get( host_key, function(err, data) {
 			if (err) return callback(err);
 
+			if (data.data && data.data.dummy) {
+				return callback( new Error("Monitoring is disabled on server: " + server_id) );
+			}
+			
 			// merge in params
 			Tools.mergeHashInto(data, params);