Added disk utilization graph

Author: carbontwelve

RRDCpu.php

@@ -105,6 +105,7 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "--upper-limit=100",
             "--lower-limit=0",
             "--rigid",
+            "--pango-markup",
             "DEF:usr={$this->rrdFilePath}:usr:AVERAGE",
             "DEF:nice={$this->rrdFilePath}:nice:AVERAGE",
             "DEF:sys={$this->rrdFilePath}:sys:AVERAGE",
@@ -170,7 +171,9 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "GPRINT:idle:AVERAGE:Average\\: %5.2lf%%",
             "GPRINT:idle:MAX:Max\\: %5.2lf%%\\n",
 
-            "HRULE:0#000000"
+            "HRULE:0#000000",,
+
+            'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r'
 
         ])) {
             $this->fail('Error writing connections graph for period '. $period  .' ['. rrd_error() .']');

RRDDiskIO.php

@@ -201,6 +201,9 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "-h", "150", "-w", "700",
             "-l 0",
             "-a", "PNG",
+            "--pango-markup",
+            "--lower-limit=0",
+            "--units-exponent=0",
             "-v Utilization %"
         ];
 
@@ -210,7 +213,7 @@ public function graph($period = 'day', $graphPath = __DIR__)
         }
 
         foreach ($this->devices as $device) {
-            $colour = array_pop($colours);
+            $colour = array_shift($colours);
             $config = array_merge($config, [
                 "LINE2:{$device}Avg{$colour}:" . $device . ' Utilization',
                 "GPRINT:{$device}Avg:LAST:   Current\\: %5.2lf%%",
@@ -220,6 +223,8 @@ public function graph($period = 'day', $graphPath = __DIR__)
             ]);
         }
 
+        array_push($config, 'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r');
+
         if(!rrd_graph($graphPath . '/disk_usage_' . $period . '.png', $config)) {
             $this->fail('Error writing connections graph for period '. $period  .' ['. rrd_error() .']');
         }
@@ -230,3 +235,7 @@ public function graph($period = 'day', $graphPath = __DIR__)
 $p = new RRDDiskIO(__DIR__, true, ['nb0', 'nb1']);
 $p->collect();
 $p->graph('hour', __DIR__ . '/../httpdocs/img');
+$p->graph('day', __DIR__ . '/../httpdocs/img');
+$p->graph('week', __DIR__ . '/../httpdocs/img');
+$p->graph('month', __DIR__ . '/../httpdocs/img');
+$p->graph('year', __DIR__ . '/../httpdocs/img');

RRDMemory.php

@@ -134,6 +134,8 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "-l 0",
             "-a", "PNG",
             "-v RAM (bytes)",
+            "--pango-markup",
+            
             "DEF:total={$this->rrdFilePath}:memTotal:AVERAGE",
 
             "DEF:used={$this->rrdFilePath}:memUsed:AVERAGE",
@@ -191,6 +193,8 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "LINE1:total#21392D:Total",
             'GPRINT:total:LAST:%5.1lf %sB   \l',
 
+            'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r'
+
         ])) {
             $this->fail('Error writing connections graph for period '. $period  .' ['. rrd_error() .']');
         }

RRDNetwork.php

@@ -75,6 +75,8 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "-a", "PNG",
             "-v bytes/sec",
             "--slope-mode",
+            "--pango-markup",
+            
             "DEF:in={$this->rrdFilePath}:in:AVERAGE",
             "DEF:maxin={$this->rrdFilePath}:in:MAX",
             "DEF:out={$this->rrdFilePath}:out:AVERAGE",
@@ -96,7 +98,9 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "GPRINT:out:AVERAGE: Avg\\: %6.1lf %S",
             "GPRINT:out:LAST: Current\\: %6.1lf %SBytes/sec\\n",
 
-            "HRULE:0#000000"
+            "HRULE:0#000000",
+
+            'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r'
         ])) {
             $this->fail('Error writing network graph for period '. $period  .' ['. rrd_error() .']');
         }

RRDNginx.php

@@ -88,12 +88,17 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "-v requests/sec",
             "-Y",
             "--units-exponent=0",
+            "--pango-markup",
+
             "DEF:requests=".$this->rrdFilePath.":requests:AVERAGE",
             "LINE2:requests#27AE60:Requests",
             "GPRINT:requests:MAX:  Max\\: %5.2lf",
             "GPRINT:requests:AVERAGE: Avg\\: %5.2lf",
-            "GPRINT:requests:LAST: Current\\: %5.2lf req/sec",
-            "HRULE:0#000000"
+            "GPRINT:requests:LAST: Current\\: %5.2lf req/sec\\n",
+
+            "HRULE:0#000000",
+
+            'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r'
         ])) {
             $this->fail('Error writing requests graph for period '. $period  .' ['. rrd_error() .']');
         }
@@ -109,6 +114,8 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "-v requests/sec",
             "-Y",
             "--units-exponent=0",
+            "--pango-markup",
+
             "DEF:total={$this->rrdFilePath}:total:AVERAGE",
             "DEF:reading={$this->rrdFilePath}:reading:AVERAGE",
             "DEF:writing={$this->rrdFilePath}:writing:AVERAGE",
@@ -138,7 +145,9 @@ public function graph($period = 'day', $graphPath = __DIR__)
             "GPRINT:waiting:AVERAGE: Avg\\: %5.2lf",
             "GPRINT:waiting:MAX:  Max\\: %5.2lf\\n",
 
-            "HRULE:0#000000"
+            "HRULE:0#000000",
+
+            'COMMENT:<span foreground="#ABABAB" size="x-small">'. date('D M jS H') . '\:' . date('i') . '\:' . date('s') .'</span>\r'
 
         ])) {
             $this->fail('Error writing connections graph for period '. $period  .' ['. rrd_error() .']');

all.sh

@@ -2,3 +2,4 @@ php ./RRDNginx.php
 php ./RRDCpu.php
 php ./RRDMemory.php
 php ./RRDNetwork.php
+php ./RRDDiskIO.php