From 7a9c937ca15ea608532cf0bc7e41737886478060 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Fri, 17 Apr 2015 23:19:48 +0300
Subject: [PATCH] increased rrd graph size

---
 bin/v-update-sys-rrd-apache2      | 12 ++++++------
 bin/v-update-sys-rrd-ftp          | 12 ++++++------
 bin/v-update-sys-rrd-httpd        | 12 ++++++------
 bin/v-update-sys-rrd-la           | 16 ++++++++--------
 bin/v-update-sys-rrd-mail         | 12 ++++++------
 bin/v-update-sys-rrd-mem          | 12 ++++++------
 bin/v-update-sys-rrd-mysql        | 12 ++++++------
 bin/v-update-sys-rrd-net          | 12 ++++++------
 bin/v-update-sys-rrd-nginx        | 12 ++++++------
 bin/v-update-sys-rrd-pgsql        | 12 ++++++------
 bin/v-update-sys-rrd-ssh          | 12 ++++++------
 web/templates/admin/list_rrd.html |  4 ++--
 12 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/bin/v-update-sys-rrd-apache2 b/bin/v-update-sys-rrd-apache2
index 885882be..bdd0e226 100755
--- a/bin/v-update-sys-rrd-apache2
+++ b/bin/v-update-sys-rrd-apache2
@@ -69,16 +69,16 @@ fi
 # Updating rrd graph
 rrdtool graph $RRD/web/$period-apache2.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Connections" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-ftp b/bin/v-update-sys-rrd-ftp
index 8f926a4e..6f9e502e 100755
--- a/bin/v-update-sys-rrd-ftp
+++ b/bin/v-update-sys-rrd-ftp
@@ -63,16 +63,16 @@ fi
 # Updating rrd graph
 rrdtool graph $RRD/ftp/$period-ftp.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Connections" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-httpd b/bin/v-update-sys-rrd-httpd
index fefcb005..0a56b992 100755
--- a/bin/v-update-sys-rrd-httpd
+++ b/bin/v-update-sys-rrd-httpd
@@ -69,16 +69,16 @@ fi
 # Updating rrd graph
 rrdtool graph $RRD/web/$period-httpd.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Connections" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-la b/bin/v-update-sys-rrd-la
index d0093777..9d8b312b 100755
--- a/bin/v-update-sys-rrd-la
+++ b/bin/v-update-sys-rrd-la
@@ -64,21 +64,21 @@ fi
 # Updating graph
 rrdtool graph $RRD/la/$period-la.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Points" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
-    -c "FRAME#484243" \
-    -c "ARROW#FFFFFF" \
+    -c "FRAME#777777" \
+    -c "ARROW#555555" \
     DEF:la=$RRD/la/la.rrd:LA:AVERAGE \
     DEF:pr=$RRD/la/la.rrd:PR:AVERAGE \
     COMMENT:'\r' \
diff --git a/bin/v-update-sys-rrd-mail b/bin/v-update-sys-rrd-mail
index 1f01b52d..15d70f71 100755
--- a/bin/v-update-sys-rrd-mail
+++ b/bin/v-update-sys-rrd-mail
@@ -62,16 +62,16 @@ fi
 # Updating daily graph
 rrdtool graph $RRD/mail/$period-mail.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Queue Size" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-mem b/bin/v-update-sys-rrd-mem
index 515ec280..2e767dbf 100755
--- a/bin/v-update-sys-rrd-mem
+++ b/bin/v-update-sys-rrd-mem
@@ -72,16 +72,16 @@ fi
 # Updating rrd graph
 rrdtool graph $RRD/mem/$period-mem.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Mbytes" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-mysql b/bin/v-update-sys-rrd-mysql
index d2f24824..8b9056aa 100755
--- a/bin/v-update-sys-rrd-mysql
+++ b/bin/v-update-sys-rrd-mysql
@@ -99,16 +99,16 @@ for host in $hosts; do
     # Updating daily graph
     rrdtool graph  $RRD/db/$period-mysql_$host.png \
         --imgformat PNG \
-        --height="120" \
-        --width="440" \
+        --height="150" \
+        --width="670" \
         --start "$start" \
         --end "$end" \
         --vertical-label "Queries" \
         --x-grid "$grid" \
-        -c "BACK#7a766d" \
-        -c "SHADEA#7a766d" \
-        -c "SHADEB#7a766d" \
-        -c "FONT#FFFFFF" \
+        -c "BACK#ffffff" \
+        -c "SHADEA#ffffff" \
+        -c "SHADEB#ffffff" \
+        -c "FONT#555555" \
         -c "CANVAS#302c2d" \
         -c "GRID#666666" \
         -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net
index d8daaa17..979bff53 100755
--- a/bin/v-update-sys-rrd-net
+++ b/bin/v-update-sys-rrd-net
@@ -74,16 +74,16 @@ for iface in $ifaces; do
     # Updating rrd graph
     rrdtool graph $RRD/net/$period-$iface.png \
         --imgformat PNG \
-        --height="120" \
-        --width="440" \
+        --height="150" \
+        --width="670" \
         --start "$start" \
         --end "$end" \
         --vertical-label "KBytes" \
         --x-grid "$grid" \
-        -c "BACK#7a766d" \
-        -c "SHADEA#7a766d" \
-        -c "SHADEB#7a766d" \
-        -c "FONT#FFFFFF" \
+        -c "BACK#ffffff" \
+        -c "SHADEA#ffffff" \
+        -c "SHADEB#ffffff" \
+        -c "FONT#555555" \
         -c "CANVAS#302c2d" \
         -c "GRID#666666" \
         -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-nginx b/bin/v-update-sys-rrd-nginx
index 7b75f7a7..b1b0b3e8 100755
--- a/bin/v-update-sys-rrd-nginx
+++ b/bin/v-update-sys-rrd-nginx
@@ -61,16 +61,16 @@ fi
 # Updating rrd graph
 rrdtool graph $RRD/web/$period-nginx.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Connections" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-pgsql b/bin/v-update-sys-rrd-pgsql
index 18eaa2ef..aeeb9582 100755
--- a/bin/v-update-sys-rrd-pgsql
+++ b/bin/v-update-sys-rrd-pgsql
@@ -104,16 +104,16 @@ for host in $hosts; do
     # Updating rrd graph
     rrdtool graph  $RRD/db/$period-pgsql_$host.png \
         --imgformat PNG \
-        --height="120" \
-        --width="440" \
+        --height="150" \
+        --width="670" \
         --start "$start" \
         --end "$end" \
         --vertical-label "Queries" \
         --x-grid "$grid" \
-        -c "BACK#7a766d" \
-        -c "SHADEA#7a766d" \
-        -c "SHADEB#7a766d" \
-        -c "FONT#FFFFFF" \
+        -c "BACK#ffffff" \
+        -c "SHADEA#ffffff" \
+        -c "SHADEB#ffffff" \
+        -c "FONT#555555" \
         -c "CANVAS#302c2d" \
         -c "GRID#666666" \
         -c "MGRID#AAAAAA" \
diff --git a/bin/v-update-sys-rrd-ssh b/bin/v-update-sys-rrd-ssh
index aaaa8b97..44c6d167 100755
--- a/bin/v-update-sys-rrd-ssh
+++ b/bin/v-update-sys-rrd-ssh
@@ -62,16 +62,16 @@ fi
 # Updating daily graph
 rrdtool graph $RRD/ssh/$period-ssh.png \
     --imgformat PNG \
-    --height="120" \
-    --width="440" \
+    --height="150" \
+    --width="670" \
     --start "$start" \
     --end "$end" \
     --vertical-label "Connections" \
     --x-grid "$grid" \
-    -c "BACK#7a766d" \
-    -c "SHADEA#7a766d" \
-    -c "SHADEB#7a766d" \
-    -c "FONT#FFFFFF" \
+    -c "BACK#ffffff" \
+    -c "SHADEA#ffffff" \
+    -c "SHADEB#ffffff" \
+    -c "FONT#555555" \
     -c "CANVAS#302c2d" \
     -c "GRID#666666" \
     -c "MGRID#AAAAAA" \
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index fc32c6a8..524da176 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -65,8 +65,8 @@
                                 <td style="vertical-align:top; padding:4px 0 0 0;" width="630px">
                                     <table>
                                         </tr>
-                                            <td style="background: #7a766d;" width="630px" height="250px">
-                                                <img style="padding: 0 0 0 36px;" src="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
+                                            <td>
+                                                <img src="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
                                             </td>
                                         </tr>
                                     </table>