Merge branch 'master' into 'master'

Master

CentOS / RHEL monitor_ system_update &  distver support

See merge request !485

Author: Till Brehm

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

@@ -159,6 +159,18 @@ public function onRunJob() {
 			 * Fetch the output
 			 */
 			$data['output'] = shell_exec('zypper lu');
+		} else if (file_exists('/etc/redhat-release')) {
+			
+			if(shell_exec("yum list updates | awk 'p; /Updated Packages/ {p=1}'") == '') {
+				// There is nothing to update
+				$state = 'ok';
+			}
+			else {
+				$state = 'info';
+			}
+			// Fetch the output
+			$yumData = shell_exec('yum check-update');
+			$data['output'] = $yumData;
 		} else {
 			/*
 			 * It is not Debian/Ubuntu, so there is no data and no state

server/lib/classes/monitor_tools.inc.php

@@ -265,23 +265,23 @@ function get_distname() {
 			$distbaseid = 'fedora';
 		} elseif(stristr($content, 'CentOS release 5')) {
 			$distname = 'CentOS';
-			$distver = 'Unknown';
+			$distver = '5';
 			$distid = 'centos53';
 			$distbaseid = 'fedora';
 		} elseif(stristr($content, 'CentOS Linux release 6')) {
 			$distname = 'CentOS';
-			$distver = 'Unknown';
+			$distver = '6';
 			$distid = 'centos53';
 			$distbaseid = 'fedora';
 		} elseif(stristr($content, 'CentOS Linux release 7.2')) {
 			$distname = 'CentOS';
-			$distver = 'Unknown';
+			$distver = '7.2';
 			$distid = 'centos70';
 			$distconfid = 'centos72';
 			$distbaseid = 'fedora';
 		} elseif(stristr($content, 'CentOS Linux release 7')) {
 			$distname = 'CentOS';
-			$distver = 'Unknown';
+			$distver = '7';
 			$distid = 'centos70';
 			$distbaseid = 'fedora';
 		} else {