Merge branch 'master' into dev

dbsqp · Apr 12, 2021 · 0a61d36 · 0a61d36
2 parents 7a46e4f + c37b631
commit 0a61d36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/image-dev.yml b/.github/workflows/image-dev.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build-Dev
 
 on:
   push:

diff --git a/.github/workflows/image-master.yml b/.github/workflows/image-master.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build-Master
 
 on:
   push:

diff --git a/nut-influxdbv2-exporter.py b/nut-influxdbv2-exporter.py
@@ -70,6 +70,7 @@
 write_api = client.write_api(write_options=SYNCHRONOUS)
 
 
+
 # define convert
 def convert_to_type(s):
     try:
@@ -100,7 +101,7 @@ def construct_object(data, remove_keys, host):
                 fields[k] = convert_to_type(v)
 
     #watts = float(nut_watts) if nut_watts else float(fields['ups.realpower.nominal'])
-    #fields['ups.power'] = watts * 0.01 * fields['ups.load']
+    #fields['ups.watts'] = watts * 0.01 * fields['ups.load']
 
     result ={
             'measurement': 'ups',
@@ -144,6 +145,7 @@ def construct_object(data, remove_keys, host):
                 print(tb)
             print("Error getting data from NUT at "+ipaddress+" "+host)
             exit(1)
+
 
         json_body = construct_object(ups_data, remove_keys, host)