power_database.h: Add images for power consumption and import

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/power_database.h b/power_database.h
index 7a7f8cb0e469f0a56015a22445860d8bcbd0587d..24c9fcab5eff3dd6d4a30aa456434ab087765994 100644 (file)
--- a/power_database.h
+++ b/power_database.h
@@ -119,6 +119,43 @@ const char *pricetext[] = {
        "COMMENT: \\n",
 };
 
+const char *consumptiontext[] = {
+       "DEF:kulut=" POWER_RRD_PATH ":kulutus:AVERAGE",
+       "DEF:tuota=" POWER_RRD_PATH ":tuotanto:AVERAGE",
+       "COMMENT:\\n",
+       blank,
+       "COMMENT:                   "
+       "MIN          MAX         AVG        Last\\n",
+       blank,
+       "LINE1:kulut#0000ff:Kulutus       ",
+       "GPRINT:kulut:MIN:" numfmt,
+       "GPRINT:kulut:MAX:" numfmt,
+       "GPRINT:kulut:AVERAGE:" numfmt,
+       "GPRINT:kulut:LAST:" numfmt "\\n",
+       blank,
+       "LINE1:tuota#00ff00:Tuotanto      ",
+       "GPRINT:tuota:MIN:" numfmt,
+       "GPRINT:tuota:MAX:" numfmt,
+       "GPRINT:tuota:AVERAGE:" numfmt,
+       "GPRINT:tuota:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
+};
+
+const char *importtext[] = {
+       "DEF:tuont=" POWER_RRD_PATH ":tuonti:AVERAGE",
+       "COMMENT:\\n",
+       blank,
+       "COMMENT:                   "
+       "MIN          MAX         AVG        Last\\n",
+       blank,
+       "LINE1:tuont#ff0000:Tuonti        ",
+       "GPRINT:tuont:MIN:" numfmt,
+       "GPRINT:tuont:MAX:" numfmt,
+       "GPRINT:tuont:AVERAGE:" numfmt,
+       "GPRINT:tuont:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
+};
+
 const char *freqoptions[] = {
        "--alt-autoscale",
        "--vertical-label", "Taajuus Hz",
@@ -138,6 +175,20 @@ const char *priceoptions[] = {
        0
 };
 
+const char *consumptionoptions[] = {
+       "--alt-autoscale",
+       "--vertical-label", "Teho MW",
+       "--units-exponent", "0",
+       0
+};
+
+const char *importoptions[] = {
+       "--alt-autoscale",
+       "--vertical-label", "Teho MW",
+       "--units-exponent", "0",
+       0
+};
+
 const char *poweroptions[] = {
        "--alt-autoscale-max",
        "--lower-limit", "0",
@@ -151,6 +202,8 @@ DEFINE_IMAGE(power, "/home/kaapeli/rrdd/power/images/power", 480, 480);
 DEFINE_IMAGE(freq,     "/home/kaapeli/rrdd/power/images/freq", 480, 240);
 DEFINE_IMAGE(deviation,        "/home/kaapeli/rrdd/power/images/deviation", 480, 240);
 DEFINE_IMAGE(price,    "/home/kaapeli/rrdd/power/images/price", 480, 240);
+DEFINE_IMAGE(consumption,"/home/kaapeli/rrdd/power/images/consumption", 480, 240);
+DEFINE_IMAGE(import,"/home/kaapeli/rrdd/power/images/import", 480, 240);
 
 static struct rrd_image *power_images[] = {
        &powerdaily,
@@ -169,12 +222,20 @@ static struct rrd_image *power_images[] = {
        &priceweekly,
        &pricemonthly,
        &priceyearly,
+       &consumptiondaily,
+       &consumptionweekly,
+       &consumptionmonthly,
+       &consumptionyearly,
+       &importdaily,
+       &importweekly,
+       &importmonthly,
+       &importyearly,
        0
 };
 
 struct rrd_data_source power_sources[] = {
-       SOURCE_ENTRY("kulutus", "GAUGE", 360, 0, 3000)
-       SOURCE_ENTRY("tuotanto", "GAUGE", 360, 0, 3000)
+       SOURCE_ENTRY("kulutus", "GAUGE", 360, 0, 20000)
+       SOURCE_ENTRY("tuotanto", "GAUGE", 360, 0, 20000)
        SOURCE_ENTRY("vesivoima", "GAUGE", 360, 0, 3000)
        SOURCE_ENTRY("ydinvoima", "GAUGE", 360, 0, 3000)
        SOURCE_ENTRY("lauhdevoima", "GAUGE", 360, 0, 3000)