From: Michael Poetters <michael@poetters.net>
Date: Fri, 1 Mar 2019 21:56:36 +0000 (+0100)
Subject: nut: split power and realpower into separate type_instances, removed realpower from... 
X-Git-Tag: collectd-5.11.0~25^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff4c9796a90239b415e89760a154eafa10aeb303;p=thirdparty%2Fcollectd.git

nut: split power and realpower into separate type_instances, removed realpower from types.db again
---

diff --git a/src/nut.c b/src/nut.c
index 4aa6b9399..4d3018792 100644
--- 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 20ad9603a..e9de64fc5 100644
--- 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