Merge branch '6834-multiserver-metrics-fixes' into 'develop'

Fixed metrics for nodes in a multiserver setup

Closes #6834

See merge request ispconfig/ispconfig3!1990

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -775,7 +775,7 @@ public function grant_master_database_rights($verbose = false) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}
 
-				$query = "GRANT SELECT, INSERT , DELETE ON ?? TO ?@?";
+				$query = "GRANT SELECT, INSERT, UPDATE, DELETE ON ?? TO ?@?";
 				if ($verbose){
 					echo $query ."\n";
 				}

server/lib/classes/cron.d/100-monitor_sys_usage.inc.php

@@ -60,13 +60,13 @@ public function onRunJob() {
 
 		/* the id of the server as int */
 		$server_id = intval($conf['server_id']);
-		
+
 
         // Get record with existing data points
         $type = 'sys_usage';
         $max_data_points = 15;
-        $sql = "SELECT `data` FROM `monitor_data` WHERE `type` = ?";
-        $rec = $app->db->queryOneRecord($sql, $type);
+        $sql = "SELECT `data` FROM `monitor_data` WHERE `type` = ? AND `server_id` = ?";
+        $rec = $app->dbmaster->queryOneRecord($sql, $type, $server_id);
 
         if(!empty($rec)) {
             $data = unserialize($rec['data']);
@@ -81,7 +81,7 @@ public function onRunJob() {
             $interval_seconds = 60;
         }
         $data['tstamp'] = time();
- 
+
         // Monitor load average in percent
         $load = $this->get_system_load();
 
@@ -101,7 +101,7 @@ public function onRunJob() {
         }
 
         $data['load'][] = $load_percent;
-		
+
 		// Trim time array size
         if(isset($data['time']) && count($data['time']) >= $max_data_points) {
             array_shift($data['time']);
@@ -172,10 +172,10 @@ public function onRunJob() {
                 ')';
             $app->dbmaster->query($sql);
         } else {
-            $sql = "UPDATE `monitor_data` SET `data` = ?, `created` = ? WHERE `type` = ?";
-            $app->dbmaster->query($sql,serialize($res['data']),time(),$type);
+            $sql = "UPDATE `monitor_data` SET `data` = ?, `created` = ? WHERE `type` = ? AND `server_id` = ?";
+            $app->dbmaster->query($sql,serialize($res['data']),time(),$type,$server_id);
         }
-        
+
 
         /* The new data is written, now we can delete the old one */
         $this->_tools->delOldRecords($type, $res['server_id']);
@@ -206,7 +206,7 @@ private function get_system_load() {
         }
         return $load;
     }
-        
+
     /**
      * get_cpu_cores
      *
@@ -216,13 +216,13 @@ private function get_system_load() {
     private function get_cpu_cores() : int {
         return (int) shell_exec("nproc");
     }
-        
+
     /**
      * get_memory_info
      *
      * @return array
      */
-    
+
     private function get_memory_info() : array {
         $data = file_get_contents("/proc/meminfo");
         $meminfo = [];
@@ -236,7 +236,7 @@ private function get_memory_info() : array {
         }
         return $meminfo;
     }
-    
+
     /**
      * get_network_bytes
      *
@@ -279,4 +279,4 @@ private function getFirstExternalInterface() {
 
         return null;
     }
-}
+}