Skip to content

Update package #290

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

Open
github-actions wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update package #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 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
3456364
Merge 0424ad07df38875552d5fe0ab30ecb517d8e5201 into 990fa0f98045d0d17…
Copilot May 21, 2026
b7e44ef
Update package
github-actions[bot] May 27, 2026
2f3104e
Update package
github-actions[bot] May 28, 2026
d1eee8e
Update package
github-actions[bot] May 28, 2026
aa1ec89
Update package
github-actions[bot] May 28, 2026
70ad9af
Update package
github-actions[bot] 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 .github/version.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .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 Expand Up @@ -435,7 +435,7 @@ filesHash:
config/objects/nOutput_HTTP.js: 043278dcbed94f2d8ca2aa57f4253426ee2dcdd9
config/objects/nOutput_HTTP_HealthZ.js: 11e2470b1cd0894be17315c80479c036d29485db
config/objects/nOutput_HTTP_JSON.js: 29252d69746972486590fbdcc85f5a11b5050ab8
config/objects/nOutput_HTTP_Metrics.js: 9b21ab65906137fd0b1d2f287924fa33c6a8281c
config/objects/nOutput_HTTP_Metrics.js: e530824ade0420dbbda245b345d5519fcce33cec
config/objects/nOutput_HTTP_Status.js: c4e56e646bfe3dd1d063604b5ab40bc0f618ff66
config/objects/nOutput_Log.js: 69ef02bb37d306deb390f303a8bbf6e2234be792
config/objects/nOutput_Log2ES.js: 4ff766b80b2e03f08f9f38e5a8dba4115d62bf81
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