@axinom/mosaic-service-common 0.19.0-rc.9 → 0.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/common/config/basic-config-definitions.d.ts +16 -0
- package/dist/common/config/basic-config-definitions.d.ts.map +1 -1
- package/dist/common/config/basic-config-definitions.js +19 -1
- package/dist/common/config/basic-config-definitions.js.map +1 -1
- package/dist/middleware/liveness-readiness-middleware.d.ts +2 -8
- package/dist/middleware/liveness-readiness-middleware.d.ts.map +1 -1
- package/dist/middleware/liveness-readiness-middleware.js +3 -2
- package/dist/middleware/liveness-readiness-middleware.js.map +1 -1
- package/dist/middleware/monitoring-middleware.d.ts +2 -7
- package/dist/middleware/monitoring-middleware.d.ts.map +1 -1
- package/dist/middleware/monitoring-middleware.js +13 -2
- package/dist/middleware/monitoring-middleware.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.19.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-service-common@0.18.0&targetVersion=GT@axinom/mosaic-service-common@0.19.0) (2022-05-26)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* :sparkles: introduce setupMaintenanceEndpoint method ([03a3013](https://dev.azure.com/axinom/CMS/_git/Navy/commit/03a30136112207f6070539d5c9f81563b2b2dcec))
|
|
12
|
+
* added `retention` property to log messages ([7abf474](https://dev.azure.com/axinom/CMS/_git/Navy/commit/7abf474f76bbd18d804c56b044c72feff9ae3934)), closes [#35492](https://dev.azure.com/axinom/CMS/_workitems/edit/35492)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
6
16
|
## [0.18.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-service-common@0.16.0&targetVersion=GT@axinom/mosaic-service-common@0.18.0) (2022-05-10)
|
|
7
17
|
|
|
8
18
|
|
|
@@ -9,6 +9,7 @@ export declare const getBasicConfigDefinitions: (variables?: Dict<string | undef
|
|
|
9
9
|
environment: () => "test" | "development" | "production";
|
|
10
10
|
serviceId: () => string;
|
|
11
11
|
logLevel: () => "" | "FATAL" | "ERROR" | "WARN" | "INFO" | "DEBUG" | "TRACE";
|
|
12
|
+
healthEndpointPort: () => number | undefined;
|
|
12
13
|
secureLoggingMode: () => MaskMode;
|
|
13
14
|
logMaskKeywords: () => string[];
|
|
14
15
|
isDev: () => boolean;
|
|
@@ -23,6 +24,13 @@ export declare const getBasicMaintenanceEndpointDefinitions: (variables?: Dict<s
|
|
|
23
24
|
maintenanceEndpointUserName: () => string;
|
|
24
25
|
maintenanceEndpointPassword: () => string;
|
|
25
26
|
};
|
|
27
|
+
/**
|
|
28
|
+
* Get the basic configuration definitions for the Metrics Endpoint
|
|
29
|
+
* @param variables process.env variables or custom provided values
|
|
30
|
+
*/
|
|
31
|
+
export declare const getBasicMetricsEndpointDefinitions: (variables?: Dict<string | undefined>, logger?: LoggerFn | undefined) => {
|
|
32
|
+
metricsEndpointPort: () => number | undefined;
|
|
33
|
+
};
|
|
26
34
|
/**
|
|
27
35
|
* Get the basic configuration definitions for GraphQL specific settings
|
|
28
36
|
* @param variables process.env variables or custom provided values
|
|
@@ -105,6 +113,7 @@ declare const config: import("./config-validation").ValueObject<{
|
|
|
105
113
|
environment: () => "test" | "development" | "production";
|
|
106
114
|
serviceId: () => string;
|
|
107
115
|
logLevel: () => "" | "FATAL" | "ERROR" | "WARN" | "INFO" | "DEBUG" | "TRACE";
|
|
116
|
+
healthEndpointPort: () => number | undefined;
|
|
108
117
|
secureLoggingMode: () => MaskMode;
|
|
109
118
|
logMaskKeywords: () => string[];
|
|
110
119
|
isDev: () => boolean;
|
|
@@ -120,6 +129,13 @@ declare const maintenanceConfig: import("./config-validation").ValueObject<{
|
|
|
120
129
|
maintenanceEndpointPassword: () => string;
|
|
121
130
|
}>;
|
|
122
131
|
export declare type BasicMaintenanceConfig = typeof maintenanceConfig;
|
|
132
|
+
/**
|
|
133
|
+
* The basic metrics Configuration type
|
|
134
|
+
*/
|
|
135
|
+
declare const metricsConfig: import("./config-validation").ValueObject<{
|
|
136
|
+
metricsEndpointPort: () => number | undefined;
|
|
137
|
+
}>;
|
|
138
|
+
export declare type BasicMetricsConfig = typeof metricsConfig;
|
|
123
139
|
/**
|
|
124
140
|
* The basic GraphQL Configuration type
|
|
125
141
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-config-definitions.d.ts","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAuB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQhC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eACzB,KAAK,MAAM,GAAG,SAAS,CAAC
|
|
1
|
+
{"version":3,"file":"basic-config-definitions.d.ts","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAuB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQhC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eACzB,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;CAgCpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sCAAsC,eACtC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;CAYpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kCAAkC,eAClC,KAAK,MAAM,GAAG,SAAS,CAAC;;CAOpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAC9B,MAAM,cACR,KAAK,MAAM,GAAG,SAAS,CAAC;;;CASpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,eAC3B,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;CAsDpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iCAAiC,eACjC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;;;;;CAwBpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qCAAqC,eACrC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;CAcpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,eAChC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;CAgCpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,eACvB,KAAK,MAAM,GAAG,SAAS,CAAC,KAClC,WAEF,CAAC;AAEF;;GAEG;AACH,QAAA,MAAM,MAAM;;;;;;;;;EAA6C,CAAC;AAC1D,oBAAY,WAAW,GAAG,OAAO,MAAM,CAAC;AAExC;;GAEG;AACH,QAAA,MAAM,iBAAiB;;;;EAEtB,CAAC;AACF,oBAAY,sBAAsB,GAAG,OAAO,iBAAiB,CAAC;AAE9D;;GAEG;AACH,QAAA,MAAM,aAAa;;EAAsD,CAAC;AAC1E,oBAAY,kBAAkB,GAAG,OAAO,aAAa,CAAC;AAEtD;;GAEG;AACH,QAAA,MAAM,SAAS;;;EAAwD,CAAC;AACxE,oBAAY,cAAc,GAAG,OAAO,SAAS,CAAC;AAE9C;;GAEG;AACH,QAAA,MAAM,QAAQ;;;;;;;;;;;;;;;;;EAA+C,CAAC;AAC9D,oBAAY,aAAa,GAAG,OAAO,QAAQ,CAAC;AAE5C;;GAEG;AACH,QAAA,MAAM,SAAS;;;;;;;;;;;;;EAAqD,CAAC;AACrE,oBAAY,cAAc,GAAG,OAAO,SAAS,CAAC;AAE9C;;GAEG;AACH,QAAA,MAAM,oBAAoB;;;;;;;EAAoD,CAAC;AAC/E,oBAAY,yBAAyB,GAAG,OAAO,oBAAoB,CAAC;AAEpE;;GAEG;AACH,QAAA,MAAM,yBAAyB;;;;;;EAE9B,CAAC;AACF,oBAAY,8BAA8B,GAAG,OAAO,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kBAAkB,QAAO,MAuCrC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getEnvSettingsHelp = exports.getValidatedBasicConfig = exports.getBasicManagedConfigDefinitions = exports.getBasicCustomizableConfigDefinitions = exports.getBasicRabbitMqConfigDefinitions = exports.getBasicDbConfigDefinitions = exports.getBasicGraphQlConfigDefinitions = exports.getBasicMaintenanceEndpointDefinitions = exports.getBasicConfigDefinitions = void 0;
|
|
3
|
+
exports.getEnvSettingsHelp = exports.getValidatedBasicConfig = exports.getBasicManagedConfigDefinitions = exports.getBasicCustomizableConfigDefinitions = exports.getBasicRabbitMqConfigDefinitions = exports.getBasicDbConfigDefinitions = exports.getBasicGraphQlConfigDefinitions = exports.getBasicMetricsEndpointDefinitions = exports.getBasicMaintenanceEndpointDefinitions = exports.getBasicConfigDefinitions = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/explicit-function-return-type */
|
|
5
5
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
6
6
|
const env_var_1 = require("env-var");
|
|
@@ -22,6 +22,7 @@ const getBasicConfigDefinitions = (variables = process.env, logger) => {
|
|
|
22
22
|
.asEnum(['development', 'production', 'test']),
|
|
23
23
|
serviceId: () => env.get('SERVICE_ID').required().asString(),
|
|
24
24
|
logLevel: () => env.get('LOG_LEVEL').default('INFO').asLogLevel(),
|
|
25
|
+
healthEndpointPort: () => env.get('HEALTH_ENDPOINT_PORT').asPortNumber(),
|
|
25
26
|
secureLoggingMode: () => env
|
|
26
27
|
.get('SECURE_LOGGING_MODE')
|
|
27
28
|
.default(logging_1.MaskMode.SECRETS_HIDDEN)
|
|
@@ -53,6 +54,17 @@ const getBasicMaintenanceEndpointDefinitions = (variables = process.env, logger)
|
|
|
53
54
|
};
|
|
54
55
|
};
|
|
55
56
|
exports.getBasicMaintenanceEndpointDefinitions = getBasicMaintenanceEndpointDefinitions;
|
|
57
|
+
/**
|
|
58
|
+
* Get the basic configuration definitions for the Metrics Endpoint
|
|
59
|
+
* @param variables process.env variables or custom provided values
|
|
60
|
+
*/
|
|
61
|
+
const getBasicMetricsEndpointDefinitions = (variables = process.env, logger) => {
|
|
62
|
+
const env = (0, env_var_1.from)(variables, undefined, logger);
|
|
63
|
+
return {
|
|
64
|
+
metricsEndpointPort: () => env.get('METRICS_ENDPOINT_PORT').asPortNumber(),
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
exports.getBasicMetricsEndpointDefinitions = getBasicMetricsEndpointDefinitions;
|
|
56
68
|
/**
|
|
57
69
|
* Get the basic configuration definitions for GraphQL specific settings
|
|
58
70
|
* @param variables process.env variables or custom provided values
|
|
@@ -198,6 +210,10 @@ const config = (0, config_validation_1.getConfigType)((0, exports.getBasicConfig
|
|
|
198
210
|
* The basic maintenance Configuration type
|
|
199
211
|
*/
|
|
200
212
|
const maintenanceConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicMaintenanceEndpointDefinitions)());
|
|
213
|
+
/**
|
|
214
|
+
* The basic metrics Configuration type
|
|
215
|
+
*/
|
|
216
|
+
const metricsConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicMetricsEndpointDefinitions)());
|
|
201
217
|
/**
|
|
202
218
|
* The basic GraphQL Configuration type
|
|
203
219
|
*/
|
|
@@ -254,6 +270,8 @@ const getEnvSettingsHelp = () => {
|
|
|
254
270
|
(0, config_validation_1.getConfig)((0, exports.getBasicConfigDefinitions)(undefined, logger));
|
|
255
271
|
output += `# getBasicMaintenanceEndpointDefinitions usage:${os_1.EOL}`;
|
|
256
272
|
(0, config_validation_1.getConfig)((0, exports.getBasicMaintenanceEndpointDefinitions)(undefined, logger));
|
|
273
|
+
output += `# getBasicMetricsEndpointDefinitions usage:${os_1.EOL}`;
|
|
274
|
+
(0, config_validation_1.getConfig)((0, exports.getBasicMetricsEndpointDefinitions)(undefined, logger));
|
|
257
275
|
output += `# getBasicGraphQlConfigDefinitions usage:${os_1.EOL}`;
|
|
258
276
|
(0, config_validation_1.getConfig)((0, exports.getBasicGraphQlConfigDefinitions)(9999, undefined, logger));
|
|
259
277
|
output += `# getBasicDbConfigDefinitions usage:${os_1.EOL}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-config-definitions.js","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"basic-config-definitions.js","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '../common';
|
|
1
|
+
import { BasicConfig, Logger } from '../common';
|
|
2
2
|
declare class State<T> {
|
|
3
3
|
private state;
|
|
4
4
|
constructor(state: T);
|
|
@@ -9,10 +9,6 @@ declare class State<T> {
|
|
|
9
9
|
* Options used to set up liveliness and readiness endpoints.
|
|
10
10
|
*/
|
|
11
11
|
export interface ILivenessReadinessOptions {
|
|
12
|
-
/**
|
|
13
|
-
* `healthEndpointPort`: the server port which will serve liveness & readiness
|
|
14
|
-
*/
|
|
15
|
-
healthEndpointPort?: number;
|
|
16
12
|
/**
|
|
17
13
|
* `enableLivenessEndpoint`: expose a liveness probe endpoint or not
|
|
18
14
|
*/
|
|
@@ -66,9 +62,7 @@ export interface ILivenessReadinessOptions {
|
|
|
66
62
|
* @param livenessReadinessOptions The configuration object for liveness & readiness endpoints
|
|
67
63
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
68
64
|
*/
|
|
69
|
-
export declare const setupLivenessAndReadiness: (config: {
|
|
70
|
-
isDev: boolean;
|
|
71
|
-
}, livenessReadinessOptions?: ILivenessReadinessOptions, logger?: Logger | undefined) => {
|
|
65
|
+
export declare const setupLivenessAndReadiness: (config: BasicConfig, livenessReadinessOptions?: ILivenessReadinessOptions, logger?: Logger | undefined) => {
|
|
72
66
|
liveness: State<boolean>;
|
|
73
67
|
readiness: State<boolean>;
|
|
74
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveness-readiness-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"liveness-readiness-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE7D,cAAM,KAAK,CAAC,CAAC;IACC,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,CAAC;IAErB,QAAQ,IAAI,CAAC;IAIb,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;CAGhC;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,yBAAyB,WAC5B,WAAW,6BACO,yBAAyB,kCAElD;IACD,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC;IACzB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC;CA0F3B,CAAC"}
|
|
@@ -43,8 +43,9 @@ class State {
|
|
|
43
43
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
44
44
|
*/
|
|
45
45
|
const setupLivenessAndReadiness = (config, livenessReadinessOptions = {}, logger) => {
|
|
46
|
+
var _a;
|
|
46
47
|
const localLogger = logger !== null && logger !== void 0 ? logger : new common_1.Logger({ context: exports.setupLivenessAndReadiness.name });
|
|
47
|
-
const options = Object.assign({
|
|
48
|
+
const options = Object.assign({ enableLivenessEndpoint: true, livenessPath: '/live', defaultLiveness: true, enableReadinessEndpoint: true, readinessPath: '/ready', defaultReadiness: false }, livenessReadinessOptions);
|
|
48
49
|
const app = express();
|
|
49
50
|
// Configure liveness probe endpoint
|
|
50
51
|
const livenessData = new State(options.defaultLiveness);
|
|
@@ -99,7 +100,7 @@ const setupLivenessAndReadiness = (config, livenessReadinessOptions = {}, logger
|
|
|
99
100
|
});
|
|
100
101
|
}
|
|
101
102
|
// If running on dev environment, we will assign a free ephemeral port
|
|
102
|
-
const server = app.listen(config.isDev ? 0 :
|
|
103
|
+
const server = app.listen(config.isDev ? 0 : (_a = config.healthEndpointPort) !== null && _a !== void 0 ? _a : 9000, () => {
|
|
103
104
|
const port = server.address().port;
|
|
104
105
|
localLogger.debug({
|
|
105
106
|
message: `liveness & readiness app started`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveness-readiness-middleware.js","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"liveness-readiness-middleware.js","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { Application } from 'express';
|
|
2
1
|
import { Metric, Registry } from 'prom-client';
|
|
3
|
-
import { Logger } from '../common';
|
|
2
|
+
import { BasicConfig, BasicMetricsConfig, Logger } from '../common';
|
|
4
3
|
/**
|
|
5
4
|
* Options used to set up monitoring middleware.
|
|
6
5
|
*/
|
|
@@ -27,14 +26,10 @@ export interface IMonitoringOptions {
|
|
|
27
26
|
* By default, standard nodejs process metrics are collected. All gathered metrics are exported via a '/metrics' path.
|
|
28
27
|
* If custom metrics are required, they can be defined on a separate metric-registry and passed in as arguments.
|
|
29
28
|
*
|
|
30
|
-
* @param app The express application to setup the metric monitoring endpoint on.
|
|
31
29
|
* @param config A service config object containing `service-id` & `environment` values to be used as metric labels.
|
|
32
30
|
* @param monitoringOptions An object containing monitoring options.
|
|
33
31
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
34
32
|
* @returns A instance of `Registry`. This can be used to further configure necessary metrics.
|
|
35
33
|
*/
|
|
36
|
-
export declare const setupMonitoring: (
|
|
37
|
-
serviceId: string;
|
|
38
|
-
environment: string;
|
|
39
|
-
}, monitoringOptions?: IMonitoringOptions, logger?: Logger | undefined) => Registry;
|
|
34
|
+
export declare const setupMonitoring: (config: BasicConfig & BasicMetricsConfig, monitoringOptions?: IMonitoringOptions, logger?: Logger | undefined) => Registry;
|
|
40
35
|
//# sourceMappingURL=monitoring-middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitoring-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitoring-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAEL,WAAW,EACX,kBAAkB,EAClB,MAAM,EACP,MAAM,WAAW,CAAC;AAGnB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;CAC5B;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,WAClB,WAAW,GAAG,kBAAkB,sBACrB,kBAAkB,kCAEpC,QAsDF,CAAC"}
|
|
@@ -3,20 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupMonitoring = void 0;
|
|
4
4
|
const prom_client_1 = require("prom-client");
|
|
5
5
|
const common_1 = require("../common");
|
|
6
|
+
const express = require("express");
|
|
6
7
|
/**
|
|
7
8
|
* Setup a prometheus metric monitoring endpoint using an express application.
|
|
8
9
|
* By default, standard nodejs process metrics are collected. All gathered metrics are exported via a '/metrics' path.
|
|
9
10
|
* If custom metrics are required, they can be defined on a separate metric-registry and passed in as arguments.
|
|
10
11
|
*
|
|
11
|
-
* @param app The express application to setup the metric monitoring endpoint on.
|
|
12
12
|
* @param config A service config object containing `service-id` & `environment` values to be used as metric labels.
|
|
13
13
|
* @param monitoringOptions An object containing monitoring options.
|
|
14
14
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
15
15
|
* @returns A instance of `Registry`. This can be used to further configure necessary metrics.
|
|
16
16
|
*/
|
|
17
|
-
const setupMonitoring = (
|
|
17
|
+
const setupMonitoring = (config, monitoringOptions = {}, logger) => {
|
|
18
|
+
var _a;
|
|
18
19
|
const localLogger = logger !== null && logger !== void 0 ? logger : new common_1.Logger({ context: exports.setupMonitoring.name });
|
|
19
20
|
const options = Object.assign({ metricsPath: '/metrics', metricRegistry: new prom_client_1.Registry(), collectDefaultMetrics: true, metrics: [] }, monitoringOptions);
|
|
21
|
+
const app = express();
|
|
20
22
|
options.metricRegistry.setDefaultLabels({
|
|
21
23
|
serviceId: config.serviceId,
|
|
22
24
|
environment: config.environment,
|
|
@@ -27,6 +29,15 @@ const setupMonitoring = (app, config, monitoringOptions = {}, logger) => {
|
|
|
27
29
|
if (options.collectDefaultMetrics) {
|
|
28
30
|
(0, prom_client_1.collectDefaultMetrics)({ register: options.metricRegistry });
|
|
29
31
|
}
|
|
32
|
+
const server = app.listen(config.isDev ? 0 : (_a = config.metricsEndpointPort) !== null && _a !== void 0 ? _a : 9090, () => {
|
|
33
|
+
const port = server.address().port;
|
|
34
|
+
localLogger.debug({
|
|
35
|
+
message: `Metrics app started`,
|
|
36
|
+
details: {
|
|
37
|
+
metrics: `http://localhost:${port}${options.metricsPath}`,
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
});
|
|
30
41
|
app.use(options.metricsPath, async (_req, res) => {
|
|
31
42
|
try {
|
|
32
43
|
res.setHeader('content-type', options.metricRegistry.contentType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitoring-middleware.js","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":";;;AACA,6CAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"monitoring-middleware.js","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":";;;AACA,6CAAsE;AACtE,sCAKmB;AACnB,mCAAoC;AAwBpC;;;;;;;;;GASG;AACI,MAAM,eAAe,GAAG,CAC7B,MAAwC,EACxC,oBAAwC,EAAE,EAC1C,MAAe,EACL,EAAE;;IACZ,MAAM,WAAW,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,eAAM,CAAC,EAAE,OAAO,EAAE,uBAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5E,MAAM,OAAO,mBACX,WAAW,EAAE,UAAU,EACvB,cAAc,EAAE,IAAI,sBAAQ,EAAE,EAC9B,qBAAqB,EAAE,IAAI,EAC3B,OAAO,EAAE,EAAE,IACR,iBAAiB,CACrB,CAAC;IAEF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;QACtC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;QACpC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;KAC/C;IAED,IAAI,OAAO,CAAC,qBAAqB,EAAE;QACjC,IAAA,mCAAqB,EAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;KAC7D;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,mBAAmB,mCAAI,IAAI,EACrD,GAAG,EAAE;QACH,MAAM,IAAI,GAAI,MAAM,CAAC,OAAO,EAAkB,CAAC,IAAI,CAAC;QAEpD,WAAW,CAAC,KAAK,CAAC;YAChB,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE;gBACP,OAAO,EAAE,oBAAoB,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE;aAC1D;SACF,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAC/C,IAAI;YACF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAClE,GAAG,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;SAClD;QAAC,OAAO,KAAK,EAAE;YACd,GAAG,CAAC,IAAI,CACN,0EAA0E,MAAM,CAAC,SAAS,qBAAqB,CAChH,CAAC;YAEF,IAAA,oBAAW,EAAC,KAAK,CAAC,CAAC;YACnB,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,cAAc,CAAC;AAChC,CAAC,CAAC;AA1DW,QAAA,eAAe,mBA0D1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-service-common",
|
|
3
|
-
"version": "0.19.0
|
|
3
|
+
"version": "0.19.0",
|
|
4
4
|
"description": "Common helpers and PostgreSQL-related functionality",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "d8a460eab182d6bbcb9d6396b90193ca574dc236"
|
|
67
67
|
}
|