From: rinigus <rinigus.git@gmail.com>
Date: Wed, 7 Sep 2016 08:10:27 +0000 (+0300)
Subject: battery plugin, statefs backend: use power to report values
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1795%2Fhead;p=thirdparty%2Fcollectd.git

battery plugin, statefs backend: use power to report values
---

diff --git a/src/battery_statefs.c b/src/battery_statefs.c
index 2c68787c0..53730ed0e 100644
--- a/src/battery_statefs.c
+++ b/src/battery_statefs.c
@@ -116,7 +116,7 @@ int battery_read_statefs(void) {
     battery_submit("energy_wh", value * 1e-6, NULL); // from uWh to Wh
 
   if (getvalue(STATEFS_ROOT "Power", &value))
-    battery_submit("power_battery", value * 1e-6, NULL); // from uW to W
+    battery_submit("power", value * 1e-6, NULL); // from uW to W
 
   if (getvalue(STATEFS_ROOT "Temperature", &value))
     battery_submit("temperature", value * 0.1, NULL); // from 10xC to C
diff --git a/src/types.db b/src/types.db
index 6c9692304..128733fa7 100644
--- a/src/types.db
+++ b/src/types.db
@@ -177,7 +177,6 @@ ping_droprate           value:GAUGE:0:100
 ping_stddev             value:GAUGE:0:65535
 players                 value:GAUGE:0:1000000
 power                   value:GAUGE:0:U
-power_battery           value:GAUGE:U:U
 pressure                value:GAUGE:0:U
 protocol_counter        value:DERIVE:0:U
 ps_code                 value:GAUGE:0:9223372036854775807