nut: split power and realpower into separate type_instances, removed realpower from...

diff --git a/src/nut.c b/src/nut.c
index 4aa6b9399d713f3b15c8e5f03dca2836f3590ccf..4d3018792fcb8dbf64a741f8cca9819ebfdd1f74 100644 (file)
--- a/src/nut.c
+++ b/src/nut.c
@@ -316,9 +316,9 @@ static int nut_read(user_data_t *user_data) {
       else if (strcmp("output.voltage", key) == 0)
         nut_submit(ups, "voltage", "output", value);
       else if (strcmp("output.realpower", key) == 0)
-        nut_submit(ups, "realpower", "output", value);
+        nut_submit(ups, "power", "watt-output", value);
       else if (strcmp("output.power", key) == 0)
-        nut_submit(ups, "power", "output", value);
+        nut_submit(ups, "power", "voltampere-output", value);
     } else if (strncmp("ups.", key, 4) == 0) {
       if (strcmp("ups.load", key) == 0)
         nut_submit(ups, "percent", "load", value);

diff --git a/src/types.db b/src/types.db
index 20ad9603a4b2d3ec12ee09f76757ed01f6790080..e9de64fc5b5352fed81e53c60764975512bc12dd 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -212,7 +212,6 @@ ps_vm                   value:GAUGE:0:9223372036854775807
 pstates_enabled         value:GAUGE:0:1
 pubsub                  value:GAUGE:0:U
 queue_length            value:GAUGE:0:U
-realpower              value:GAUGE:U:U
 records                 value:GAUGE:0:U
 redis_command_cputime   value:DERIVE:0:U
 requests                value:GAUGE:0:U