add base metric to nodered

Author: skadefro

OpenFlow/src/WebServer.ts

@@ -17,22 +17,29 @@ import { LoginProvider } from "./LoginProvider";
 import { DatabaseConnection } from "./DatabaseConnection";
 import { Config } from "./Config";
 
+import * as promBundle from "express-prom-bundle";
+import * as client from "prom-client";
+import { NoderedUtil } from "openflow-api";
+
 export class WebServer {
     private static _logger: winston.Logger;
     public static app: express.Express;
 
-    static async configure(logger: winston.Logger, baseurl: string): Promise<http.Server> {
+    static async configure(logger: winston.Logger, baseurl: string, register: client.Registry): Promise<http.Server> {
         this._logger = logger;
 
         this.app = express();
-        // this.app.use(morgan('combined', { stream: (winston.stream as any).write }));
+        if (!NoderedUtil.IsNullUndefinded(register)) {
+            const metricsMiddleware = promBundle({ includeMethod: true, includePath: true, promRegistry: register, autoregister: true });
+            this.app.use(metricsMiddleware);
+        }
+
         const loggerstream = {
             write: function (message, encoding) {
                 logger.silly(message);
             }
         };
         this.app.use(morgan('combined', { stream: loggerstream }));
-
         this.app.use(compression());
         this.app.use(bodyParser.urlencoded({ extended: true }));
         this.app.use(bodyParser.json());

OpenFlow/src/index.ts

@@ -251,10 +251,10 @@ try {
     try {
         await initamqp();
         logger.info("VERSION: " + Config.version);
-        const server: http.Server = await WebServer.configure(logger, Config.baseurl());
         if (Prometheus != null) {
-            register = Prometheus.Prometheus.configure(logger, WebServer.app);
+            register = Prometheus.Prometheus.configure(logger);
         }
+        const server: http.Server = await WebServer.configure(logger, Config.baseurl(), register);
         if (GrafanaProxy != null) {
             const grafana = await GrafanaProxy.GrafanaProxy.configure(logger, WebServer.app, register);
         }

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.77",
+  "version": "1.1.78",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "cookie-session": "^1.4.0",
     "envfile": "^6.12.0",
     "express": "^4.17.1",
+    "express-prom-bundle": "^6.2.0",
     "google-auth-library": "^6.0.6",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
@@ -40,6 +41,7 @@
     "os-service": "^2.2.0",
     "passport-saml": "^1.3.4",
     "passport-saml-metadata": "^2.3.0",
+    "prom-client": "^12.0.0",
     "readline-sync": "^1.4.10",
     "smtp-server": "^3.7.0",
     "unhandled-rejection": "^1.0.0",

OpenFlowNodeRED/src/WebServer.ts

@@ -20,6 +20,8 @@ import { noderedcontribmiddlewareauth } from "./node-red-contrib-middleware-auth
 import * as passport from "passport";
 import { noderedcontribauthsaml } from "./node-red-contrib-auth-saml";
 import { WebSocketClient, NoderedUtil } from "openflow-api";
+import * as client from "prom-client";
+import * as promBundle from "express-prom-bundle";
 
 export class WebServer {
     private static _logger: winston.Logger;
@@ -39,6 +41,16 @@ export class WebServer {
             let server: http.Server = null;
             if (this.app === null) {
                 this.app = express();
+
+                const register = new client.Registry()
+                const hostname = Config.getEnv("HOSTNAME", null);
+                const defaultLabels: any = {};
+                if (!NoderedUtil.IsNullEmpty(hostname)) defaultLabels["hostname"] = hostname;
+                register.setDefaultLabels(defaultLabels);
+                client.collectDefaultMetrics({ register })
+
+                const metricsMiddleware = promBundle({ includeMethod: true, includePath: true, promRegistry: register, autoregister: true });
+                this.app.use(metricsMiddleware);
                 // this.app.use(morgan('combined', { stream: (winston.stream as any).write }));
                 const loggerstream = {
                     write: function (message, encoding) {

VERSION

@@ -1 +1 @@
-1.1.77
+1.1.78

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.77"
+    image: "cloudhack/openflow:1.1.78"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.77"
+    image: "cloudhack/openflownodered:1.1.78"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "cloudhack/openflow:1.1.77"
+    image: "cloudhack/openflow:1.1.78"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.77"
+    image: "cloudhack/openflownodered:1.1.78"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.77"
+    image: "cloudhack/openflow:1.1.78"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.77"
+    image: "cloudhack/openflownodered:1.1.78"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.77"
+    image: "cloudhack/openflow:1.1.78"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.77"
+    image: "cloudhack/openflownodered:1.1.78"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.77",
+  "version": "1.1.78",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -41,6 +41,7 @@
     "cookie-session": "^1.4.0",
     "envfile": "^6.14.0",
     "express": "^4.17.1",
+    "express-prom-bundle": "^6.2.0",
     "flash": "^1.1.0",
     "formBuilder": "^3.6.1",
     "got": "^11.7.0",