From 828667d84d75effc4cc523513aa00ba1305e0a0b Mon Sep 17 00:00:00 2001
From: Stephanie Buser <quic_sbuser@quicinc.com>
Date: Wed, 11 Jan 2023 08:01:41 -0800
Subject: [PATCH] Fix for #4, #5, #6, #9 (#8), #10

* Update grid_benchmark_jobs.php
  Resolved #4, #5.
* Update grid_functions.php
  Resolved #6.
* Update grid_benchmark_jobs.php
* Update grid_manage_hosts.php
  Issue #9
* Update ss_grid_jobs.php, ss_grid_slot_ut.php, ss_grid_effectiveut.php, ss_grid_lssched_bcs.php
* Update
  patch that disables the query cache for the Cacti Data Collectors - #10

Signed-off-by: Stephanie Buser <quic_sbuser@quicinc.com>
---
 .../plugins/benchmark/grid_benchmark_jobs.php | 130 ++++----
 cacti/plugins/grid/grid_manage_hosts.php      | 287 ++++++++++--------
 cacti/plugins/grid/lib/grid_functions.php     |   7 +-
 cacti/scripts/ss_grid_effectiveut.php         |   4 +-
 cacti/scripts/ss_grid_jobs.php                |  12 +-
 cacti/scripts/ss_grid_lssched_bcs.php         |  28 +-
 cacti/scripts/ss_grid_slot_ut.php             |   6 +-
 7 files changed, 270 insertions(+), 204 deletions(-)

diff --git a/cacti/plugins/benchmark/grid_benchmark_jobs.php b/cacti/plugins/benchmark/grid_benchmark_jobs.php
index 997a392e..aa9ff343 100644
--- a/cacti/plugins/benchmark/grid_benchmark_jobs.php
+++ b/cacti/plugins/benchmark/grid_benchmark_jobs.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: 0268a3951207c879d92f6ca3569fd7ec3e1e6a9c $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -87,13 +87,13 @@
 	general_header();
 	ajax_benchmark_jobs();
 	bottom_footer();
-}else{
+} else {
 	general_header();
 	view_benchmark_jobs();
 	bottom_footer();
 }
 
-function grid_view_get_records(&$sql_where, $apply_limits = TRUE, $rows, &$sql_params) {
+function grid_view_get_records(&$sql_where, $apply_limits = true, $rows, &$sql_params) {
 	benchmark_status_where($sql_where);
 
 	/* cluster id sql where */
@@ -130,7 +130,7 @@ function grid_view_get_records(&$sql_where, $apply_limits = TRUE, $rows, &$sql_p
 		$sql_where
 		$sql_order";
 
-	//echo $sql_query;
+	//print $sql_query;
 
 	if ($apply_limits) {
 		$sql_query .= ' LIMIT ' . ($rows*(get_request_var('page')-1)) . ',' . $rows;
@@ -220,7 +220,7 @@ function applyFilter() {
 
 					if ($('#date1').val() == date1 && $('#date2').val() == date2 && $('#predefined_timespan').val() != 0) {
 						strURL = strURL + '&predefined_timespan=' + $('#predefined_timespan').val();
-					}else{
+					} else {
 						strURL = strURL + '&date1=' + $('#date1').val();
 						strURL = strURL + '&date2=' + $('#date2').val();
 					}
@@ -313,11 +313,12 @@ function closeHandler(cal) {
 				function stopRKey(evt) {
 					var evt  = (evt) ? evt : ((event) ? event : null);
 					var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
-					if ((evt.keyCode == 13) && (node.type=='text')) { return false; }
+					if (evt.keyCode == 8 && node.type=='text' && node.value == '') {
+						return false;
+					}
 				}
 				document.onkeypress = stopRKey;
 
-
 				$('#views').multiselect({header: "Choose a View", minWidth: 140 });
 
 				$('#clusterid, #benchmark_id, #rows, #refresh, #status').change(function() {
@@ -463,10 +464,10 @@ function stopRKey(evt) {
 						</select>
 					</td>
 					<td>
-						<input id='go' type='submit' value='<?php print __('Go');?>' title='<?php print __('Apply Custom Date Ranges or Search');?>'>
-					</td>
-					<td>
-						<input id='clear' type='button' value='<?php print __('Clear');?>' title='<?php print __('Clear All Filters');?>'>
+						<span>
+							<input id='go' type='submit' value='<?php print __('Go');?>' title='<?php print __('Apply Custom Date Ranges or Search');?>'>
+							<input id='clear' type='button' value='<?php print __('Clear');?>' title='<?php print __('Clear All Filters');?>'>
+						</span>
 					</td>
 				</tr>
 			</table>
@@ -479,7 +480,7 @@ function stopRKey(evt) {
 						<select id='predefined_timespan'>
 							<?php
 							if (isset($_SESSION['custom']) && $_SESSION['custom']) {
-								$grid_timespans[GT_CUSTOM] = __('Custom', 'syslog');
+								$grid_timespans[GT_CUSTOM] = __('Custom', 'benchmark');
 								set_request_var('predefined_timespan', GT_CUSTOM);
 								$start_val = 0;
 								$end_val = cacti_sizeof($grid_timespans);
@@ -501,28 +502,28 @@ function stopRKey(evt) {
 						</select>
 					</td>
 					<td>
-						<?php print __('From', 'syslog');?>
+						<?php print __('From', 'benchmark');?>
 					</td>
 					<td>
 						<input type='text' id='date1' size='20' value='<?php print (isset($_SESSION['sess_gbmj_current_date1']) ? $_SESSION['sess_gbmj_current_date1'] : '');?>'>
 					</td>
 					<td>
-						<i title='<?php print __esc('Start Date Selector', 'syslog');?>' class='calendar fa fa-calendar' id='startDate'></i>
+						<i title='<?php print __esc('Start Date Selector', 'benchmark');?>' class='calendar fa fa-calendar' id='startDate'></i>
 					</td>
 					<td>
-						<?php print __('To', 'syslog');?>
+						<?php print __('To', 'benchmark');?>
 					</td>
 					<td>
 						<input type='text' id='date2' size='20' value='<?php print (isset($_SESSION['sess_gbmj_current_date2']) ? $_SESSION['sess_gbmj_current_date2'] : '');?>'>
 					</td>
 					<td>
-						<i title='<?php print __esc('End Date Selector', 'syslog');?>' class='calendar fa fa-calendar' id='endDate'></i>
+						<i title='<?php print __esc('End Date Selector', 'benchmark');?>' class='calendar fa fa-calendar' id='endDate'></i>
 					</td>
 					<td>
-						<i title='<?php print __esc('Shift Time Backward', 'syslog');?>' id='move_left' class='shiftArrow fa fa-backward'></i>
+						<i title='<?php print __esc('Shift Time Backward', 'benchmark');?>' id='move_left' class='shiftArrow fa fa-backward'></i>
 					</td>
 					<td>
-						<select id='predefined_timeshift' title='<?php print __esc('Define Shifting Interval', 'syslog');?>'>
+						<select id='predefined_timeshift' title='<?php print __esc('Define Shifting Interval', 'benchmark');?>'>
 							<?php
 							$start_val = 1;
 							$end_val = cacti_sizeof($grid_timeshifts)+1;
@@ -535,7 +536,7 @@ function stopRKey(evt) {
 						</select>
 					</td>
 					<td>
-						<i title='<?php print __esc('Shift Time Forward', 'syslog');?>' id='move_right' class='shiftArrow fa fa-forward'></i>
+						<i title='<?php print __esc('Shift Time Forward', 'benchmark');?>' id='move_right' class='shiftArrow fa fa-forward'></i>
 					</td>
 				</tr>
 			</table>
@@ -560,7 +561,7 @@ function view_benchmark_jobs() {
 	global $title, $report, $grid_search_types, $grid_rows_selector, $grid_refresh_interval, $minimum_user_refresh_intervals, $config, $benchmark_actions;
 	global $timespans, $grid_timespans, $timeshifts, $grid_timeshifts, $grid_weekdays, $timespan;
 
-	echo "<div id='stats_content'></div>\n";
+	print "<div id='stats_content'></div>\n";
 
 	?>
 	<script type='text/javascript'>
@@ -568,12 +569,13 @@ function view_benchmark_jobs() {
 		if (navigator.userAgent.match(/msie/i)) {
 			var D = (document.body.clientWidth)? document.body: document.documentElement;
 			fw  = D.clientWidth - 350;
-		}else{
+		} else {
 			fw = window.innerWidth - 350;
 		}
-		if(fw < 0){
+		if (fw < 0){
 			fw = 1;
 		}
+
 		$.get('grid_benchmark_jobs.php?ajaxstats=1&header=false&width='+fw+'&sort_column=<?php print get_request_var("sort_column");?>&sort_direction=<?php print get_request_var("sort_direction");?>&add=<?php print get_request_var("add");?>', function(data) {
 			$('#stats_content').html(data);
 			$('#status_ajax').html('');
@@ -605,7 +607,7 @@ function ajax_benchmark_jobs() {
 		$rows = get_request_var('rows');
 	}
 
-	$benchmark_jobs_results = grid_view_get_records($sql_where, TRUE, $rows, $sql_params);
+	$benchmark_jobs_results = grid_view_get_records($sql_where, true, $rows, $sql_params);
 
 	$rows_query_string = "SELECT COUNT(*)
 		FROM grid_clusters_benchmark_summary a
@@ -641,8 +643,7 @@ function ajax_benchmark_jobs() {
 				$cluster_name = '<i>' . __('Deleted') . '</i>';
 			}
 
-			//Assume job done with exitcode '0'
-			$job_exitinfo = 0;
+			$job_exitinfo = -1;
 			if ($benchmark_job['status'] == 5  ||
 				$benchmark_job['status'] == 14 ||
 				$benchmark_job['status'] == 15 ||
@@ -721,22 +722,34 @@ function ajax_benchmark_jobs() {
 			$start_time  = round($submit_time - 86400,0);
 			$end_time    = round($submit_time + 86400,0);
 
-			echo '<td>' . filter_value($benchmark_job['benchmark_name'], get_request_var('filter')) . '</td>';
-			echo '<td>'  . $benchmark_job['benchmark_id'] . '</td>';
-			echo '<td>' . $cluster_name . '</td>';
-			echo "<td class='nowrap'>"  . $benchmark_job['start_time'] . '</td>';
+			if (api_user_realm_auth('benchmark.php')) {
+				$url1 = $config['url_path'] . 'plugins/benchmark/benchmark.php?action=edit&id=' . $benhmark_job['benchmark_id'];
+				$url2 = $config['url_path'] . 'plugins/benchmark/benchmark.php?reset=true&clusterid=' . $benchmark_job['clusterid'];
+				$title1 = __esc('Edit Benchark Job', 'benchmark');
+				$title2 = __esc('View Cluster Benchark Jobs', 'benchmark');
+			} else {
+				$url1 = '';
+				$url2 = '';
+				$title1 = '';
+				$title2 = '';
+			}
+
+			print "<td class='drillDown' title='$title1'>" . filter_value($benchmark_job['benchmark_name'], get_request_var('filter'), $url1) . '</td>';
+			print '<td>'  . $benchmark_job['benchmark_id'] . '</td>';
+			print "<td class='drillDown' title='$title2'>" . filter_value($cluster_name, get_request_var('filter'), $url2) . '</td>';
+			print "<td class='nowrap'>"  . $benchmark_job['start_time'] . '</td>';
 
-			echo '<td>' . filter_value($benchmark_job['pjob_jobid'], get_request_var('filter'), ($benchmark_job['pjob_jobid'] > 0)?$config['url_path'] . 'plugins/grid/grid_bjobs.php?action=viewjob&cluster_tz&clusterid=' . $benchmark_job['clusterid'] . '&jobid=' . $benchmark_job['pjob_jobid'] . '&indexid=0&submit_time=' . $submit_time . '&start_time=' . $start_time . '&end_time=' . $end_time:'') . '</td>';
+			print '<td>' . filter_value($benchmark_job['pjob_jobid'], get_request_var('filter'), ($benchmark_job['pjob_jobid'] > 0)?$config['url_path'] . 'plugins/grid/grid_bjobs.php?action=viewjob&cluster_tz&clusterid=' . $benchmark_job['clusterid'] . '&jobid=' . $benchmark_job['pjob_jobid'] . '&indexid=0&submit_time=' . $submit_time . '&start_time=' . $start_time . '&end_time=' . $end_time:'') . '</td>';
 
-			echo "<td class='nowrap'>"  . benchmark_get_status($benchmark_job['status']) . '</td>';
-			echo '<td>'  . benchmark_get_exit_code($benchmark_job['exitStatus'], $reason) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_bsubTime']) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_seenTime']) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_startTime']) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_runTime']) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_doneTime']) . '</td>';
-			echo "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_seenDoneTime']) . '</td>';
-			echo "<td>$reason</td>";
+			print "<td class='nowrap'>"  . benchmark_get_status($benchmark_job['status']) . '</td>';
+			print '<td>'  . benchmark_get_exit_code($benchmark_job['exitStatus'], $reason) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_bsubTime']) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_seenTime']) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_startTime']) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_runTime']) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_doneTime']) . '</td>';
+			print "<td class='right nowrap'>"  . benchmark_get_time($benchmark_job['pjob_seenDoneTime']) . '</td>';
+			print "<td>$reason</td>";
 
 			form_end_row();
 		}
@@ -753,78 +766,89 @@ function ajax_benchmark_jobs() {
 
 function process_request_var() {
 	global $grid_timespans, $grid_timeshifts, $grid_weekdays;
+
+	/**
+	 * check to see if the cluster has changed and if so, reset the
+	 * benchmark job filter if set.
+	 */
+	if (isset($_SESSION['sess_gbmj_clusterid']) && isset_request_var('clusterid')) {
+		if ($_SESSION['sess_gbmj_clusterid'] != get_filter_request_var('clusterid')) {
+			set_request_var('benchmark_id', '0');
+		}
+	}
+
 	/* ================= input validation and session storage ================= */
 	$filters = array(
 		'rows' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'pageset' => true,
 			'default' => '-1'
-			),
+		),
 		'page' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => '1'
-			),
+		),
 		'clusterid' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'pageset' => true,
 			'default' => '0'
-			),
+		),
 		'status' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'pageset' => true,
 			'default' => '-1'
-			),
+		),
 		'filter' => array(
 			'filter' => FILTER_CALLBACK,
 			'pageset' => true,
 			'default' => '',
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'refresh' => array(
 			'filter' => FILTER_CALLBACK,
 			'pageset' => true,
 			'default' => read_grid_config_option('refresh_interval'),
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'user' => array(
 			'filter' => FILTER_CALLBACK,
 			'pageset' => true,
 			'default' => '',
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'filter' => array(
 			'filter' => FILTER_CALLBACK,
 			'pageset' => true,
 			'default' => '',
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'sort_column' => array(
 			'filter' => FILTER_CALLBACK,
 			'default' => 'start_time',
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'sort_direction' => array(
 			'filter' => FILTER_CALLBACK,
 			'default' => 'DESC',
 			'options' => array('options' => 'sanitize_search_string')
-			),
+		),
 		'benchmark_id' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'pageset' => true,
 			'default' => '0'
-			)
+		)
 	);
 
 	validate_store_request_vars($filters, 'sess_gbmj');
 
-	$timespan = rtm_initialize_timespan($grid_timespans, $grid_timeshifts, 'sess_gbmj', 'read_grid_config_option', 'Y-m-d H:i:s');
+	$timespan  = rtm_initialize_timespan($grid_timespans, $grid_timeshifts, 'sess_gbmj', 'read_grid_config_option', 'Y-m-d H:i:s');
 	$timeshift = rtm_set_timeshift($grid_timeshifts, 'sess_gbmj', 'read_grid_config_option');
 
-		/* process the timespan/timeshift settings */
+	/* process the timespan/timeshift settings */
 	rtm_process_html_variables($grid_timespans, $grid_timeshifts, 'sess_gbmj', 'read_grid_config_option');
 	rtm_process_user_input($timespan, $timeshift, $grid_timespans, 'sess_gbmj', 'read_grid_config_option', 'Y-m-d H:i:s');
 
-		/* save session variables */
+	/* save session variables */
 	rtm_finalize_timespan($timespan, $grid_timespans, 'sess_gbmj', 'read_grid_config_option', 'Y-m-d H:i:s');
 
 	set_request_var('date1',$_SESSION['sess_gbmj_current_date1']);
diff --git a/cacti/plugins/grid/grid_manage_hosts.php b/cacti/plugins/grid/grid_manage_hosts.php
index c39f3d77..1c70e8de 100644
--- a/cacti/plugins/grid/grid_manage_hosts.php
+++ b/cacti/plugins/grid/grid_manage_hosts.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: c39f3d778a2d75d3d49f0fd3870a36e30ba01f03 $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -57,114 +57,116 @@ function form_actions() {
 	global $config, $grid_mhosts_actions;
 
 	/* remember or default these values */
-	load_current_session_value('type', 'sess_grid_view_manage_hosts_type', '0');
-	load_current_session_value('integrated', 'sess_grid_view_manage_hosts_integrated', '-1');
+	load_current_session_value('type', 'sess_gmh_type', '0');
+	load_current_session_value('integrated', 'sess_gmh_integrated', '-1');
 
 	/* if we are to save this form, instead of display it */
 	if (isset_request_var('selected_items')) {
 		$selected_items = rtm_sanitize_unserialize_selected_items(get_request_var('selected_items'), false);
 
 		if ($selected_items != false) {
-		if (get_request_var('drp_action') == '1') { /* delete */
-			if ((isset_request_var('delete_type')) && (get_request_var('delete_type') == '2')) { // disable
-				for ($i=0;($i<count($selected_items));$i++) {
-					$vars      = explode('|', base64_decode($selected_items[$i]));
-					$clusterid = $vars[0];
-					$host      = $vars[1];
-
-					/* error checking */
-					if ($host == '' || $clusterid == '') continue;
-
-					$host_id = db_fetch_cell_prepared('SELECT id
-						FROM host
-						WHERE clusterid = ?
-						AND hostname = ?',
-						array($clusterid, $host));
-
-					if (!empty($host_id)) {
-						/* disable the host */
-						db_execute_prepared('UPDATE host SET disabled="on" WHERE id = ?', array($host_id));
+			if (get_request_var('drp_action') == '1') { /* delete */
+				if ((isset_request_var('delete_type')) && (get_request_var('delete_type') == '2')) { // disable
+					for ($i=0;($i<count($selected_items));$i++) {
+						$vars      = explode('|', base64_decode($selected_items[$i]));
+						$clusterid = $vars[0];
+						$host      = $vars[1];
+
+						/* error checking */
+						if ($host == '' || $clusterid == '') continue;
+
+						$host_id = db_fetch_cell_prepared('SELECT id
+							FROM host
+							WHERE clusterid = ?
+							AND hostname = ?',
+							array($clusterid, $host));
+
+						if (!empty($host_id)) {
+							/* disable the host */
+							db_execute_prepared('UPDATE host SET disabled="on" WHERE id = ?', array($host_id));
+
+							/* update poller cache */
+							db_execute_prepared('DELETE from poller_item WHERE host_id = ?', array($host_id));
+							db_execute_prepared('DELETE from poller_reindex WHERE host_id = ?', array($host_id));
+						}
 
-						/* update poller cache */
-						db_execute_prepared('DELETE from poller_item WHERE host_id = ?', array($host_id));
-						db_execute_prepared('DELETE from poller_reindex WHERE host_id = ?', array($host_id));
+						api_grid_host_remove($host, $clusterid);
 					}
-
-					api_grid_host_remove($host, $clusterid);
-				}
-			}else if ((isset_request_var('delete_type')) && (get_request_var('delete_type') == '1')) { // delete
-				$data_sources_to_act_on = array();
-				$graphs_to_act_on       = array();
-				$devices_to_act_on      = array();
-
-				for ($i=0;($i<count($selected_items));$i++) {
-					$vars      = explode('|', base64_decode($selected_items[$i]));
-					$clusterid = $vars[0];
-					$host      = $vars[1];
-
-					/* error checking */
-					if ($host == '' || $clusterid == '') continue;
-
-					$host_id = db_fetch_cell_prepared('SELECT id
-						FROM host
-						WHERE clusterid = ?
-						AND hostname = ?',
-						array($clusterid, $host));
-
-					if (!empty($host_id)) {
-						$devices_to_act_on[] = $host_id;
-
-						$data_sources = db_fetch_assoc_prepared('SELECT
-							data_local.id as local_data_id
-							FROM data_local
-							WHERE data_local.host_id = ?',
-							array($host_id));
-
-						if (cacti_sizeof($data_sources)) {
-							foreach ($data_sources as $data_source) {
-								$data_sources_to_act_on[] = $data_source['local_data_id'];
+				} else if ((isset_request_var('delete_type')) && (get_request_var('delete_type') == '1')) { // delete
+					$data_sources_to_act_on = array();
+					$graphs_to_act_on       = array();
+					$devices_to_act_on      = array();
+
+					for ($i=0;($i<count($selected_items));$i++) {
+						$vars      = explode('|', base64_decode($selected_items[$i]));
+						$clusterid = $vars[0];
+						$host      = $vars[1];
+
+						/* error checking */
+						if ($host == '' || $clusterid == '') continue;
+
+						$host_id = db_fetch_cell_prepared('SELECT id
+							FROM host
+							WHERE clusterid = ?
+							AND hostname = ?',
+							array($clusterid, $host));
+
+						if (!empty($host_id)) {
+							$devices_to_act_on[] = $host_id;
+
+							$data_sources = db_fetch_assoc_prepared('SELECT
+								data_local.id as local_data_id
+								FROM data_local
+								WHERE data_local.host_id = ?',
+								array($host_id));
+
+							if (cacti_sizeof($data_sources)) {
+								foreach ($data_sources as $data_source) {
+									$data_sources_to_act_on[] = $data_source['local_data_id'];
+								}
 							}
-						}
 
-						$graphs = db_fetch_assoc_prepared('SELECT
-							graph_local.id as local_graph_id
-							FROM graph_local
-							WHERE graph_local.host_id = ?',
-							array($host_id));
+							$graphs = db_fetch_assoc_prepared('SELECT
+								graph_local.id as local_graph_id
+								FROM graph_local
+								WHERE graph_local.host_id = ?',
+								array($host_id));
 
-						if (cacti_sizeof($graphs)) {
-							foreach ($graphs as $graph) {
-								$graphs_to_act_on[] = $graph['local_graph_id'];
+							if (cacti_sizeof($graphs)) {
+								foreach ($graphs as $graph) {
+									$graphs_to_act_on[] = $graph['local_graph_id'];
+								}
 							}
 						}
-					}
 
-					api_grid_host_remove($host, $clusterid);
-				}
-
-				api_data_source_remove_multi($data_sources_to_act_on);
-				api_graph_remove_multi($graphs_to_act_on);
-				api_device_remove_multi($devices_to_act_on);
-			}else{
-				for ($i=0;($i<count($selected_items));$i++) {
-					$vars      = explode('|', base64_decode($selected_items[$i]));
-					$clusterid = $vars[0];
-					$host      = $vars[1];
+						api_grid_host_remove($host, $clusterid);
+					}
 
-					/* error checking */
-					if ($host == '' || $clusterid == '') continue;
+					api_data_source_remove_multi($data_sources_to_act_on);
+					api_graph_remove_multi($graphs_to_act_on);
+					api_device_remove_multi($devices_to_act_on);
+				} else {
+					for ($i=0;($i<count($selected_items));$i++) {
+						$vars      = explode('|', base64_decode($selected_items[$i]));
+						$clusterid = $vars[0];
+						$host      = $vars[1];
+
+						/* error checking */
+						if ($host == '' || $clusterid == '') {
+							continue;
+						}
 
-					api_grid_host_remove($host, $clusterid);
+						api_grid_host_remove($host, $clusterid);
+					}
 				}
 			}
 		}
-		}
 
 		header('Location: grid_manage_hosts.php?header=false');
 		exit;
 	}
 
-	if(!isset($grid_mhosts_actions[get_request_var('drp_action')])) {
+	if (!isset($grid_mhosts_actions[get_request_var('drp_action')])) {
 		header('Location: grid_manage_hosts.php?header=false');
 		exit;
 	}
@@ -187,7 +189,7 @@ function form_actions() {
 						WHERE clusterid = ?
 						AND hostname = ?',
 						array($clusterid, $host));
-				}else{
+				} else {
 					$host_info = db_fetch_cell_prepared('SELECT host
 						FROM grid_hostinfo
 						WHERE clusterid = ?
@@ -229,7 +231,7 @@ function form_actions() {
 		raise_message(40);
 		header('Location: grid_manage_hosts.php?header=false');
 		exit;
-	}else{
+	} else {
 		$save_html = "<input type='submit' value='" . __('Continue') . "' alt=''>";
 	}
 
@@ -258,14 +260,14 @@ function api_grid_host_remove($host, $clusterid) {
     Manage Hosts Functions
    --------------------- */
 
-function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $rows, &$sql_params) {
+function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = true, $rows, &$sql_params) {
 	$sql_order = get_order_string();
 
-	if (get_request_var('integrated') != '2') {
+	if (get_request_var('integrated') != '2' || get_request_var('type') != 0) {
 		/* clusterid sql where */
 		if (get_request_var('clusterid') == '0') {
 			/* Show all items */
-		}else {
+		} else {
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_clusters.clusterid=?)';
 			$sql_params[] = get_request_var('clusterid');
 		}
@@ -274,13 +276,13 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		if (get_request_var('integrated') != '2') {
 			if (get_request_var('type') == '-1') {
 				/* Show all items */
-			}else if (get_request_var('type') == '0') {
+			} else if (get_request_var('type') == '0') {
 				$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.isServer="1")';
-			}else if (get_request_var('type') == '1') {
+			} else if (get_request_var('type') == '1') {
 				$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.isServer="0" AND grid_hostinfo.licFeaturesNeeded=16)';
-			}else if (get_request_var('type') == '2') {
+			} else if (get_request_var('type') == '2') {
 				$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.isServer="0" AND grid_hostinfo.licFeaturesNeeded=512)';
-			}else{
+			} else {
 				$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.isServer="0")';
 			}
 		}
@@ -288,10 +290,10 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		/* integrated sql where */
 		if (get_request_var('integrated') == '-1') {
 			/* Show all items */
-		}else if (get_request_var('integrated') == '0') {
+		} else if (get_request_var('integrated') == '0') {
 			$sql_join   = 'INNER JOIN grid_hostinfo ON grid_clusters.clusterid=grid_hostinfo.clusterid)
 				INNER JOIN host ON host.hostname=grid_hostinfo.host AND host.clusterid=grid_hostinfo.clusterid';
-		}else if (get_request_var('integrated') == '1') {
+		} else if (get_request_var('integrated') == '1') {
 			$sql_join   = 'INNER JOIN grid_hostinfo ON grid_clusters.clusterid=grid_hostinfo.clusterid)
 				LEFT JOIN host ON host.hostname=grid_hostinfo.host AND host.clusterid=grid_hostinfo.clusterid';
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(host.clusterid IS NULL)';
@@ -300,17 +302,17 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		/* integrated sql where */
 		if (get_request_var('lastseen') == '-2') {
 			/* don't do anything */
-		}else if (get_request_var('lastseen') == '-1') {
-			$date = date('Y-m-d H:i:s', time()-1200);
+		} else if (get_request_var('lastseen') == '-1') {
+			$date = date('Y-m-d H:i:s', time()-86400);
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.last_seen>?)';
 			$sql_params[] = $date;
-		}else if (get_request_var('lastseen') == '0') {
+		} else if (get_request_var('lastseen') == '0') {
 			$date1 = date('Y-m-d H:i:s', time()-(86400*30));
 			$date2 = date('Y-m-d H:i:s', time()-(86400*7));
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.last_seen>?) AND (grid_hostinfo.last_seen<?)';
 			$sql_params[] = $date1;
 			$sql_params[] = $date2;
-		}else if (get_request_var('lastseen') == '1') {
+		} else if (get_request_var('lastseen') == '1') {
 			$date = date('Y-m-d H:i:s', time()-(86400*30));
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(grid_hostinfo.last_seen<?)';
 			$sql_params[] = $date;
@@ -319,7 +321,7 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		/* filter sql where */
 		if (!strlen(get_request_var('filter'))) {
 			/* Show all items */
-		}else {
+		} else {
 			$sql_where .= (strlen($sql_where) ? ' AND ' : 'WHERE ' ) . '(
 				(grid_hostinfo.host LIKE ?) OR
 				(grid_hostinfo.last_seen LIKE ?) OR
@@ -336,7 +338,7 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		}
 
 		if (!strlen($sql_join)) {
-			$sql_join .= ' INNER JOIN grid_hostinfo ON grid_clusters.clusterid=grid_hostinfo.clusterid)';
+			$sql_join .= ' RIGHT JOIN grid_hostinfo ON grid_clusters.clusterid = grid_hostinfo.clusterid)';
 		}
 
 		$sql_query = "SELECT grid_hostinfo.*, grid_clusters.clustername
@@ -344,7 +346,7 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 			$sql_join
 			$sql_where
 			$sql_order";
-	}else{
+	} else {
 		/* filter sql where */
 		if (get_request_var('filter') != '') {
 			$sql_where .= ' AND ((host.description LIKE ?) OR (host.hostname LIKE ?))';
@@ -372,7 +374,7 @@ function grid_get_host_records(&$sql_where, &$sql_join, $apply_limits = TRUE, $r
 		 $sql_query .= ' LIMIT ' . ($rows*(get_request_var('page')-1)) . ',' . $rows;
 	}
 
-	//echo $sql_query;
+	//print $sql_query;
 
 	return db_fetch_assoc_prepared($sql_query, $sql_params);
 }
@@ -401,7 +403,7 @@ function manageHostsFilter() {
 							<option value='1'<?php if (get_request_var('type') == '1') {?> selected<?php }?>><?php print __('Fixed Clients');?></option>
 							<option value='2'<?php if (get_request_var('type') == '2') {?> selected<?php }?>><?php print __('Float Clients');?></option>
 							<option value='0'<?php if (get_request_var('type') == '0') {?> selected<?php }?>><?php print __('Servers');?></option>
-							<?php }else{?>
+							<?php } else {?>
 							<option value='0'<?php if (get_request_var('type') == '0') {?> selected<?php }?>><?php print __('Unknown');?></option>
 							<?php }?>
 						</select>
@@ -539,13 +541,13 @@ function grid_manage_hosts() {
 
 	if (get_request_var('rows') == -1) {
 		$rows = read_grid_config_option('grid_records');
-	}elseif (get_request_var('rows') == -2) {
+	} elseif (get_request_var('rows') == -2) {
 		$rows = 99999999;
-	}else{
+	} else {
 		$rows = get_request_var('rows');
 	}
 
-	$hosts = grid_get_host_records($sql_where, $sql_join, TRUE, $rows, $sql_params);
+	$hosts = grid_get_host_records($sql_where, $sql_join, true, $rows, $sql_params);
 
 	?>
 	<script type='text/javascript'>
@@ -587,7 +589,7 @@ function clearFilter() {
 			FROM (grid_clusters
 			$sql_join
 			$sql_where";
-	}else{
+	} else {
 		$rows_query_string = "SELECT COUNT(*)
 			FROM host
 			LEFT JOIN grid_hostinfo ON grid_hostinfo.clusterid=host.clusterid AND grid_hostinfo.host=host.hostname
@@ -598,13 +600,36 @@ function clearFilter() {
 	$total_rows = db_fetch_cell_prepared($rows_query_string, $sql_params);
 
 	$display_text = array(
-		'clustername' => array(__('Cluster Name'), 'ASC'),
-		'host'        => array(__('Host Name'), 'ASC'),
-		'hostType'    => array(__('Host Type'), 'DESC'),
-		'hostModel'   => array(__('Host Model'), 'DESC'),
-		'isServer'    => array(__('Host License'), 'DESC'),
-		'first_seen'  => array(__('First Seen'), 'DESC'),
-		'last_seen'   => array(__('Last Seen'), 'ASC')
+		'clustername' => array(
+			'display' => __('Cluster Name'),
+			'sort' => 'ASC'
+		),
+		'host'        => array(
+			'display' => __('Host Name'),
+			'sort'    => 'ASC'
+		),
+		'hostType'    => array(
+			'display' => __('Host Type'),
+			'sort'    => 'DESC'
+		),
+		'hostModel'   => array(
+			'display' => __('Host Model'),
+			'sort'    => 'DESC'
+		),
+		'isServer'    => array(
+			'display' => __('Host License'),
+			'sort'    => 'DESC'
+		),
+		'first_seen'  => array(
+			'display' => __('First Seen'),
+			'align'   => 'right',
+			'sort'    => 'DESC'
+		),
+		'last_seen'   => array(
+			'display' => __('Last Seen'),
+			'align'   => 'right',
+			'sort'    => 'ASC'
+		)
 	);
 
 	/* generate page list */
@@ -619,7 +644,7 @@ function clearFilter() {
 	html_header_sort_checkbox($display_text, get_request_var('sort_column'), get_request_var('sort_direction'), false);
 
 	if (cacti_sizeof($hosts)) {
-		if(strlen(get_request_var('filter')) >0){
+		if (strlen(get_request_var('filter')) >0){
 			foreach ($hosts as $host) {
 				$id = base64_encode($host['clusterid'] . '|' . $host['host']);
 				form_alternate_row('line' . $id, false);
@@ -633,13 +658,13 @@ function clearFilter() {
 				form_selectable_cell($display_value, $id);
 				form_selectable_cell(($host['isServer'] == 1 ? 'Server' : (($host['licFeaturesNeeded'] == 16) ? __('Fixed Client') : __('Float Client'))), $id);
 				$display_value = preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "<span style='background-color: #F8D93D;'>\\1</span>", $host['first_seen']);
-				form_selectable_cell($display_value, $id);
+				form_selectable_cell($display_value, $id, '', 'right');
 				$display_value = preg_replace('/(' . preg_quote(get_request_var('filter')) . ')/i', "<span style='background-color: #F8D93D;'>\\1</span>", $host['last_seen']);
-				form_selectable_cell($display_value, $id);
+				form_selectable_cell($display_value, $id, '', 'right');
 				form_checkbox_cell($host['host'], $id);
 				form_end_row();
 			}
-		}else{
+		} else {
 			foreach ($hosts as $host) {
 				$id = base64_encode($host['clusterid'] . '|' . $host['host']);
 				form_alternate_row('line' . $id, false);
@@ -648,13 +673,13 @@ function clearFilter() {
 				form_selectable_cell(str_replace('UNKNOWN_AUTO_DETECT', __('Auto Detect'), $host['hostType']), $id);
 				form_selectable_cell(str_replace('UNKNOWN_AUTO_DETECT', __('Auto Detect'), $host['hostModel']), $id);
 				form_selectable_cell(($host['isServer'] == 1 ? 'Server' : (($host['licFeaturesNeeded'] == 16) ? __('Fixed Client') : __('Float Client'))), $id);
-				form_selectable_cell($host['first_seen'], $id);
-				form_selectable_cell($host['last_seen'], $id);
+				form_selectable_cell($host['first_seen'], $id, '', 'right');
+				form_selectable_cell($host['last_seen'], $id, '', 'right');
 				form_checkbox_cell($host['host'], $id);
 				form_end_row();
 			}
 		}
-	}else{
+	} else {
 		print "<tr><td colspan='8'><em>" . __('No Hosts Defined') . "</em></td></tr>";
 	}
 
@@ -668,5 +693,21 @@ function clearFilter() {
 	draw_actions_dropdown($grid_mhosts_actions);
 
 	form_end();
+
+	?>
+	<script type='text/javascript'>
+	$(function() {
+		if ($('#type').val() != 0) {
+			$('#integrated').val('-1');
+			if ($('#integrated').selectmenu('widget')) {
+				$('#integrated').prop('disabled', true);
+				$('#integrated').selectmenu('refresh').selectmenu('disable');
+			} else {
+				$('#integrated').prop('disabled', true);
+			}
+		}
+	});
+	</script>
+	<?php
 }
 
diff --git a/cacti/plugins/grid/lib/grid_functions.php b/cacti/plugins/grid/lib/grid_functions.php
index 36127a24..e22e2614 100644
--- a/cacti/plugins/grid/lib/grid_functions.php
+++ b/cacti/plugins/grid/lib/grid_functions.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: 9d561380bd21388c2f0f80bf109b4a0bfc4be257 $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -15987,8 +15987,9 @@ function grid_view_get_queue_records() {
 }
 
 function grid_view_get_user_queue_slot_records() {
-	$user_queues = db_fetch_assoc("SELECT CONCAT(clusterid, '_', user, '_', queue) AS id, SUM(num_cpus) AS total_cpus
-		FROM grid_jobs WHERE stat IN ('RUNNING','PROV') GROUP BY clusterid, user, queue");
+	$user_queues = db_fetch_assoc("SELECT CONCAT(clusterid, '_', user_or_group, '_', queue) AS id, runjobs AS total_cpus
+		FROM grid_queues_users_stats");
+
 	return $user_queues;
 }
 
diff --git a/cacti/scripts/ss_grid_effectiveut.php b/cacti/scripts/ss_grid_effectiveut.php
index 44140852..51bec12a 100755
--- a/cacti/scripts/ss_grid_effectiveut.php
+++ b/cacti/scripts/ss_grid_effectiveut.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: 441408528d80d8be03d377a6c23a42ceede5ec1c $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -34,7 +34,7 @@ function ss_grid_effectiveut($clusterid = 0) {
 		$sql_where = "AND ghr.clusterid = $clusterid";
 	}
 
-	$effectiveUT = db_fetch_cell("SELECT
+	$effectiveUT = db_fetch_cell("SELECT " . SQL_NO_CACHE . "
 		SUM(effectiveUtil*totalSlots)/SUM(totalSlots) AS effectiveUtil
 		FROM (
 			SELECT host, GREATEST(memSlotUtil, slotUtil, cpuUtil) AS effectiveUtil, totalSlots
diff --git a/cacti/scripts/ss_grid_jobs.php b/cacti/scripts/ss_grid_jobs.php
index e49c0a92..47d68c29 100755
--- a/cacti/scripts/ss_grid_jobs.php
+++ b/cacti/scripts/ss_grid_jobs.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: e49c0a9204a932b821630062c85b0b5c49d24134 $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -30,13 +30,13 @@
 function ss_grid_jobs($hostname = '', $clusterid = 0, $summary='no') {
 	if ($hostname == '' || $hostname == 'localhost' || $summary == 'yes') {
 		if ($clusterid == 0) {
-			$job_stats = db_fetch_row("SELECT SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
+			$job_stats = db_fetch_row("SELECT " . SQL_NO_CACHE . " SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
 				SUM(numRun) as t_numRun, SUM(numSSUSP) as t_numSSUSP, SUM(numUSUSP) as t_numUSUSP,
 				SUM(numRESERVE) as t_numRESERVE
 				FROM grid_hosts
 				WHERE status != 'Closed-Admin'");
 		} else {
-			$job_stats = db_fetch_row_prepared("SELECT SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
+			$job_stats = db_fetch_row_prepared("SELECT " . SQL_NO_CACHE . " SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
 				SUM(numRun) as t_numRun, SUM(numSSUSP) as t_numSSUSP, SUM(numUSUSP) as t_numUSUSP,
 				SUM(numRESERVE) as t_numRESERVE
 				FROM grid_hosts
@@ -46,7 +46,7 @@ function ss_grid_jobs($hostname = '', $clusterid = 0, $summary='no') {
 		}
 	} else {
 		if ($clusterid == 0) {
-			$job_stats = db_fetch_row_prepared("SELECT SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
+			$job_stats = db_fetch_row_prepared("SELECT " . SQL_NO_CACHE . " SUM(maxJobs) as t_maxJobs, SUM(numJobs) as t_numJobs,
 				SUM(numRun) as t_numRun, SUM(numSSUSP) as t_numSSUSP, SUM(numUSUSP) as t_numUSUSP,
 				SUM(numRESERVE) as t_numRESERVE
 				FROM grid_hosts
@@ -54,12 +54,12 @@ function ss_grid_jobs($hostname = '', $clusterid = 0, $summary='no') {
 				AND status != 'Closed-Admin'",
 				array($hostname));
 		} else {
-			$job_stats = db_fetch_row_prepared('SELECT maxJobs as t_maxJobs, numJobs as t_numJobs,
+			$job_stats = db_fetch_row_prepared("SELECT " . SQL_NO_CACHE . " maxJobs as t_maxJobs, numJobs as t_numJobs,
 				numRun as t_numRun, numSSUSP as t_numSSUSP, numUSUSP as t_numUSUSP,
 				numRESERVE as t_numRESERVE
 				FROM grid_hosts
 				WHERE clusterid = ?
-				AND host = ?',
+				AND host = ?",
 				array($clusterid, $hostname));
 		}
 	}
diff --git a/cacti/scripts/ss_grid_lssched_bcs.php b/cacti/scripts/ss_grid_lssched_bcs.php
index c862d69d..50e0b7dc 100755
--- a/cacti/scripts/ss_grid_lssched_bcs.php
+++ b/cacti/scripts/ss_grid_lssched_bcs.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: c862d69d1194abd50180b813877394b96b213c81 $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -65,7 +65,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 	}
 
 	if ($column == 'totalInUse') {
-		$value = db_fetch_cell("SELECT SUM(totals)
+		$value = db_fetch_cell("SELECT " . SQL_NO_CACHE . " SUM(totals)
 			FROM (
 				SELECT SUM(inuse + `over`) AS totals
 				FROM grid_blstat_cluster_use
@@ -76,7 +76,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 				WHERE lsid='" . $index_arr[0] . "' AND feature='" . $index_arr[1] . "'  AND cluster='" . $index_arr[2] ."'
 			) AS totals");
 	} else if ($column == 'totalReserve') {
-		$value = db_fetch_cell("SELECT SUM(totals)
+		$value = db_fetch_cell("SELECT " . SQL_NO_CACHE . " SUM(totals)
 			FROM (
 				SELECT SUM(reserve) AS totals
 				FROM grid_blstat_cluster_use
@@ -87,7 +87,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 				WHERE lsid='" . $index_arr[0] . "' AND feature='" . $index_arr[1] . "'  AND cluster='" . $index_arr[2] ."'
 			) AS totals");
 	} else if ($column == 'totalFree') {
-		$value = db_fetch_cell("SELECT SUM(totals)
+		$value = db_fetch_cell("SELECT " . SQL_NO_CACHE . " SUM(totals)
 			FROM (
 				SELECT SUM(free) AS totals
 				FROM grid_blstat_cluster_use
@@ -98,7 +98,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 				WHERE lsid='" . $index_arr[0] . "' AND feature='" . $index_arr[1] . "'  AND cluster='" . $index_arr[2] ."'
 			) AS totals");
 	} else if ($column == 'totalDemand') {
-		$value = db_fetch_cell("SELECT SUM(totals)
+		$value = db_fetch_cell("SELECT " . SQL_NO_CACHE . " SUM(totals)
 			FROM (
 				SELECT SUM(need+demand) AS totals
 				FROM grid_blstat_cluster_use
@@ -109,7 +109,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 				WHERE lsid='" . $index_arr[0] . "' AND feature='" . $index_arr[1] . "'  AND cluster='" . $index_arr[2] ."'
 			) AS totals");
 	} else if ($column == 'totalOver') {
-		$value = db_fetch_cell("SELECT SUM(totals)
+		$value = db_fetch_cell("SELECT " . SQL_NO_CACHE . " SUM(totals)
 			FROM (
 				SELECT SUM(`over`) AS totals
 				FROM grid_blstat_clusters
@@ -131,7 +131,7 @@ function ss_grid_lssched_bcs_getvalue($host_id, $index, $column) {
 function ss_grid_lssched_bcs_getnames($host_id) {
 	$return_arr = array();
 
-	$lsid = db_fetch_cell_prepared('SELECT lsid
+	$lsid = db_fetch_cell_prepared('SELECT ' . SQL_NO_CACHE . ' lsid
 		FROM grid_blstat_collectors
 		WHERE cacti_host = ?',
 		array($host_id));
@@ -140,7 +140,7 @@ function ss_grid_lssched_bcs_getnames($host_id) {
 		return $return_arr;
 	}
 
-	$arr = db_fetch_assoc_prepared("SELECT DISTINCT lsid_feature_cl
+	$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT lsid_feature_cl
 		FROM (
 			SELECT CONCAT_WS('', lsid, '|', feature, '|', cluster, '') AS lsid_feature_cl
 			FROM grid_blstat_cluster_use
@@ -163,7 +163,7 @@ function ss_grid_lssched_bcs_getnames($host_id) {
 function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 	$return_arr = array();
 
-	$lsid = db_fetch_cell_prepared('SELECT lsid
+	$lsid = db_fetch_cell_prepared('SELECT ' . SQL_NO_CACHE . ' lsid
 		FROM grid_blstat_collectors
 		WHERE cacti_host = ?',
 		array($host_id));
@@ -173,7 +173,7 @@ function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 	}
 
 	if ($info_requested == 'lsid_feature_cl') {
-		$arr = db_fetch_assoc_prepared("SELECT DISTINCT qry_index, qry_value
+		$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT qry_index, qry_value
 			FROM (
 				SELECT CONCAT_WS('', lsid, '|', feature, '|', cluster, '') AS qry_index,
 				CONCAT_WS('', lsid, '|', feature, '|', cluster, '') AS qry_value
@@ -188,7 +188,7 @@ function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 			ORDER BY qry_index",
 			array($lsid, $lsid));
 	} elseif ($info_requested == 'cluster') {
-		$arr = db_fetch_assoc_prepared("SELECT DISTINCT qry_index, qry_value
+		$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT qry_index, qry_value
 			FROM (
 				SELECT CONCAT_WS('', lsid, '|', feature, '|', cluster, '') AS qry_index,
 				cluster AS qry_value
@@ -203,7 +203,7 @@ function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 			ORDER BY qry_index",
 			array($lsid, $lsid));
 	} elseif ($info_requested == 'region') {
-		$arr = db_fetch_assoc_prepared("SELECT DISTINCT qry_index, qry_value
+		$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT qry_index, qry_value
 			FROM (
 				SELECT CONCAT_WS('', gbcu.lsid, '|', feature, '|', cluster, '') AS qry_index,
 				region AS qry_value
@@ -222,7 +222,7 @@ function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 			ORDER BY qry_index",
 			array($lsid, $lsid));
 	} elseif ($info_requested == 'collector') {
-		$arr = db_fetch_assoc_prepared("SELECT DISTINCT qry_index, qry_value
+		$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT qry_index, qry_value
 			FROM (
 				SELECT CONCAT_WS('', gbcu.lsid, '|', feature, '|', cluster, '') AS qry_index,
 				gbc.name AS qry_value
@@ -241,7 +241,7 @@ function ss_grid_lssched_bcs_getinfo($host_id, $info_requested) {
 			ORDER BY qry_index",
 			array($lsid, $lsid));
 	} elseif ($info_requested == 'feature') {
-		$arr = db_fetch_assoc_prepared("SELECT DISTINCT qry_index, qry_value
+		$arr = db_fetch_assoc_prepared("SELECT " . SQL_NO_CACHE . " DISTINCT qry_index, qry_value
 			FROM (
 				SELECT CONCAT_WS('', lsid, '|', feature, '|', cluster, '') AS qry_index,
 				feature AS qry_value
diff --git a/cacti/scripts/ss_grid_slot_ut.php b/cacti/scripts/ss_grid_slot_ut.php
index 898864bd..97554dc6 100755
--- a/cacti/scripts/ss_grid_slot_ut.php
+++ b/cacti/scripts/ss_grid_slot_ut.php
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: 898864bd80312c4af317fb2fc130dcad806ceed3 $
 /*
  +-------------------------------------------------------------------------+
  | Copyright IBM Corp. 2006, 2022                                          |
@@ -36,7 +36,7 @@ function ss_grid_slot_ut($host = '', $clusterid = 0) {
 	}
 
 	if ($host != 'localhost' ) {
-		$ut = db_fetch_row_prepared("SELECT
+		$ut = db_fetch_row_prepared("SELECT " . SQL_NO_CACHE . "
 			IFNULL(memSlotUtil, 0) AS memSlotUtil,
 			IFNULL(slotUtil, 0) AS slotUtil,
 			IFNULL(cpuUtil, 0) AS cpuUtil
@@ -66,7 +66,7 @@ function ss_grid_slot_ut($host = '', $clusterid = 0) {
 			) AS results2",
 			array($clusterid));
 	}else{
-		$ut = db_fetch_row_prepared("SELECT
+		$ut = db_fetch_row_prepared("SELECT " . SQL_NO_CACHE . "
 			IFNULL(memSlotUtil/totalSlots, 0) AS memSlotUtil,
 			IFNULL(slotUtil/totalSlots, 0) AS slotUtil,
 			IFNULL(cpuUtil/totalSlots, 0) AS cpuUtil