X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-statistics%2Fluasrc%2Fstatistics%2Frrdtool%2Fdefinitions%2Fnut.lua;h=dd931969027c058ae08d2acea05774f36c569fdb;hp=8b04ab8b38795b5bc7942e502b38a7c1578584a0;hb=c9cd86916830505c1014ce93e648d158a46b7609;hpb=2a9b2107ba9fec08e7883e7eeb13bd37c555c623

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
index 8b04ab8b3..dd9319690 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
@@ -32,23 +32,24 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 
 			options = {
 				current_output  = { color = "00e000", title = "Output current", noarea=true, overlay=true },
-				current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true },
+				current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true }
 			}
 		}
 	}
 
 	local percentage = {
-		title = "%H: Battery charge on UPS \"%pi\"",
+		title = "%H: Battery charge/load on UPS \"%pi\"",
 		vlabel = "Percent",
 		y_min = "0",
 		y_max = "100",
 		number_format = "%5.1lf%%",
 		data = {
 			instances = {
-				percent = "charge"
+				percent = { "charge", "load" }
 			},
 			options = {
-				percent_charge = { color = "00ff00", title = "Charge level"  }
+				percent_charge = { color = "00ff00", title = "Charge level"  },
+				percent_load = { color = "ff0000", title = "Load"  }
 			}
 		}
 	}
@@ -78,10 +79,39 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 				timeleft = { "battery" }
 			},
 			options = {
-				timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/" }
+				timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/", noarea=true }
 			}
 		}
 	}
 
-	return { voltages, currents, percentage, temperature, timeleft }
+	local power = {
+		title = "%H: Power on UPS \"%pi\"",
+		vlabel = "Power",
+		number_format = "%5.1lf%%",
+		data = {
+			instances = {
+				power = { "ups" }
+			},
+			options = {
+				power_ups = { color = "00ff00", title = "Power level"  }
+			}
+		}
+	}
+
+	local frequencies = {
+		title = "%H: Frequencies on UPS \"%pi\"",
+		vlabel = "Hz",
+		number_format = "%5.1lfHz",
+		data = {
+			instances = {
+				frequency = { "input", "output" }
+			},
+
+			options = {
+				frequency_output  = { color = "00e000", title = "Output frequency", noarea=true, overlay=true },
+				frequency_input   = { color = "ffb000", title = "Input frequency", noarea=true, overlay=true }
+			}
+		}
+	}
+	return { voltages, currents, percentage, temperature, timeleft, power, frequencies }
 end