Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Fix metric names #17

Merged
merged 2 commits into from
Aug 2, 2023
Merged

Fix metric names #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
908b143
Enhance metric names in logging and writing stages
AlexGodbehere Aug 1, 2023
cc7e883
Change format of metric naming in writeApi.writePoint
AlexGodbehere Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions lib/mqttclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,24 @@ export default class MQTTClient {

if (value === null) return;

// Get the value after the last /
let metricName = birth.name.split('/').pop();

// Get the path as everything behind the last /
let path = birth.name.substring(0, birth.name.lastIndexOf("/"));

// Here we only currently store the InstanceUUID and SchemaUUID
// of the top-level birth certificate. It would be nice if we could
// also store the InstanceUUID and SchemaUUID of all nested schemas
// but unsure how to handle this in InfluxDB.

writeApi.useDefaultTags({
instance: birth.instance,
schema: birth.schema,
group: topic.address.group,
node: topic.address.node,
device: topic.address.device
device: topic.address.device,
path: path,
});


Expand All @@ -309,10 +321,10 @@ export default class MQTTClient {
// Validate
numVal = Number(value);
if (!Number.isInteger(numVal)) {
logger.warn(`${topic.address}/${birth.name} should be a ${birth.type} but received ${numVal}. Not recording.`);
logger.warn(`${topic.address}/${path}/${metricName} should be a ${birth.type} but received ${numVal}. Not recording.`);
return;
}
writeApi.writePoint(new Point(birth.name).intField('value', numVal));
writeApi.writePoint(new Point(`${metricName}:i`).intField('value', numVal));
break;
case "UInt8":
case "UInt16":
Expand All @@ -321,37 +333,37 @@ export default class MQTTClient {
// Validate
numVal = Number(value);
if (!Number.isInteger(numVal)) {
logger.warn(`${topic.address}/${birth.name} should be a ${birth.type} but received ${numVal}. Not recording.`);
logger.warn(`${topic.address}/${path}/${metricName} should be a ${birth.type} but received ${numVal}. Not recording.`);
return;
}
writeApi.writePoint(new Point(birth.name).uintField('value', numVal));
writeApi.writePoint(new Point(`${metricName}:u`).uintField('value', numVal));
break;
case "Float":
case "Double":
// Validate
numVal = Number(value);
if (isNaN(parseFloat(numVal))) {
logger.warn(`${topic.address}/${birth.name} should be a ${birth.type} but received ${numVal}. Not recording.`);
logger.warn(`${topic.address}/${path}/${metricName} should be a ${birth.type} but received ${numVal}. Not recording.`);
return;
}
writeApi.writePoint(new Point(birth.name).floatField('value', numVal));
writeApi.writePoint(new Point(`${metricName}:d`).floatField('value', numVal));
break;
case "Boolean":
if (typeof value != "boolean") {
logger.warn(`${topic.address}/${birth.name} should be a ${birth.type} but received ${value}. Not recording.`);
logger.warn(`${topic.address}/${path}/${metricName} should be a ${birth.type} but received ${value}. Not recording.`);
return;
}
writeApi.writePoint(new Point(birth.name).booleanField('value', value));
writeApi.writePoint(new Point(`${metricName}:b`).booleanField('value', value));
break;
default:
writeApi.writePoint(new Point(birth.name).stringField('value', value));
writeApi.writePoint(new Point(`${metricName}:s`).stringField('value', value));
break;

}

i++;

logger.debug(`Added to write buffer (${i}/${batchSize}): [${birth.type}] ${topic.address}/${birth.name} = ${value}`);
logger.debug(`Added to write buffer (${i}/${batchSize}): [${birth.type}] ${topic.address}/${path}/${metricName} = ${value}`);

if (i >= batchSize) {
this.flushBuffer(`${batchSize} point BATCH`);
Expand Down
Loading