diff --git a/.package.yaml b/.package.yaml index 6781dc7..694cd22 100644 --- a/.package.yaml +++ b/.package.yaml @@ -19,7 +19,7 @@ name: nAttrMon main: nattrmon.js mainJob: '' license: Apache 2.0 license -version: '20260520' +version: '20260528' dependencies: openaf: '>=20241117' files: diff --git a/config/objects/nOutput_HTTP_Metrics.js b/config/objects/nOutput_HTTP_Metrics.js index ef7a2a7..7994301 100644 --- a/config/objects/nOutput_HTTP_Metrics.js +++ b/config/objects/nOutput_HTTP_Metrics.js @@ -156,6 +156,7 @@ var nOutput_HTTP_Metrics = function (aMap) { this.includeCVals = _$(aMap.includeCVals, "includeCVals").isBoolean().default(true); this.includeLVals = _$(aMap.includeLVals, "includeLVals").isBoolean().default(false); this.includeWarns = _$(aMap.includeWarns, "includeWarns").isBoolean().default(true); + this.useCurrentTime = _$(aMap.useCurrentTime, "useCurrentTime").isBoolean().default(false); this.nameSelf = _$(aMap.nameSelf, "nameSelf").isString().default("nattrmon_self") this.nameCVals = _$(aMap.nameCVals, "nameCVals").isString().default("nattrmon") @@ -293,7 +294,7 @@ var nOutput_HTTP_Metrics = function (aMap) { var _parse = (e, n) => { return ow.obj.fromObj2Array(e).map(r => { - var d = (new Date(r.date)).getTime(); + var d = parent.useCurrentTime ? Date.now() : (new Date(r.date)).getTime(); delete r.date; var m = {}; m[r.name] = r.val; traverse(m, (k, v, p, o) => { @@ -307,7 +308,7 @@ var nOutput_HTTP_Metrics = function (aMap) { var _e = [] Object.keys(e).forEach(k => { _e = _e.concat(e[k].map(w => { - var d = (new Date(w.lastupdate)).getTime() + var d = parent.useCurrentTime ? Date.now() : (new Date(w.lastupdate)).getTime() var m = {}; m[w.title] = clone(w) delete m[w.title].lastupdate delete m[w.title].notifications @@ -454,13 +455,13 @@ var nOutput_HTTP_Metrics = function (aMap) { default: if (isDef(req.params.type)) { switch(req.params.type) { - case "self" : res += _filterIds(__ow_metrics_fromObj2OpenMetrics(ow.metrics.getAll(), parent.nameSelf)); break + case "self" : res += _filterIds(__ow_metrics_fromObj2OpenMetrics(ow.metrics.getAll(), parent.nameSelf, parent.useCurrentTime ? Date.now() : undefined)); break case "cvals": res += _filterIds(_parse(_filter(nattrmon.getCurrentValues()), parent.nameCVals)); break case "lvals": res += _filterIds(_parse(_filter(nattrmon.getLastValues()), parent.nameLVals)); break case "warns": res += _filterIds(_parsew(nattrmon.getWarnings(), parent.nameWarns)); break } } else { - if (parent.includeSelf) res += _filterIds(__ow_metrics_fromObj2OpenMetrics(ow.metrics.getAll(), parent.nameSelf)); + if (parent.includeSelf) res += _filterIds(__ow_metrics_fromObj2OpenMetrics(ow.metrics.getAll(), parent.nameSelf, parent.useCurrentTime ? Date.now() : undefined)); if (parent.includeCVals) res += _filterIds(_parse(_filter(nattrmon.getCurrentValues()), parent.nameCVals)); if (parent.includeLVals) res += _filterIds(_parse(_filter(nattrmon.getLastValues()), parent.nameLVals)); if (parent.includeWarns) res += _filterIds(_parsew(nattrmon.getWarnings(), parent.nameWarns));