diff --git a/package-lock.json b/package-lock.json index b369049..a767fbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "prom-client": "^13.2.0" }, "devDependencies": { - "@gitzone/tsbuild": "^2.1.25", + "@gitzone/tsbuild": "^2.1.26", "@gitzone/tsbundle": "^1.0.78", "@gitzone/tstest": "^1.0.44", "@pushrocks/tapbundle": "^3.2.9", @@ -1822,38 +1822,24 @@ } }, "node_modules/@gitzone/tsbuild": { - "version": "2.1.25", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.25.tgz", - "integrity": "sha512-KtesoQEm96x0/x1800R3pcj06RcYTdqwBhG9oje+jQW4qZs/bnUirWZXkRMSLAK92cVm899KzZtYkq/fKga2+A==", + "version": "2.1.26", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.26.tgz", + "integrity": "sha512-FE0cjdAyzTR+Rr7pHULTF5rHiCW+FFnEHuV4kP7pdrHzl5oFZTUQ3uqEFEgmsrV6a0gzNwKgr/MfnVO/3sUrdw==", "dev": true, "license": "MIT", "dependencies": { "@pushrocks/early": "^3.0.6", - "@pushrocks/smartcli": "^3.0.12", - "@pushrocks/smartfile": "^8.0.0", - "@pushrocks/smartlog": "^2.0.36", + "@pushrocks/smartcli": "^3.0.14", + "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.0.6", - "typescript": "^3.9.7" + "@pushrocks/smartpromise": "^3.1.6", + "typescript": "^4.3.5" }, "bin": { "tsbuild": "cli.js" } }, - "node_modules/@gitzone/tsbuild/node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/@gitzone/tsbundle": { "version": "1.0.84", "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbundle/-/tsbundle-1.0.84.tgz", @@ -16032,26 +16018,18 @@ } }, "@gitzone/tsbuild": { - "version": "2.1.25", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.25.tgz", - "integrity": "sha512-KtesoQEm96x0/x1800R3pcj06RcYTdqwBhG9oje+jQW4qZs/bnUirWZXkRMSLAK92cVm899KzZtYkq/fKga2+A==", + "version": "2.1.26", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.26.tgz", + "integrity": "sha512-FE0cjdAyzTR+Rr7pHULTF5rHiCW+FFnEHuV4kP7pdrHzl5oFZTUQ3uqEFEgmsrV6a0gzNwKgr/MfnVO/3sUrdw==", "dev": true, "requires": { "@pushrocks/early": "^3.0.6", - "@pushrocks/smartcli": "^3.0.12", - "@pushrocks/smartfile": "^8.0.0", - "@pushrocks/smartlog": "^2.0.36", + "@pushrocks/smartcli": "^3.0.14", + "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartlog": "^2.0.44", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.0.6", - "typescript": "^3.9.7" - }, - "dependencies": { - "typescript": { - "version": "3.9.10", - "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true - } + "@pushrocks/smartpromise": "^3.1.6", + "typescript": "^4.3.5" } }, "@gitzone/tsbundle": { diff --git a/package.json b/package.json index de60114..283a5f4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "build": "(tsbuild --web)" }, "devDependencies": { - "@gitzone/tsbuild": "^2.1.25", + "@gitzone/tsbuild": "^2.1.26", "@gitzone/tsbundle": "^1.0.78", "@gitzone/tstest": "^1.0.44", "@pushrocks/tapbundle": "^3.2.9", diff --git a/ts/smartmetrics.classes.smartmetrics.ts b/ts/smartmetrics.classes.smartmetrics.ts index 9fe69b6..6748c5e 100644 --- a/ts/smartmetrics.classes.smartmetrics.ts +++ b/ts/smartmetrics.classes.smartmetrics.ts @@ -74,7 +74,6 @@ export class SmartMetrics { console.log(`${cpuUsageText} ||| ${memoryUsageText} `); const returnMetrics: interfaces.IMetricsSnapshot = { - originalMetrics, process_cpu_seconds_total: ( originalMetrics.find((metricSet) => metricSet.name === 'process_cpu_seconds_total') as any ).values[0].value, diff --git a/ts/smartmetrics.interfaces.ts b/ts/smartmetrics.interfaces.ts index 15464e1..41b17e1 100644 --- a/ts/smartmetrics.interfaces.ts +++ b/ts/smartmetrics.interfaces.ts @@ -1,6 +1,5 @@ // this might be extracted into a package @pushrocks/smartmetrics-interfaces in the future export interface IMetricsSnapshot { - originalMetrics: any[]; process_cpu_seconds_total: number; nodejs_active_handles_total: number; nodejs_active_requests_total: number;