From c124192e63bd8a48ed1e7caf9542dc52505dfd22 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 24 Jan 2019 12:17:07 +0100
Subject: [statistics] Handling of standby state in statistics, log crashes

Or rather, not really crashes, but log whenever a client reports a
poweron event without reporting a proper shutdown first. This isn't
neccessarily a crash but could also be due to power loss, hard poweroff,
or network failures.
---
 modules-available/statistics/inc/parser.inc.php     | 10 +++++++---
 modules-available/statistics/inc/statistics.inc.php | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'modules-available/statistics/inc')

diff --git a/modules-available/statistics/inc/parser.inc.php b/modules-available/statistics/inc/parser.inc.php
index b179b4a3..0d39079d 100644
--- a/modules-available/statistics/inc/parser.inc.php
+++ b/modules-available/statistics/inc/parser.inc.php
@@ -104,10 +104,12 @@ class Parser {
 		foreach ($lines as $line) {
 			if (preg_match('/^Disk (\S+):.* (\d+) bytes/i', $line, $out)) {
 				// --- Beginning of MBR disk ---
+				unset($hdd);
 				if ($out[2] < 10000) // sometimes vmware reports lots of 512byte disks
 					continue;
+				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
+					continue;
 				// disk total size and name
-				unset($hdd);
 				$mbrToMbFactor = 0; // This is != 0 for mbr
 				$sectorToMbFactor = 0; // This is != for gpt
 				$hdd = array(
@@ -122,10 +124,12 @@ class Parser {
 				$hdds[] = &$hdd;
 			} elseif (preg_match('/^Disk (\S+):\s+(\d+)\s+sectors,/i', $line, $out)) {
 				// --- Beginning of GPT disk ---
+				unset($hdd);
 				if ($out[2] < 1000) // sometimes vmware reports lots of 512byte disks
 					continue;
+				if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper
+					continue;
 				// disk total size and name
-				unset($hdd);
 				$mbrToMbFactor = 0; // This is != 0 for mbr
 				$sectorToMbFactor = 0; // This is != for gpt
 				$hdd = array(
@@ -213,7 +217,7 @@ class Parser {
 				$hdd['size'] = round(($hdd['sectors'] * $sectorToMbFactor) / 1024);
 			}
 			$free = $hdd['size'] - $hdd['used'];
-			if ($free > 5 || ($free / $hdd['size']) > 0.1) {
+			if ($hdd['size'] > 0 && ($free > 5 || ($free / $hdd['size']) > 0.1)) {
 				$hdd['partitions'][] = array(
 					'id' => 'free-id-' . $i,
 					'name' => Dictionary::translate('unused'),
diff --git a/modules-available/statistics/inc/statistics.inc.php b/modules-available/statistics/inc/statistics.inc.php
index 2500f16f..1f8a081a 100644
--- a/modules-available/statistics/inc/statistics.inc.php
+++ b/modules-available/statistics/inc/statistics.inc.php
@@ -70,4 +70,21 @@ class Statistics
 		return $list;
 	}
 
+	const SESSION_LENGTH = '~session-length';
+	const OFFLINE_LENGTH = '~offline-length';
+	const SUSPEND_LENGTH = '~suspend-length';
+
+	public static function logMachineState($uuid, $ip, $type, $start, $length, $username = '')
+	{
+		return Database::exec('INSERT INTO statistic (dateline, typeid, machineuuid, clientip, username, data)'
+			. " VALUES (:start, :type, :uuid, :clientip, :username, :length)", array(
+			'start' => $start,
+			'type'  => $type,
+			'uuid'  => $uuid,
+			'clientip' => $ip,
+			'username' => $username,
+			'length'   => $length,
+		));
+	}
+
 }
-- 
cgit v1.2.3-55-g7522