Merge pull request #15 from Codebucket-Solutions/dev

transport changes

Author: Abhinav Gautam

.env.example

@@ -1,4 +1,7 @@
 LOGSTASH_HOST=
 LOGSTASH_PORT=
 SSL_CERT_PATH=
-SSL_KEY_PATH=
+SSL_KEY_PATH=
+USE_LOGSERVER=   //Set Yes to use logserver instead of directly connecting to logstash
+LOGSERVER_BASEURL=
+LOGSERVER_API_KEY=

app.ts

@@ -4,25 +4,43 @@ import os from "os";
 import winston from "winston";
 import stripAnsi from "strip-ansi";
 import LogstashTransport from "winston-logstash/lib/winston-logstash-latest.js";
+import { LogserverTransport } from "winston-logserver-transport";
 
 dotenv.config();
 
-const { LOGSTASH_HOST, LOGSTASH_PORT, SSL_CERT_PATH, SSL_KEY_PATH } =
-  process.env;
+const {
+  LOGSTASH_HOST,
+  LOGSTASH_PORT,
+  SSL_CERT_PATH,
+  SSL_KEY_PATH,
+  USE_LOGSERVER,
+  LOGSERVER_BASEURL,
+  LOGSERVER_API_KEY,
+} = process.env;
+
 const hostname = os.hostname();
 
 const logger = winston.createLogger();
 
-logger.add(
-  new LogstashTransport({
-    port: LOGSTASH_PORT,
-    host: LOGSTASH_HOST,
-    ssl_enable: true,
-    ssl_key: SSL_KEY_PATH,
-    ssl_cert: SSL_CERT_PATH,
-    rejectUnauthorized: false, //Does Not Work Without This Apparently
-  })
-);
+if (USE_LOGSERVER == "yes")
+  logger.add(
+    new LogserverTransport({
+      apiBaseUrl: LOGSERVER_BASEURL,
+      apiKey: LOGSERVER_API_KEY,
+    })
+  );
+else {
+  logger.add(
+    new LogstashTransport({
+      port: LOGSTASH_PORT,
+      host: LOGSTASH_HOST,
+      ssl_enable: true,
+      ssl_key: SSL_KEY_PATH,
+      ssl_cert: SSL_CERT_PATH,
+      rejectUnauthorized: false, //Does Not Work Without This Apparently
+    })
+  );
+}
 
 logger.on("error", (error) => {
   console.log(error);
@@ -55,8 +73,8 @@ pm2.launchBus(function (err, bus) {
           service: "PM2",
           application: log.process.name,
           environment: errorFlag ? "error" : "output",
-          level: errorFlag ? "error" : "info",
-          user: hostname,
+          logLevel: errorFlag ? "error" : "info",
+          host: hostname,
           message: log.data,
         };
         logger.info(message);
@@ -73,8 +91,8 @@ pm2.launchBus(function (err, bus) {
         service: "PM2",
         application: log.process.name,
         environment: "error",
-        level: "error",
-        user: hostname,
+        logLevel: "error",
+        host: hostname,
         message: log.data,
       };
       logger.error(message);

dist/app.js

@@ -4,18 +4,26 @@ import os from "os";
 import winston from "winston";
 import stripAnsi from "strip-ansi";
 import LogstashTransport from "winston-logstash/lib/winston-logstash-latest.js";
+import { LogserverTransport } from "winston-logserver-transport";
 dotenv.config();
-const { LOGSTASH_HOST, LOGSTASH_PORT, SSL_CERT_PATH, SSL_KEY_PATH } = process.env;
+const { LOGSTASH_HOST, LOGSTASH_PORT, SSL_CERT_PATH, SSL_KEY_PATH, USE_LOGSERVER, LOGSERVER_BASEURL, LOGSERVER_API_KEY, } = process.env;
 const hostname = os.hostname();
 const logger = winston.createLogger();
-logger.add(new LogstashTransport({
-    port: LOGSTASH_PORT,
-    host: LOGSTASH_HOST,
-    ssl_enable: true,
-    ssl_key: SSL_KEY_PATH,
-    ssl_cert: SSL_CERT_PATH,
-    rejectUnauthorized: false, //Does Not Work Without This Apparently
-}));
+if (USE_LOGSERVER == "yes")
+    logger.add(new LogserverTransport({
+        apiBaseUrl: LOGSERVER_BASEURL,
+        apiKey: LOGSERVER_API_KEY,
+    }));
+else {
+    logger.add(new LogstashTransport({
+        port: LOGSTASH_PORT,
+        host: LOGSTASH_HOST,
+        ssl_enable: true,
+        ssl_key: SSL_KEY_PATH,
+        ssl_cert: SSL_CERT_PATH,
+        rejectUnauthorized: false, //Does Not Work Without This Apparently
+    }));
+}
 logger.on("error", (error) => {
     console.log(error);
 });
@@ -35,8 +43,8 @@ pm2.launchBus(function (err, bus) {
                     service: "PM2",
                     application: log.process.name,
                     environment: errorFlag ? "error" : "output",
-                    level: errorFlag ? "error" : "info",
-                    user: hostname,
+                    logLevel: errorFlag ? "error" : "info",
+                    host: hostname,
                     message: log.data,
                 };
                 logger.info(message);
@@ -52,8 +60,8 @@ pm2.launchBus(function (err, bus) {
                 service: "PM2",
                 application: log.process.name,
                 environment: "error",
-                level: "error",
-                user: hostname,
+                logLevel: "error",
+                host: hostname,
                 message: log.data,
             };
             logger.error(message);

package.json

@@ -9,6 +9,7 @@
     "pm2": "^5.3.1",
     "strip-ansi": "^7.1.0",
     "winston": "^3.13.0",
+    "winston-logserver-transport": "github:Codebucket-Solutions/Winston-Logstash-Batch-Server-Transport",
     "winston-logstash": "^1.2.1"
   },
   "name": "pm2-logstash-typescript",