Add _total suffix to counter metrics

This commit is contained in:
Max 2024-03-22 16:05:10 +01:00
parent 54d525551a
commit 83eac2787d

View File

@ -27,7 +27,7 @@ numeric_modes = {
metric_data = { metric_data = {
"dc_voltage_volts": ["gauge", "Input bus voltage"], "dc_voltage_volts": ["gauge", "Input bus voltage"],
"meter_energy_watthours": ["counter", "Power meter"], "meter_energy_watthours_total": ["counter", "Power meter"],
"temperature_celsius": ["gauge", "Temperature"], "temperature_celsius": ["gauge", "Temperature"],
"inverter_mode": ["gauge", "Inverter state (0=off, 3=producing, 5=fault)"], "inverter_mode": ["gauge", "Inverter state (0=off, 3=producing, 5=fault)"],
"ac_phase_volts": ["gauge", "Output bus phase voltage"], "ac_phase_volts": ["gauge", "Output bus phase voltage"],
@ -89,7 +89,7 @@ def collect():
point = tech[-1] point = tech[-1]
date = ptime(point['date']) date = ptime(point['date'])
yield (date, 'dc_voltage_volts', {}, point.get('dcVoltage')) yield (date, 'dc_voltage_volts', {}, point.get('dcVoltage'))
yield (date, 'meter_energy_watthours', {'meter': 'production'}, point.get('totalEnergy')) yield (date, 'meter_energy_watthours_total', {'meter': 'production'}, point.get('totalEnergy'))
yield (date, 'temperature_celsius', {}, point.get('temperature')) yield (date, 'temperature_celsius', {}, point.get('temperature'))
yield (date, 'inverter_mode', {}, numeric_mode(point.get('inverterMode'))) yield (date, 'inverter_mode', {}, numeric_mode(point.get('inverterMode')))
yield (date, 'ac_phase_volts', {'phase':'1-2'}, point.get('vL1To2')) yield (date, 'ac_phase_volts', {'phase':'1-2'}, point.get('vL1To2'))
@ -109,7 +109,7 @@ def collect():
for m in ms: for m in ms:
point = m['values'][-1] point = m['values'][-1]
date = ptime(point['date']) date = ptime(point['date'])
yield (date, 'meter_energy_watthours', {'meter': m['meterType'].lower()}, point['value']) yield (date, 'meter_energy_watthours_total', {'meter': m['meterType'].lower()}, point['value'])
def format_metrics(entries): def format_metrics(entries):
collected = defaultdict(list) collected = defaultdict(list)