add prometheus_measure_nodeid

Author: skadefro

OpenFlowNodeRED/src/Config.ts

@@ -63,6 +63,7 @@ export class Config {
 
         Config.amqp_message_ttl = parseInt(Config.getEnv("amqp_message_ttl", "20000"));
         Config.prometheus_max_node_time_seconds = parseInt(Config.getEnv("prometheus_max_node_time_seconds", "300"));
+        Config.prometheus_measure_nodeid = Config.parseBoolean(Config.getEnv("prometheus_measure_nodeid", "false"));
     }
     public static version: string = Config.getversion();
     public static logpath: string = Config.getEnv("logpath", __dirname);
@@ -122,6 +123,7 @@ export class Config {
     public static amqp_message_ttl: number = parseInt(Config.getEnv("amqp_message_ttl", "20000"));
     public static prometheus_max_node_time_seconds: number = parseInt(Config.getEnv("prometheus_max_node_time_seconds", "300"));
 
+    public static prometheus_measure_nodeid: boolean = Config.parseBoolean(Config.getEnv("prometheus_measure_nodeid", "false"));
 
 
     public static baseurl(): string {

OpenFlowNodeRED/src/WebServer.ts

@@ -67,6 +67,19 @@ export class WebServer {
                 client.collectDefaultMetrics({ register })
 
                 this._logger.debug("WebServer.configure::registerMetrics");
+                if (Config.prometheus_measure_nodeid) {
+                    WebServer.openflow_nodered_node_count = new client.Counter({
+                        name: 'openflow_nodered_node_count',
+                        help: 'Total number of node calls',
+                        labelNames: ["nodetype", "nodeid"]
+                    })
+                    WebServer.openflow_nodered_node_duration = new client.Histogram({
+                        name: 'openflow_nodered_node_duration',
+                        help: 'Duration of each node call',
+                        labelNames: ["nodetype", "nodeid"],
+                        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+                    })
+                }
                 if (!NoderedUtil.IsNullUndefinded(register)) register.registerMetric(WebServer.openflow_nodered_node_count);
                 if (!NoderedUtil.IsNullUndefinded(register)) register.registerMetric(WebServer.openflow_nodered_node_duration);
 
@@ -165,13 +178,18 @@ export class WebServer {
                                     msg.event = msg.event.substring(0, msg.event.length - 8);
                                     msg.end = WebServer.openflow_nodered_node_duration.startTimer()
                                     WebServer.openflow_nodered_node_count.labels(msg.event).inc();
+                                    if (Config.prometheus_measure_nodeid) WebServer.openflow_nodered_node_count.labels(msg.event, msg.nodeid).inc();
                                     WebServer.log_messages[msg.msgid] = msg;
                                 }
                                 if (msg.event.endsWith(".send")) {
                                     msg.event = msg.event.substring(0, msg.event.length - 5);
                                     const startmessage = WebServer.log_messages[msg.msgid];
                                     if (!NoderedUtil.IsNullUndefinded(startmessage)) {
-                                        startmessage.end({ nodetype: startmessage.event });
+                                        if (Config.prometheus_measure_nodeid) {
+                                            startmessage.end({ nodetype: startmessage.event, nodeid: msg.nodeid });
+                                        } else {
+                                            startmessage.end({ nodetype: startmessage.event });
+                                        }
                                         delete WebServer.log_messages[msg.msgid];
                                     }
                                 }
@@ -274,11 +292,17 @@ export class WebServer {
 
                 if (Config.nodered_port > 0) {
                     this._logger.debug("WebServer.configure::server.listen on port " + Config.nodered_port);
-                    server.listen(Config.nodered_port);
+                    server.listen(Config.nodered_port).on('error', function (error) {
+                        WebServer._logger.error(error);
+                        process.exit(404);
+                    });
                 }
                 else {
                     this._logger.debug("WebServer.configure::server.listen on port " + Config.port);
-                    server.listen(Config.port);
+                    server.listen(Config.port).on('error', function (error) {
+                        WebServer._logger.error(error);
+                        process.exit(404);
+                    });
                 }
 
             } else {