Add Report Display(#4)

diff --git a/karesansui/lib/const.py b/karesansui/lib/const.py
index 3a938e3..b1f95f2 100644 (file)
--- a/karesansui/lib/const.py
+++ b/karesansui/lib/const.py
@@ -474,7 +474,7 @@ GRAPH_FILENAME_TPL_UPTIME = "uptime.gif"
 GRAPH_FILENAME_TPL_USERS = "users.gif"
 
 GRAPH_COMMON_PARAM = [
-    "--font", "DEFAULT:0:IPAexGothic",
+#    "--font", "DEFAULT:0:IPAGothic",
     "--width", "600",
     "--height", "350",
     "--full-size-mode",
@@ -483,7 +483,7 @@ GRAPH_COMMON_PARAM = [
     "--color", "CANVAS#FFFFFF",
     "--color", "SHADEA#FFFFFF",
     "--color", "SHADEB#FFFFFF",
-    "--color", "GRID#FFFFFF00",
+    "--color", "GRID#DDDDDD",
     "--color", "MGRID#CCCCCC",
     "--color", "FONT#555555",
     "--color", "FRAME#FFFFFF",

diff --git a/karesansui/lib/rrd/cpu.py b/karesansui/lib/rrd/cpu.py
index 5b82103..73b73a6 100644 (file)
--- a/karesansui/lib/rrd/cpu.py
+++ b/karesansui/lib/rrd/cpu.py
@@ -32,16 +32,17 @@ def create_cpu_graph(graph_dir, rrd_dir, start, end, cpu_number):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,
                          "--title", "CPU-%s" % (str(cpu_number)),
                          "--vertical-label", "jiffies",
+                         "--units-length", "2",
                          "--upper-limit", "100",
                          "--lower-limit", "0",
                          "--rigid",
-                         "--alt-y-grid",
+#                         "--alt-y-grid",
                          "--start", start,
                          "--end",  end,
                          "--legend-direction", "bottomup",
@@ -53,47 +54,47 @@ def create_cpu_graph(graph_dir, rrd_dir, start, end, cpu_number):
                          "DEF:system=%s:value:AVERAGE" % (rrd_filename[5]),
                          "DEF:softirq=%s:value:AVERAGE" % (rrd_filename[6]),
                          "DEF:steal=%s:value:AVERAGE" % (rrd_filename[7]),
-                         "AREA:steal#F7FF13:Steal      ",
+                         "AREA:steal#F7FF13:Steal\t\t",
                          "GPRINT:steal:MIN:%8.2lf",
                          "GPRINT:steal:MAX:%8.2lf",
                          "GPRINT:steal:AVERAGE:%8.2lf",
                          "GPRINT:steal:LAST:%8.2lf\\n",
-                         "STACK:interrupt#F7FF13:Interrupt",
+                         "STACK:interrupt#F7FF13:Interrupt\t",
                          "GPRINT:interrupt:MIN:%8.2lf",
                          "GPRINT:interrupt:MAX:%8.2lf",
                          "GPRINT:interrupt:AVERAGE:%8.2lf",
                          "GPRINT:interrupt:LAST:%8.2lf\\n",
-                         "STACK:softirq#E7EF00:SoftIRQ  ",
+                         "STACK:softirq#E7EF00:SoftIRQ\t",
                          "GPRINT:softirq:MIN:%8.2lf",
                          "GPRINT:softirq:MAX:%8.2lf",
                          "GPRINT:softirq:AVERAGE:%8.2lf",
                          "GPRINT:softirq:LAST:%8.2lf\\n",
-                         "STACK:system#B5F100:System   ",
+                         "STACK:system#B5F100:System\t",
                          "GPRINT:system:MIN:%8.2lf",
                          "GPRINT:system:MAX:%8.2lf",
                          "GPRINT:system:AVERAGE:%8.2lf",
                          "GPRINT:system:LAST:%8.2lf\\n",
-                         "STACK:wait#B3EF00:Wait - IO",
+                         "STACK:wait#B3EF00:Wait - IO\t",
                          "GPRINT:wait:MIN:%8.2lf",
                          "GPRINT:wait:MAX:%8.2lf",
                          "GPRINT:wait:AVERAGE:%8.2lf",
                          "GPRINT:wait:LAST:%8.2lf\\n",
-                         "STACK:user#95C700:User        ",
+                         "STACK:user#95C700:User\t\t",
                          "GPRINT:user:MIN:%8.2lf",
                          "GPRINT:user:MAX:%8.2lf",
                          "GPRINT:user:AVERAGE:%8.2lf",
                          "GPRINT:user:LAST:%8.2lf\\n",
-                         "STACK:nice#80AA00:Nice        ",
+                         "STACK:nice#80AA00:Nice\t\t",
                          "GPRINT:nice:MIN:%8.2lf",
                          "GPRINT:nice:MAX:%8.2lf",
                          "GPRINT:nice:AVERAGE:%8.2lf",
                          "GPRINT:nice:LAST:%8.2lf\\n",
-                         "STACK:idle#FFFFFF:Idle       ",
-                         "GPRINT:idle:MIN:%8.2lf",
-                         "GPRINT:idle:MAX:%8.2lf",
-                         "GPRINT:idle:AVERAGE:%8.2lf",
-                         "GPRINT:idle:LAST:%8.2lf\\n",
-                         "COMMENT:                          MIN         MAX         AVE          NOW\\n",
+                         "STACK:idle#FFFFFF:Idle\t\t",
+                         "GPRINT:idle:MIN:%3.2lf\t",
+                         "GPRINT:idle:MAX:%3.2lf\t",
+                         "GPRINT:idle:AVERAGE:%3.2lf\t",
+                         "GPRINT:idle:LAST:%3.2lf\\n",
+                         "COMMENT:\t\t      MIN       MAX       AVE       NOW\\n",
                          "COMMENT: \\n",
                          )
 

diff --git a/karesansui/lib/rrd/df.py b/karesansui/lib/rrd/df.py
index 7146cb3..ca9dbe4 100644 (file)
--- a/karesansui/lib/rrd/df.py
+++ b/karesansui/lib/rrd/df.py
@@ -24,7 +24,7 @@ def create_df_graph(graph_dir, rrd_dir, start, end, dev):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/lib/rrd/disk.py b/karesansui/lib/rrd/disk.py
index 54ce3c5..2fead58 100644 (file)
--- a/karesansui/lib/rrd/disk.py
+++ b/karesansui/lib/rrd/disk.py
@@ -30,7 +30,7 @@ def create_disk_graph(graph_dir, rrd_dir, start, end, dev):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/lib/rrd/interface.py b/karesansui/lib/rrd/interface.py
index cdf6078..eac98be 100644 (file)
--- a/karesansui/lib/rrd/interface.py
+++ b/karesansui/lib/rrd/interface.py
@@ -18,7 +18,7 @@ from karesansui.lib.utils import is_readable
 
 def create_interface_graph(graph_dir, rrd_dir, start, end, dev):
     graph_filename = (GRAPH_FILENAME_TPL_INTERFACE % (dev, "packets"),
-                      GRAPH_FILENAME_TPL_INTERFACE % (dev, "octetss"),
+                      GRAPH_FILENAME_TPL_INTERFACE % (dev, "octets"),
                       GRAPH_FILENAME_TPL_INTERFACE % (dev, "errors"),
                       )
     rrd_filename = ("%s/interface/if_packets-%s.rrd" % (rrd_dir, dev),
@@ -28,11 +28,11 @@ def create_interface_graph(graph_dir, rrd_dir, start, end, dev):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,
-                         "--title", dev + "のパケット情報",
+                         "--title", "%s - packets" % (dev),
                          "--vertical-label", "Packets / sec",
                          "--start", start,
                          "--end",  end,
@@ -52,10 +52,9 @@ def create_interface_graph(graph_dir, rrd_dir, start, end, dev):
                          "STACK:tx#00FF00",
                          )
 
-
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[1]),
                          GRAPH_COMMON_PARAM,
-                         "--title", dev + "のトラフィック情報",
+                         "--title", "%s - traffic" % (dev),
                          "--vertical-label", "Octet / sec",
                          "--start", start,
                          "--end",  end,
@@ -77,7 +76,7 @@ def create_interface_graph(graph_dir, rrd_dir, start, end, dev):
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[2]),
                          GRAPH_COMMON_PARAM,
-                         "--title", dev + "のエラーパケット情報",
+                         "--title", "%s - errors" % (dev),
                          "--vertical-label", "Packets / sec",
                          "--start", start,
                          "--end",  end,

diff --git a/karesansui/lib/rrd/load.py b/karesansui/lib/rrd/load.py
index 8f4cb1c..e578732 100644 (file)
--- a/karesansui/lib/rrd/load.py
+++ b/karesansui/lib/rrd/load.py
@@ -24,7 +24,7 @@ def create_load_graph(graph_dir, rrd_dir, start, end):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/lib/rrd/memory.py b/karesansui/lib/rrd/memory.py
index 364b0eb..78ebeff 100644 (file)
--- a/karesansui/lib/rrd/memory.py
+++ b/karesansui/lib/rrd/memory.py
@@ -27,7 +27,7 @@ def create_memory_graph(graph_dir, rrd_dir, start, end):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/lib/rrd/uptime.py b/karesansui/lib/rrd/uptime.py
index 79e8e22..42e93e7 100644 (file)
--- a/karesansui/lib/rrd/uptime.py
+++ b/karesansui/lib/rrd/uptime.py
@@ -24,7 +24,7 @@ def create_uptime_graph(graph_dir, rrd_dir, start, end):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/lib/rrd/users.py b/karesansui/lib/rrd/users.py
index 546ac9a..6f3c8fc 100644 (file)
--- a/karesansui/lib/rrd/users.py
+++ b/karesansui/lib/rrd/users.py
@@ -24,7 +24,7 @@ def create_users_graph(graph_dir, rrd_dir, start, end):
 
     for filename in rrd_filename:
         if is_readable(filename) is False:
-            return ()
+            return []
 
     data = rrdtool.graph('%s/%s' % (graph_dir, graph_filename[0]),
                          GRAPH_COMMON_PARAM,

diff --git a/karesansui/static/css/report.css b/karesansui/static/css/report.css
new file mode 100644 (file)
index 0000000..7d8260c
--- /dev/null
+++ b/karesansui/static/css/report.css
@@ -0,0 +1,13 @@
+#report #report_tab {
+    background-color:#e4e4dd;
+    cursor: pointer;
+}
+
+#report #report_tab td {
+    font-size:10px;
+}
+
+#report #report_tab td.selected {
+    background-color: #A9CF15;
+}
+

diff --git a/karesansui/static/css/style.css b/karesansui/static/css/style.css
index 6da4591..99f57e1 100644 (file)
--- a/karesansui/static/css/style.css
+++ b/karesansui/static/css/style.css
@@ -29,3 +29,4 @@
 @import url('./storagepool.css');
 @import url('./tab.css');
 @import url('./accordion.css');
+@import url('./report.css');

diff --git a/karesansui/static/images/spinnerDefault.png b/karesansui/static/images/spinnerDefault.png
deleted file mode 100644 (file)
index de2c0f2..0000000
Binary files a/karesansui/static/images/spinnerDefault.png and /dev/null differ

diff --git a/karesansui/templates/default/hostby1report/hostby1report.part b/karesansui/templates/default/hostby1report/hostby1report.part
index a603338..e7deab5 100644 (file)
--- a/karesansui/templates/default/hostby1report/hostby1report.part
+++ b/karesansui/templates/default/hostby1report/hostby1report.part
@@ -12,8 +12,8 @@ $(document).ready(function(){
         var target = $(this).attr("id");
         var target_val = target.split("_");
 
-        $("#report_tab td").css("background-color", "#E4E4DD");
-        $(this).css("background-color", "#A9CF15");
+        $("#report_tab td.selected").removeClass("selected");
+        $(this).addClass("selected");
         $('#report_value').html('<div id="report_loading" align="center"><div style="padding-top:80px;">&nbsp;</div><img src="${ctx.homepath}/static/images/now-loading.gif" alt="Now Loading" /></div>');
 
         var query = "";
@@ -28,6 +28,10 @@ $(document).ready(function(){
             null);
     });
 
+    $("#report_refresh").click(function(){
+        $("#report_tab td.selected").click();
+    });
+
     $("#report_start_day").datepicker({altFormat: '${USER_DATE_FORMAT[2]}'});
     $("#report_end_day").datepicker({altFormat: '${USER_DATE_FORMAT[2]}'});
 
@@ -36,11 +40,11 @@ $(document).ready(function(){
 
     $("#report_start_time").timeEntry({
         show24Hours: true,
-        spinnerImage: "${ctx.homepath}/static/images/spinnerDefault.png"
+        spinnerImage: ""
     });
     $("#report_end_time").timeEntry({
         show24Hours: true,
-        spinnerImage: "${ctx.homepath}/static/images/spinnerDefault.png"
+        spinnerImage: ""
     });
 
     $("#report_start_time").timeEntry("setTime", new Date());
@@ -69,51 +73,51 @@ $(document).ready(function(){
                             <table width="99.8%" cellspacing="1" border="0" style="background-color:#bcbcbc;">
                                 <tr>
                                     <td rowspan="2" style="background-color:#E4E4DD; padding:0px; text-align:left;" bgcolor="#FFFFFF" width="20%" valign="top">
-                                        <table id="report_tab" width="100%" cellspacing="0" border="0" style="background-color:#e4e4dd; cursor: pointer;">
+                                        <table id="report_tab" width="100%" cellspacing="0" border="0">
                                             <tr>
-                                                <td id="report_tab_cpu" style="font-size:10px;">
+                                                <td id="report_tab_cpu">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('CPU')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_memory" style="font-size:10px;">
+                                                <td id="report_tab_memory">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Memory')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_df" style="font-size:10px;">
+                                                <td id="report_tab_df">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Disk Space')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_disk" style="font-size:10px;">
+                                                <td id="report_tab_disk">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Disk Performance')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_interface" style="font-size:10px;">
+                                                <td id="report_tab_interface">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Interface')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_load" style="font-size:10px;">
+                                                <td id="report_tab_load">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Load Average')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_uptime" style="font-size:10px;">
+                                                <td id="report_tab_uptime">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Uptime')}</span>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td id="report_tab_users" style="font-size:10px;">
+                                                <td id="report_tab_users">
                                                     <img src="${ctx.homepath}/static/images/storage-pool.png">
                                                     <span>${_('Users')}</span>
                                                 </td>
@@ -127,6 +131,7 @@ $(document).ready(function(){
                                         &nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;
                                         <input type="text" id="report_end_day" name="report_end_day" size="14" maxlength="10" />
                                         <input type="text" id="report_end_time" name="report_end_time" size="6" />
+                                        <input type="button" id="report_refresh" name="report_refresh" style="float:right;" value="${_('Refresh')}" />
                                     </td>
                                 </tr>
                                 <tr>