Introduce Collector for Power Supply Class

[shaardie]

Use the powerSupplyClass from procfs and show metrics about the power supplies from /sys/class/power_supply as wished in issue #676.

These changes are based in the commit 6ed1f7e in procfs and therefore the depedency is updated.

[discordianfish]

Thanks for the PR! See comments.

[shaardie]

Unfortunately I found a bug in the prometheus/procfs, see prometheus/procfs#145 which has to be fixed first. I already created a Pull Request prometheus/procfs#146

[shaardie]

Jeah! My procfs fix was merged, but unfortunately I get a compiling error against the latest procfs version, see #1307. That has to be fixed first...

[pgier]

@shaardie The procfs module should be good now, can you rebase your changes?

[discordianfish]

@shaardie Sorry for the delay! Are you still interested in updating this PR?

[shaardie]

Yes, I already took a small look into this, but it seems like I have to change some more files to make it work again. I will do this as soon as I have time for it. Thanks for applying the changes in procfs, btw.

[shaardie]

I have updated the Pull Request. Unfortunately One automatic check failed, but I can not see what this failure is about.

[SuperQ]

There is a second e2e test for PowerPC that probably needs updating.

[shaardie]

Too bad. I have no access to one. Maybe someone can help with this.

[SuperQ]

You don't need access to one, it's just a matter of copy-n-paste the changes so the test will pass.

--- collector/fixtures/e2e-64k-page-output.txt  2019-08-02 12:47:08.000000000 -0400
+++ /tmp/node_exporter_e2e_test.0chWLl/e2e-output.txt   2019-08-02 13:01:42.041089380 -0400
@@ -2382,6 +2382,40 @@
 # HELP node_nfsd_server_threads Total number of NFSd kernel threads that are running.
 # TYPE node_nfsd_server_threads gauge
 node_nfsd_server_threads 8
+# HELP node_power_supply_capacity capacity value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_capacity gauge
+node_power_supply_capacity{power_supply="BAT0"} 81
+# HELP node_power_supply_cyclecount cyclecount value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_cyclecount gauge
+node_power_supply_cyclecount{power_supply="BAT0"} 0
+# HELP node_power_supply_energy_full energy_full value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_energy_full gauge
+node_power_supply_energy_full{power_supply="BAT0"} 4.507e+07
+# HELP node_power_supply_energy_full_design energy_full_design value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_energy_full_design gauge
+node_power_supply_energy_full_design{power_supply="BAT0"} 4.752e+07
+# HELP node_power_supply_energy_now energy_now value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_energy_now gauge
+node_power_supply_energy_now{power_supply="BAT0"} 3.658e+07
+# HELP node_power_supply_info info of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_info gauge
+node_power_supply_info{power_supply="AC",type="Mains"} 1
+node_power_supply_info{capacity_level="Normal",manufacturer="LGC",model_name="LNV-45N1",power_supply="BAT0",serial_number="38109",status="Discharging",technology="Li-ion",type="Battery"} 1
+# HELP node_power_supply_online online value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_online gauge
+node_power_supply_online{power_supply="AC"} 0
+# HELP node_power_supply_power_now power_now value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_power_now gauge
+node_power_supply_power_now{power_supply="BAT0"} 5.002e+06
+# HELP node_power_supply_present present value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_present gauge
+node_power_supply_present{power_supply="BAT0"} 1
+# HELP node_power_supply_voltage_min_design voltage_min_design value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_voltage_min_design gauge
+node_power_supply_voltage_min_design{power_supply="BAT0"} 1.08e+07
+# HELP node_power_supply_voltage_now voltage_now value of /sys/class/power_supply/<power_supply>.
+# TYPE node_power_supply_voltage_now gauge
+node_power_supply_voltage_now{power_supply="BAT0"} 1.166e+07
 # HELP node_pressure_cpu_waiting_seconds_total Total time in seconds that processes have waited for CPU time
 # TYPE node_pressure_cpu_waiting_seconds_total counter
 node_pressure_cpu_waiting_seconds_total 14.036781000000001
@@ -2481,6 +2515,7 @@
 node_scrape_collector_success{collector="netstat"} 1
 node_scrape_collector_success{collector="nfs"} 1
 node_scrape_collector_success{collector="nfsd"} 1
+node_scrape_collector_success{collector="powersupplyclass"} 1
 node_scrape_collector_success{collector="pressure"} 1
 node_scrape_collector_success{collector="processes"} 1
 node_scrape_collector_success{collector="qdisc"} 1

[SuperQ]

Mostly good. I would like to adjust some of the exposed metrics and names to better fit with Prometheus naming conventions and best practices.

See: https://prometheus.io/docs/practices/naming/

[shaardie]

Unfortunately procfs seems to be broken since the refactoring. I created a pull request prometheus/procfs#206 to fix this. After that I could add the proposals to this.

[shaardie]

The pull request to procfs was accepted, so the version has to be update to be able to include this.

[pgier]

@shaardie procfs has been updated, so you should be good to go on this.

[discordianfish]

Great! LGTM

[shaardie]

Is there anything I can do to speed this up?

[discordianfish]

We still need another review, sorry!
@SuperQ or @pgier can approve and merge it.

[shaardie]

@SuperQ I changed what you asked for.

[SuperQ]

LGTM, Thanks!