Update graphInfluxDB.py

This commit is contained in:
Robert Chacón 2022-12-01 21:22:17 -07:00 committed by GitHub
parent d02a9be270
commit 4fc9dc9350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,7 @@ import psutil
from influxdb_client import InfluxDBClient, Point
from influxdb_client.client.write_api import SYNCHRONOUS
from ispConfig import interfaceA, interfaceB, influxDBEnabled, influxDBBucket, influxDBOrg, influxDBtoken, influxDBurl, fqOrCAKE
from ispConfig import interfaceA, interfaceB, influxDBEnabled, influxDBBucket, influxDBOrg, influxDBtoken, influxDBurl, sqm
def getInterfaceStats(interface):
@ -79,7 +79,7 @@ def getCircuitBandwidthStats(subscriberCircuits, tinsStats):
else:
overloadFactor = 0.0
if 'cake diffserv4' in fqOrCAKE:
if 'cake diffserv4' in sqm:
tinCounter = 1
for tin in element['tins']:
sent_packets = float(tin['sent_packets'])
@ -106,7 +106,7 @@ def getCircuitBandwidthStats(subscriberCircuits, tinsStats):
circuit['stats']['currentQuery']['packetsSent' + dirSuffix] = packets
circuit['stats']['currentQuery']['overloadFactor' + dirSuffix] = overloadFactor
#if 'cake diffserv4' in fqOrCAKE:
#if 'cake diffserv4' in sqm:
# circuit['stats']['currentQuery']['tins'] = theseTins
circuit['stats']['currentQuery']['time'] = datetime.now().isoformat()
@ -435,7 +435,7 @@ def refreshBandwidthGraphs():
# print("Added " + str(len(queriesToSend)) + " points to InfluxDB.")
queriesToSendCount += len(queriesToSend)
if 'cake diffserv4' in fqOrCAKE:
if 'cake diffserv4' in sqm:
queriesToSend = []
listOfTins = ['Bulk', 'BestEffort', 'Video', 'Voice']
for tin in listOfTins: