Skip to content

Add useCurrentTime flag to HTTP metrics output timestamping #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nmaguiar merged 3 commits into from
May 28, 2026
Merged

Add useCurrentTime flag to HTTP metrics output timestamping #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b524a0
Initial plan
Copilot May 21, 2026
0424ad0
feat: add useCurrentTime option to HTTP metrics output
Copilot May 21, 2026
c7ed76f
Update package version to 20260528
nmaguiar May 28, 2026
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
2 changes: 1 addition & 1 deletion .package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: nAttrMon
main: nattrmon.js
mainJob: ''
license: Apache 2.0 license
version: '20260520'
version: '20260528'
dependencies:
openaf: '>=20241117'
files:
Expand Down
9 changes: 5 additions & 4 deletions config/objects/nOutput_HTTP_Metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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) => {
Expand All @@ -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
Expand Down Expand Up @@ -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));
Expand Down
Loading