database.h: Add time variable to DEFINE_IMAGE macro

It will make it possible to conviniently define how many
days/weeks/months/years to draw in the image. It is no longer needed
to have the unit fixed to 1.

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

diff --git a/database.h b/database.h
index ba54acf74bc68a35c798c6e4efe9fd4cd4692a77..6e4f7e0b5ccc08da49cf8a3e82ecc5f14f3107bc 100644 (file)
--- a/database.h
+++ b/database.h
@@ -249,12 +249,12 @@ const char *systempoptions[] = {
 #define xstr(s) str(s)
 #define str(s) #s
 
-#define DEFINE_IMAGE(rrdname, _filename, _width, _height)              \
+#define DEFINE_IMAGE(rrdname, _filename, _width, _height, time)                \
        static struct rrd_image rrdname ## daily = {                    \
                .image_filename = _filename "_daily.png",               \
                .width = _width,                                        \
                .height = _height,                                      \
-               .timestart = "end-1d",                                  \
+               .timestart = "end-" #time "d",                          \
                .timeend = "now",                                       \
                .imageformat = "PNG",                                   \
                .options = (char **)&rrdname ## options,                \
@@ -264,7 +264,7 @@ const char *systempoptions[] = {
                .image_filename = _filename "_weekly.png",              \
                .width = _width,                                        \
                .height = _height,                                      \
-               .timestart = "end-1w",                                  \
+               .timestart = "end-" #time "w",                          \
                .timeend = "now",                                       \
                .imageformat = "PNG",                                   \
                .options = (char **)&rrdname ## options,                \
@@ -274,7 +274,7 @@ const char *systempoptions[] = {
                .image_filename = _filename "_monthly.png",             \
                .width = _width,                                        \
                .height = _height,                                      \
-               .timestart = "end-1m",                                  \
+               .timestart = "end-" #time "m",                          \
                .timeend = "now",                                       \
                .imageformat = "PNG",                                   \
                .options = (char **)&rrdname ## options,                \
@@ -284,18 +284,18 @@ const char *systempoptions[] = {
                .image_filename = _filename "_yearly.png",              \
                .width = _width,                                        \
                .height = _height,                                      \
-               .timestart = "end-1y",                                  \
+               .timestart = "end-" #time "y",                          \
                .timeend = "now",                                       \
                .imageformat = "PNG",                                   \
                .options = (char **)&rrdname ## options,                \
                .text = (char **)&rrdname ## text,                      \
        };
 
-DEFINE_IMAGE(cpu,      "/home/kaapeli/rrdd/sysinfo/images/cpu", 720, 480);
-DEFINE_IMAGE(mem,      "/home/kaapeli/rrdd/sysinfo/images/mem", 720, 480);
-DEFINE_IMAGE(systemp,  "/home/kaapeli/rrdd/sysinfo/images/systemp", 720, 480);
-DEFINE_IMAGE(eth0,     "/home/kaapeli/rrdd/sysinfo/images/eth0", 720, 200);
-DEFINE_IMAGE(eth1,     "/home/kaapeli/rrdd/sysinfo/images/eth1", 720, 200);
+DEFINE_IMAGE(cpu,      "/home/kaapeli/rrdd/sysinfo/images/cpu", 720, 480, 1);
+DEFINE_IMAGE(mem,      "/home/kaapeli/rrdd/sysinfo/images/mem", 720, 480, 1);
+DEFINE_IMAGE(systemp,  "/home/kaapeli/rrdd/sysinfo/images/systemp", 720,480,1);
+DEFINE_IMAGE(eth0,     "/home/kaapeli/rrdd/sysinfo/images/eth0", 720, 200, 1);
+DEFINE_IMAGE(eth1,     "/home/kaapeli/rrdd/sysinfo/images/eth1", 720, 200, 1);
 
 static struct rrd_image *cpu_mem_images[] = {
        &cpudaily,

diff --git a/power_database.h b/power_database.h
index 61ed415ac54ca03dd2c098f75229cb1739c73eeb..a843c4be97e0b99912756cb5a09f324d8f256876 100644 (file)
--- a/power_database.h
+++ b/power_database.h
@@ -198,12 +198,14 @@ const char *poweroptions[] = {
        0
 };
 
-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);
+DEFINE_IMAGE(power,    "/home/kaapeli/rrdd/power/images/power", 960, 480, 2);
+DEFINE_IMAGE(freq,     "/home/kaapeli/rrdd/power/images/freq", 960, 240, 2);
+DEFINE_IMAGE(deviation,        "/home/kaapeli/rrdd/power/images/deviation",
+       960, 240, 2);
+DEFINE_IMAGE(price,    "/home/kaapeli/rrdd/power/images/price", 960, 240, 2);
+DEFINE_IMAGE(consumption,"/home/kaapeli/rrdd/power/images/consumption",
+       960, 240, 2);
+DEFINE_IMAGE(import,   "/home/kaapeli/rrdd/power/images/import", 960, 240, 2);
 
 static struct rrd_image *power_images[] = {
        &powerdaily,
@@ -253,18 +255,18 @@ struct rrd_data_source power_sources[] = {
 };
 
 struct rrd_archive power_archives[] = {
-       ARCHIVE_ENTRY("AVERAGE", 0.5, 1, 480)
-       ARCHIVE_ENTRY("AVERAGE", 0.5, 7, 480)
-       ARCHIVE_ENTRY("AVERAGE", 0.5, 31, 480)
-       ARCHIVE_ENTRY("AVERAGE", 0.5, 365, 480)
-       ARCHIVE_ENTRY("MIN", 0.5, 1, 480)
-       ARCHIVE_ENTRY("MIN", 0.5, 7, 480)
-       ARCHIVE_ENTRY("MIN", 0.5, 31, 480)
-       ARCHIVE_ENTRY("MIN", 0.5, 365, 480)
-       ARCHIVE_ENTRY("MAX", 0.5, 1, 480)
-       ARCHIVE_ENTRY("MAX", 0.5, 7, 480)
-       ARCHIVE_ENTRY("MAX", 0.5, 31, 480)
-       ARCHIVE_ENTRY("MAX", 0.5, 365, 480)
+       ARCHIVE_ENTRY("AVERAGE", 0.5, 1, 960)
+       ARCHIVE_ENTRY("AVERAGE", 0.5, 7, 960)
+       ARCHIVE_ENTRY("AVERAGE", 0.5, 31, 960)
+       ARCHIVE_ENTRY("AVERAGE", 0.5, 365, 960)
+       ARCHIVE_ENTRY("MIN", 0.5, 1, 960)
+       ARCHIVE_ENTRY("MIN", 0.5, 7, 960)
+       ARCHIVE_ENTRY("MIN", 0.5, 31, 960)
+       ARCHIVE_ENTRY("MIN", 0.5, 365, 960)
+       ARCHIVE_ENTRY("MAX", 0.5, 1, 960)
+       ARCHIVE_ENTRY("MAX", 0.5, 7, 960)
+       ARCHIVE_ENTRY("MAX", 0.5, 31, 960)
+       ARCHIVE_ENTRY("MAX", 0.5, 365, 960)
        {},
 };