added year as an allowable time unit for display

[p2pool.git] / web-static / graphs.html

diff --git a/web-static/graphs.html b/web-static/graphs.html
index 8315d11..4e69f83 100644 (file)
--- a/web-static/graphs.html
+++ b/web-static/graphs.html
@@ -30,6 +30,8 @@
         
         <p>Periods: <span id="period_chooser"></span> Current: <span id="period_current"></span></p>
         
+        <div id="warnings"></div>
+        
         <h2>Local rate</h2>
         <svg id="local"></svg>
         
@@ -54,6 +56,12 @@
         <h2>Traffic rate</h2>
         <svg id="traffic_rate"></svg>
         
+        <h2>Bitcoind GetBlockTemplate Latency</h2>
+        <svg id="getwork_latency"></svg>
+        
+        <h2>Memory Usage</h2>
+        <svg id="memory_usage"></svg>
+        
         <script type="text/javascript">
             function compose() {
                 var funcs = arguments;
@@ -407,8 +415,22 @@
                 d3.json("/web/graph_data/traffic_rate/last_" + lowerperiod, function(data) {
                     plot(d3.select('#traffic_rate'), 'B/s', 'B', data_to_lines(data, function(line){ return parseInt(line.label) }), true);
                 });
+                
+                plot_later(d3.select("#getwork_latency"), "s", null, [
+                    {"url": "/web/graph_data/getwork_latency/last_" + lowerperiod, "color": "#FF0000", "label": "Getwork Latency"}
+                ], false);
+                
+                plot_later(d3.select("#memory_usage"), "B", null, [
+                    {"url": "/web/graph_data/memory_usage/last_" + lowerperiod, "color": "#FF0000", "label": "Memory Usage"}
+                ], false);
             }
             
+            d3.json('/local_stats', function(local_stats) {
+                d3.select('#warnings').selectAll().data(local_stats.warnings).enter().append('p')
+                    .text(function(w){ return 'Warning: ' + w })
+                    .attr('style', 'color:red;border:1px solid red;padding:5px');
+            })
+            
             periods = ["Hour", "Day", "Week", "Month", "Year"];
             d3.select("#period_chooser").selectAll().data(periods).enter().append("a")
                 .text(function(period) { return period })