6 Commits

Author SHA1 Message Date
c3cd6393d4 Merge branch 'release-2.0' 2021-12-06 13:01:31 +01:00
c97137f4a7 Merge branch 'release-2' 2021-12-06 12:47:14 +01:00
a13d81e9c0 Merge branch 'release-1.1' 2021-12-03 10:53:35 +01:00
059c02e243 Merge branch 'dev' into release-1.1 2021-12-03 10:53:13 +01:00
a610f209d5 Merge branch 'release-1.1' 2021-12-02 14:08:54 +01:00
6e05a0b45c Merge branch 'release-1.0' 2021-11-29 15:55:27 +01:00
2 changed files with 5 additions and 8 deletions

View File

@@ -60,7 +60,7 @@ if(errorMsg){
logger.debug("Get WriteApi & set default-hostname to", `'${env.HOSTNAME}'`); logger.debug("Get WriteApi & set default-hostname to", `'${env.HOSTNAME}'`);
const influxWriteApi = influxDb.getWriteApi(env.INFLUX_ORG, env.INFLUX_BUCKET, "us"); const influxWriteApi = influxDb.getWriteApi(env.INFLUX_ORG, env.INFLUX_BUCKET, "us");
//influxWriteApi.useDefaultTags({"hostname": env.HOSTNAME}); influxWriteApi.useDefaultTags({"hostname": env.HOSTNAME});
logger.info("Influx ok"); logger.info("Influx ok");
logger.info("Starting tcpdump.."); logger.info("Starting tcpdump..");

View File

@@ -4,12 +4,12 @@ const {Point} = require("@influxdata/influxdb-client");
/** Keys to always use as tags */ /** Keys to always use as tags */
const TAG_LIST = [ const TAG_LIST = [
"srcMac", "srcmac",
"dstMac", "dstmac",
"bssid", "bssid",
"frequency", "frequency",
"flags", "flags",
"packetType", "packettype",
]; ];
/** Measurement-name and corresponding field-key */ /** Measurement-name and corresponding field-key */
@@ -66,10 +66,7 @@ function tagObjectRecursively(point, tag, field, suffix = ""){
tagObjectRecursively(point, tag, value, `_${key}${suffix}`); tagObjectRecursively(point, tag, value, `_${key}${suffix}`);
}); });
} }
else { else point.tag(tag+suffix, field);
const name = (tag+suffix).toLowerCase();
point.tag(name, field);
}
} }
/** Mapping for type -> field-method */ /** Mapping for type -> field-method */