fix bug due to ds_graph_opts change

XavierBerger · Jul 9, 2013 · 17fe99b · 17fe99b
1 parent 7df47cf
commit 17fe99b
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/rpimonitor/default.conf b/rpimonitor/default.conf
@@ -283,12 +283,16 @@ dynamic.13.rrd=GAUGE
 #    <data name> is the name of the dynamic and static extracted as 
 #    described in the KPI extraction section. 
 # 
-#  web.statistics.<page id>.content.<statistic id>.ds_graph_opts.<data name>.label=<label>
+#  web.statistics.<page id>.content.<statistic id>.ds_graph_options.<data name>.label=<label>
 #    <data name> same as the previous <data name>
 #    <label> Label to display in legends. It is possible to setup other parameters 
-#    of ds_graph_opts. refer to the following web page for details:
+#    of ds_graph_options. Refer to the following web page for details:
 #    http://javascriptrrd.sourceforge.net/docs/javascriptrrd_v0.5.0/doc/lib/rrdFlot_js.html
-#
+#  
+#  web.statistics.<page id>.content.<statistic id>.graph_options.<parameter>=<value>
+#    <parameter> and <value> can be find into the same web page as previous
+#    parameter. This allow to customize the graph and axis.
+#  
 #######################################################################
 
 #web.friends.1.name=Raspberry Pi
@@ -350,56 +354,56 @@ web.statistics.1.content.1.name=CPU Loads
 web.statistics.1.content.1.graph.1=load1
 web.statistics.1.content.1.graph.2=load5
 web.statistics.1.content.1.graph.3=load15
-web.statistics.1.content.1.ds_graph_opts.load1.label=Load 1min 
-web.statistics.1.content.1.ds_graph_opts.load5.label=Load 5min 
-web.statistics.1.content.1.ds_graph_opts.load15.label=Load 15min 
+web.statistics.1.content.1.ds_graph_options.load1.label=Load 1min 
+web.statistics.1.content.1.ds_graph_options.load5.label=Load 5min 
+web.statistics.1.content.1.ds_graph_options.load15.label=Load 15min 
 
 web.statistics.1.content.2.name=Network
 web.statistics.1.content.2.graph.1=net_send
 web.statistics.1.content.2.graph.2=net_received
-web.statistics.1.content.2.ds_graph_opts.net_send.label=Upload bandwidth (bits)
-web.statistics.1.content.2.ds_graph_opts.net_send.lines={ fill: true }
-web.statistics.1.content.2.ds_graph_opts.net_send.color="#FF7777"
-web.statistics.1.content.2.ds_graph_opts.net_received.label=Download bandwidth (bits)
-web.statistics.1.content.2.ds_graph_opts.net_received.lines={ fill: true }
-web.statistics.1.content.2.ds_graph_opts.net_received.color="#77FF77"
+web.statistics.1.content.2.ds_graph_options.net_send.label=Upload bandwidth (bits)
+web.statistics.1.content.2.ds_graph_options.net_send.lines={ fill: true }
+web.statistics.1.content.2.ds_graph_options.net_send.color="#FF7777"
+web.statistics.1.content.2.ds_graph_options.net_received.label=Download bandwidth (bits)
+web.statistics.1.content.2.ds_graph_options.net_received.lines={ fill: true }
+web.statistics.1.content.2.ds_graph_options.net_received.color="#77FF77"
 
 web.statistics.1.content.3.name=Disks - boot
 web.statistics.1.content.3.graph.1=sdcard_boot_total
 web.statistics.1.content.3.graph.2=sdcard_boot_used
-web.statistics.2.content.3.ds_graph_opts.sdcard_boot_total.label=Size of /boot (MB)
-web.statistics.1.content.3.ds_graph_opts.sdcard_boot_total.color="#FF7777"
-web.statistics.1.content.3.ds_graph_opts.sdcard_boot_used.label=Used on /boot (MB)
-web.statistics.1.content.3.ds_graph_opts.sdcard_boot_used.lines={ fill: true }
-web.statistics.1.content.3.ds_graph_opts.sdcard_boot_used.color="#7777FF"
+web.statistics.2.content.3.ds_graph_options.sdcard_boot_total.label=Size of /boot (MB)
+web.statistics.1.content.3.ds_graph_options.sdcard_boot_total.color="#FF7777"
+web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.label=Used on /boot (MB)
+web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.lines={ fill: true }
+web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.color="#7777FF"
 
 web.statistics.1.content.4.name=Disks - root
 web.statistics.1.content.4.graph.1=sdcard_root_total
 web.statistics.1.content.4.graph.2=sdcard_root_used
-web.statistics.1.content.4.ds_graph_opts.sdcard_root_total.label=Size of / (MB)
-web.statistics.1.content.4.ds_graph_opts.sdcard_root_total.color="#FF7777"
-web.statistics.1.content.4.ds_graph_opts.sdcard_root_used.label=Used on / (MB)
-web.statistics.1.content.4.ds_graph_opts.sdcard_root_used.lines={ fill: true }
-web.statistics.1.content.4.ds_graph_opts.sdcard_root_used.color="#7777FF"
+web.statistics.1.content.4.ds_graph_options.sdcard_root_total.label=Size of / (MB)
+web.statistics.1.content.4.ds_graph_options.sdcard_root_total.color="#FF7777"
+web.statistics.1.content.4.ds_graph_options.sdcard_root_used.label=Used on / (MB)
+web.statistics.1.content.4.ds_graph_options.sdcard_root_used.lines={ fill: true }
+web.statistics.1.content.4.ds_graph_options.sdcard_root_used.color="#7777FF"
 
 web.statistics.1.content.5.name=Swap
 web.statistics.1.content.5.graph.1=swap_total
 web.statistics.1.content.5.graph.2=swap_used
-web.statistics.1.content.5.ds_graph_opts.swap_total.label=Swap size (MB)
-web.statistics.1.content.5.ds_graph_opts.swap_total.color="#FF7777"
-web.statistics.1.content.5.ds_graph_opts.swap_used.label=Swap used (MB)
-web.statistics.1.content.5.ds_graph_opts.swap_used.lines={ fill: true }
-web.statistics.1.content.5.ds_graph_opts.swap_used.color="#7777FF"
+web.statistics.1.content.5.ds_graph_options.swap_total.label=Swap size (MB)
+web.statistics.1.content.5.ds_graph_options.swap_total.color="#FF7777"
+web.statistics.1.content.5.ds_graph_options.swap_used.label=Swap used (MB)
+web.statistics.1.content.5.ds_graph_options.swap_used.lines={ fill: true }
+web.statistics.1.content.5.ds_graph_options.swap_used.color="#7777FF"
 
 web.statistics.1.content.6.name=Memory
 web.statistics.1.content.6.graph.1=memory_free
-web.statistics.1.content.6.ds_graph_opts.memory_free.label=Free Memory (MB)
+web.statistics.1.content.6.ds_graph_options.memory_free.label=Free Memory (MB)
 
 web.statistics.1.content.7.name=Uptime
 web.statistics.1.content.7.graph.1=uptime
-web.statistics.1.content.7.ds_graph_opts.uptime.label=Uptime (s)
+web.statistics.1.content.7.ds_graph_options.uptime.label=Uptime (s)
 
 web.statistics.1.content.8.name=Temperature
 web.statistics.1.content.8.graph.1=soc_temp
-web.statistics.1.content.8.ds_graph_opts.soc_temp.label=Core temperature (deg C)
+web.statistics.1.content.8.ds_graph_options.soc_temp.label=Core temperature (deg C)