added metrics cluster support

osrs-tracker · May 27, 2019 · 7fa13ab · 7fa13ab
1 parent 06196a9
commit 7fa13ab
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/src/app/app.ts b/src/app/app.ts
@@ -46,7 +46,14 @@ export class App {
     this._app.use(bodyParser.urlencoded({ extended: true }));
     this._app.use(bodyParser.json());
     this._app.use(requestLogger(['/health', '/metrics']));
-    this._app.use(prometheusMetricsMiddleware({ includeMethod: true, includePath: true }));
+    this._app.use(
+      prometheusMetricsMiddleware({
+        autoregister: false,
+        customLabels: { app: 'osrs-tracker-api' },
+        includeMethod: true,
+        includePath: true,
+      })
+    );
   }
 
   private setupRouters(): void {

diff --git a/src/config/config.dev.ts b/src/config/config.dev.ts
@@ -6,6 +6,7 @@ const dbCredentials: PoolConfig = JSON.parse(readFileSync('src/config/secrets/db
 
 export const config: IConfig = {
   port: Number(process.env.PORT) || 8080,
+  portMetrics: Number(process.env.PORT_METRICS) || 8088,
   poolConfig: Object.assign(dbCredentials, {
     ssl: {
       ca: readFileSync('src/config/secrets/db-ca.pem'),

diff --git a/src/config/config.interface.ts b/src/config/config.interface.ts
@@ -2,5 +2,6 @@ import { PoolConfig } from 'mysql';
 
 export interface IConfig {
   port: number;
+  portMetrics: number;
   poolConfig: PoolConfig;
 }
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -6,6 +6,7 @@ const dbCredentials: PoolConfig = JSON.parse(readFileSync('/run/secrets/db-osrs-
 
 export const config: IConfig = {
   port: Number(process.env.PORT) || 8080,
+  portMetrics: Number(process.env.PORT_METRICS) || 8088,
   poolConfig: Object.assign(dbCredentials, {
     ssl: {
       ca: readFileSync('/run/secrets/db-ca.pem'),

diff --git a/src/main.ts b/src/main.ts
@@ -1,15 +1,22 @@
 import cluster from 'cluster';
+import * as express from 'express';
+import { clusterMetrics } from 'express-prom-bundle';
 import os from 'os';
 import { App } from './app/app';
 import { Logger } from './app/common/logger';
 import { FileSystemUtils } from './app/common/utils/file-system-utils';
+import { config } from './config/config';
 
 if (cluster.isMaster) {
   FileSystemUtils.createIconsFolderIfMissing();
   Logger.log('OSRS TRACKER API ACTIVE - FORKING WORKERS');
 
   os.cpus().forEach(() => cluster.fork());
 
+  const metricsApp = express();
+  metricsApp.use('/metrics', clusterMetrics());
+  metricsApp.listen(config.portMetrics);
+
   cluster.on('exit', worker => {
     Logger.log(`WORKER ${worker.id} DIED - CREATING NEW WORKER`);
     cluster.fork();