@5minds/node-red-contrib-processcube-elasticsearch 0.3.0-develop-619434-m3iuomx6 → 0.3.1-add-update-cycle-49119c-m3ra2qmc

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.
Files changed (3) hide show
  1. package/elastic-search-logger.js +136 -108
  2. package/elastic-search.js +13 -12
  3. package/package.json +1 -1
package/elastic-search-logger.js CHANGED
@@ -1,117 +1,145 @@
1
1
  module.exports = function (RED) {
2
- "use strict";
3
-
4
- function LogElasticLoggerNode(config) {
5
- let winston = require('winston');
6
- let winstonElasticSearch = require('winston-elasticsearch');
7
-
8
- RED.nodes.createNode(this, config);
9
- this.logger = null;
10
- let transports = [];
11
-
12
- // Elastic settings
13
- let url = RED.util.evaluateNodeProperty(config.url, config.urlType, this);
14
- if (url == "") {
15
- this.error("Elastic search url is not set");
16
- }
17
-
18
- let user = RED.util.evaluateNodeProperty(this.credentials.username, config.usernameType, this);
19
- if (user == "") {
20
- this.error("Elastic search username is not set");
2
+ 'use strict';
3
+
4
+ function LogElasticLoggerNode(config) {
5
+ let winston = require('winston');
6
+ let winstonElasticSearch = require('winston-elasticsearch');
7
+
8
+ RED.nodes.createNode(this, config);
9
+ this.logger = null;
10
+ let transports = [];
11
+
12
+ const stopRefreshing = periodicallyRefreshElasticSettings(10000);
13
+
14
+ function periodicallyRefreshElasticSettings(timeOut) {
15
+ let url, user, password, index;
16
+
17
+ function refresh() {
18
+ // Elastic settings
19
+ let newUrl = RED.util.evaluateNodeProperty(config.url, config.urlType, this);
20
+ if (newUrl == '') {
21
+ this.error('Elastic search url is not set');
22
+ return;
23
+ }
24
+
25
+ let newUser = RED.util.evaluateNodeProperty(this.credentials.username, config.usernameType, this);
26
+ if (newUser == '') {
27
+ this.error('Elastic search username is not set');
28
+ return;
29
+ }
30
+
31
+ let newPassword = RED.util.evaluateNodeProperty(this.credentials.password, config.passwordType, this);
32
+ if (newPassword == '') {
33
+ this.error('Elastic search password is not set');
34
+ return;
35
+ }
36
+
37
+ let newIndex = RED.util.evaluateNodeProperty(this.credentials.index, config.indexType, this);
38
+ if (newIndex == '') {
39
+ this.error('Elastic search index is not set');
40
+ return;
41
+ }
42
+
43
+ if (newUrl === url && newUser === user && newPassword === password && newIndex === index) {
44
+ return;
45
+ }
46
+
47
+ if (this.logger) this.logger.close();
48
+
49
+ url = newUrl;
50
+ user = newUser;
51
+ password = newPassword;
52
+ index = newIndex;
53
+
54
+ index = index.toLowerCase();
55
+ if (url) {
56
+ const elasticSearchTransport = new winstonElasticSearch.ElasticsearchTransport({
57
+ clientOpts: {
58
+ node: url,
59
+ auth: {
60
+ username: user,
61
+ password: password,
62
+ },
63
+ ssl: {
64
+ // accept any
65
+ rejectUnauthorized: false,
66
+ },
67
+ },
68
+ transformer: (logData) => setElasticFields(logData, this),
69
+ index: index,
70
+ });
71
+
72
+ transports = [elasticSearchTransport];
73
+
74
+ elasticSearchTransport.on('error', (error) => {
75
+ this.error(`Error in elasticSearchTransport caught: ${error.message}`);
76
+ console.error('Error in elasticSearchTransport caught', error);
77
+ });
78
+ }
79
+
80
+ let logLevels = {
81
+ levels: {
82
+ Error: 0,
83
+ Warning: 1,
84
+ Information: 2,
85
+ Debug: 3,
86
+ },
87
+ };
88
+ this.logger = new winston.createLogger({
89
+ exitOnError: false,
90
+ level: 'Debug',
91
+ levels: logLevels.levels,
92
+ transports: transports,
93
+ });
94
+
95
+ this.debug('elastic-search logger created');
96
+ }
97
+
98
+ refresh();
99
+ const intervalId = setInterval(refresh, timeOut);
100
+
101
+ return () => clearInterval(intervalId);
102
+ }
103
+
104
+ this.on('close', function (removed, done) {
105
+ stopRefreshing();
106
+ // close logger
107
+ if (this.logger) {
108
+ this.logger.close();
109
+ }
110
+
111
+ this.debug('elastic-search logger closed');
112
+
113
+ if (done) done();
114
+ });
21
115
  }
22
116
 
23
- let password = RED.util.evaluateNodeProperty(this.credentials.password, config.passwordType, this);
24
- if (password == "") {
25
- this.error("Elastic search password is not set");
117
+ function setElasticFields(logData, node) {
118
+ let { ElasticsearchTransformer } = require('winston-elasticsearch');
119
+ const transformed = ElasticsearchTransformer(logData);
120
+ transformed['@timestamp'] = logData.timestamp ? logData.timestamp : new Date().toISOString();
121
+ transformed.message = logData.message;
122
+ transformed.messageTemplate = logData.messageTemplate;
123
+ transformed.severity = logData.level;
124
+ transformed.level = logData.level;
125
+ transformed.fields = logData.meta;
126
+
127
+ if (logData.meta['transaction.id']) transformed.transaction = { id: logData.meta['transaction.id'] };
128
+ if (logData.meta['trace.id']) transformed.trace = { id: logData.meta['trace.id'] };
129
+ if (logData.meta['span.id']) transformed.span = { id: logData.meta['span.id'] };
130
+
131
+ return transformed;
26
132
  }
27
133
 
28
- let index = RED.util.evaluateNodeProperty(this.credentials.index, config.indexType, this);
29
- if (index == "") {
30
- this.error("Elastic search index is not set");
31
- }
32
-
33
- index = index.toLowerCase();
34
- if (url) {
35
- const elasticSearchTransport = new winstonElasticSearch.ElasticsearchTransport({
36
- clientOpts: {
37
- node: url,
38
- auth: {
39
- username: user,
40
- password: password
41
- },
42
- ssl: {
43
- // accept any
44
- rejectUnauthorized: false
45
- }
134
+ RED.nodes.registerType('elastic-search-logger', LogElasticLoggerNode, {
135
+ credentials: {
136
+ username: { type: 'text' },
137
+ password: { type: 'password' },
138
+ index: { type: 'text' },
46
139
  },
47
- transformer: (logData) => setElasticFields(logData, this),
48
- index: index
49
- })
50
-
51
- transports.push(elasticSearchTransport);
52
-
53
- elasticSearchTransport.on('error', (error) => {
54
- this.error(`Error in elasticSearchTransport caught: ${error.message}`);
55
- console.error('Error in elasticSearchTransport caught', error);
56
- });
57
- }
58
-
59
- let logLevels = {
60
- levels: {
61
- Error: 0,
62
- Warning: 1,
63
- Information: 2,
64
- Debug: 3
65
- }
66
- }
67
- this.logger = new winston.createLogger({
68
- exitOnError: false,
69
- level: 'Debug',
70
- levels: logLevels.levels,
71
- transports: transports
72
- });
73
-
74
- this.debug("elastic-search logger created");
75
-
76
- this.on('close', function (removed, done) {
77
- // close logger
78
- if (this.loggger) {
79
- this.logger.close();
80
- }
81
-
82
- this.debug("elastic-search logger closed");
83
-
84
- if (done) done();
85
- });
86
- }
87
-
88
- function setElasticFields(logData, node) {
89
- let { ElasticsearchTransformer } = require('winston-elasticsearch');
90
- const transformed = ElasticsearchTransformer(logData);
91
- transformed['@timestamp'] = logData.timestamp ? logData.timestamp : new Date().toISOString();
92
- transformed.message = logData.message;
93
- transformed.messageTemplate = logData.messageTemplate;
94
- transformed.severity = logData.level;
95
- transformed.level = logData.level;
96
- transformed.fields = logData.meta;
97
-
98
- if (logData.meta['transaction.id']) transformed.transaction = { id: logData.meta['transaction.id'] };
99
- if (logData.meta['trace.id']) transformed.trace = { id: logData.meta['trace.id'] };
100
- if (logData.meta['span.id']) transformed.span = { id: logData.meta['span.id'] };
101
-
102
- return transformed;
103
- };
104
-
105
- RED.nodes.registerType("elastic-search-logger", LogElasticLoggerNode,
106
- {
107
- credentials: {
108
- username: { type: "text" },
109
- password: { type: "password" },
110
- index: { type: "text" }
111
- }
112
140
  });
113
141
 
114
- LogElasticLoggerNode.prototype.addToLog = function addTolog(loglevel, msg) {
115
- this.logger.log(loglevel, msg.payload.message, msg.payload.meta);
116
- }
142
+ LogElasticLoggerNode.prototype.addToLog = function addTolog(loglevel, msg) {
143
+ this.logger.log(loglevel, msg.payload.message, msg.payload.meta);
144
+ };
117
145
  };
package/elastic-search.js CHANGED
@@ -1,20 +1,20 @@
1
1
  module.exports = function (RED) {
2
- "use strict";
2
+ 'use strict';
3
3
 
4
- const Error = "Error"
5
- const Warning = "Warning"
6
- const Information = "Information"
7
- const Debug = "Debug"
4
+ const Error = 'Error';
5
+ const Warning = 'Warning';
6
+ const Information = 'Information';
7
+ const Debug = 'Debug';
8
8
 
9
9
  function LogElasticNode(config) {
10
10
  RED.nodes.createNode(this, config);
11
11
  const node = this;
12
12
 
13
- this.logger = RED.nodes.getNode(config.logger);
13
+ this.on('input', function (msg, send, done) {
14
+ node.logger = RED.nodes.getNode(config.logger);
14
15
 
15
- let loglevel = config.loglevel || "";
16
+ let loglevel = config.loglevel || '';
16
17
 
17
- this.on('input', function (msg, send, done) {
18
18
  if (node.logger) {
19
19
  let level;
20
20
  if (loglevel === Error || loglevel === Warning || loglevel === Information || loglevel === Debug) {
@@ -22,8 +22,9 @@ module.exports = function (RED) {
22
22
  level = loglevel;
23
23
  } else {
24
24
  // get loglevel from message
25
- try { level = RED.util.getMessageProperty(msg, loglevel); }
26
- catch (err) {
25
+ try {
26
+ level = RED.util.getMessageProperty(msg, loglevel);
27
+ } catch (err) {
27
28
  level = Debug;
28
29
  }
29
30
 
@@ -40,5 +41,5 @@ module.exports = function (RED) {
40
41
  });
41
42
  }
42
43
 
43
- RED.nodes.registerType("elastic-search", LogElasticNode);
44
- };
44
+ RED.nodes.registerType('elastic-search', LogElasticNode);
45
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@5minds/node-red-contrib-processcube-elasticsearch",
3
- "version": "0.3.0-develop-619434-m3iuomx6",
3
+ "version": "0.3.1-add-update-cycle-49119c-m3ra2qmc",
4
4
  "license": "MIT",
5
5
  "description": "Node-RED nodes for Elasticsearch",
6
6
  "scripts": {