Merge branch 'hotfix/v1.0.3'

Docoyo · Nov 19, 2020 · 32ca944 · 32ca944
2 parents 643b852 + f7de45c
commit 32ca944
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/prometheus-exporter/prometheus-adapter.js b/prometheus-exporter/prometheus-adapter.js
@@ -34,14 +34,14 @@ module.exports = {
     }
   },
   addCounter: function (metricConfig) {
+    metricConfig.registers = [customRegistry];
     const metric = new client.Counter(metricConfig);
-    customRegistry.registerMetric(metric);
     red.log.info('Added Prometheus Counter ' + metricConfig.name + ' ' + JSON.stringify(metricConfig, null, 2));
     return metric;
   },
   addGauge: function (metricConfig) {
+    metricConfig.registers = [customRegistry];
     const metric = new client.Gauge(metricConfig);
-    customRegistry.registerMetric(metric);
     red.log.info('Added Prometheus Gauge ' + metricConfig.name+ ' ' + JSON.stringify(metricConfig, null, 2));
     return metric;
   },

diff --git a/prometheus-exporter/prometheus-metric-config.js b/prometheus-exporter/prometheus-metric-config.js
@@ -7,7 +7,7 @@ module.exports = function (RED) {
   function PrometheusMetricConfigNode(config) {
     RED.nodes.createNode(this, config);
     let node = this;
-    RED.log.debug('Instanciating PrometheusMetricConfigNode', node.id);
+    RED.log.info('Instanciating PrometheusMetricConfigNode ' + config.name);
 
     node.name = config.name;
     node.help = config.help;
@@ -20,6 +20,7 @@ module.exports = function (RED) {
     }
 
     this.on('close', function () {
+      RED.log.info('Closing PrometheusMetricConfigNode ' + config.name);
       try {
         exporter.removeMetric(node.name);
       } catch (error) {
@@ -29,6 +30,7 @@ module.exports = function (RED) {
   }
 
   function registerMetric(node) {
+    RED.log.info('PrometheusMetricConfigNode.registerMetric ' + node.name);
     let labelsList = undefined;
     if (node.labels) {
       let splitLabels = node.labels.split(',');