@ditjenpajakri/elasticsearch-logging 1.0.0 → 2.0.0

package/README.md

@@ -1,9 +1,25 @@
-@djp/elasticsearch-logging
+@ditjenpajakri/elasticsearch-logging
+
+## Add to existing project
 
 ```
-npm install @djp/elasticsearch-logging
+yarn global add @ditjenpajakri/elasticsearch-logging
+
+# or npm install -g @ditjenpajakri/elasticsearch-logging
+```
+
+Setup the environment variables
+
+```
+LOG_ES_HOST                 Elasticsearch node. Default: http://localhost:9200
+LOG_ES_USER                 Elasticsearch username
+LOG_ES_PASS                 Elasticsearch password
+LOG_ES_INDEX                Elasticsearch Index. Default: DJP-%{DATE}
+LOG_ES_FLUSH_BYTES          Bytes size before flushing to Elasticsearch
+LOG_ES_FLUSH_INTERVAL       Interval time before flushing to Elasticsearch (in ms). Default: 30000 miliseconds
+LOG_ES_REJECT_UNAUTHORIZED  Reject Unauthorized for Self Signed Cert SSL. If not set to true, it will be set to false.
 ```
 
 ```
 node server.js | log-to-es
-```# pino-elasticsearch-logging
+```

package/lib.js

@@ -30,6 +30,8 @@ function initializeBulkHandler (opts, client, splitter) {
         client.connectionPool.resurrect({ name: 'elasticsearch-js' })
       }
     }
+
+    console.log(client)
   
     const bulkInsert = client.helpers.bulk({
       datasource: splitter,
@@ -43,10 +45,9 @@ function initializeBulkHandler (opts, client, splitter) {
         }
   
         return {
-          index: {
+          create: {
             _index: getIndexName(date),
-            _type: type,
-            op_type: opType
+            // _type: type,
           }
         }
       },
@@ -66,7 +67,7 @@ function initializeBulkHandler (opts, client, splitter) {
       if (buildIndexName) {
         return buildIndexName(time)
       }
-      return index.replace('%{DATE}', time.substring(0, 10))
+      return index.replace('%{DATE}', time.substring ? time.substring(0, 10) : "")
     }
   }
   
@@ -93,11 +94,11 @@ function pinoElasticSearch(opts = {}) {
         if (typeof value !== 'object') {
             value = {
                 data: value,
-                time: setDateTimeString(value)
+                ['@timestamp']: setDateTimeString(value)
             }
         } else {
             if (value['@timestamp'] === undefined) {
-                value.time = setDateTimeString(value)
+                value['@timestamp'] = setDateTimeString(value)
             }
         }
         return value
@@ -107,7 +108,9 @@ function pinoElasticSearch(opts = {}) {
         node: opts.node,
         auth: opts.auth,
         // cloud: opts.cloud,
-        ssl: { rejectUnauthorized: opts.rejectUnauthorized, ...opts.tls }
+        tls: {
+            rejectUnauthorized: false
+          }
     }
 
     if (opts.caFingerprint) {
@@ -125,7 +128,7 @@ function pinoElasticSearch(opts = {}) {
     const client = new Client(clientOpts)
     console.log("Logging to elasticsearch...");
     console.log("Any line showing up here means that the line was not logged to elasticsearch.");
-    client.on('resurrect', () => {
+    client.diagnostic.on('resurrect', () => {
         initializeBulkHandler(opts, client, splitter)
     })
 
@@ -145,6 +148,7 @@ function start(opts) {
         console.error('Elasticsearch client error:', error)
     })
     stream.on('insertError', (error) => {
+        console.log(JSON.stringify(error))
         console.error('Elasticsearch server error:', error)
     })
 
@@ -160,8 +164,9 @@ if (require.main === module) {
             username: process.env.LOG_ES_USER || 'elastic',
             password: process.env.LOG_ES_PASS || 'changeme'
         },
-        index: process.env.LOG_ES_INDEX || 'pino-%{DATE}',
+        index: process.env.LOG_ES_INDEX || 'DJP-%{DATE}',
         flushBytes: process.env.LOG_ES_FLUSH_BYTES ? parseInt(process.env.LOG_ES_FLUSH_BYTES) : undefined,
-        rejectUnauthorized: process.env.LOG_ES_REJECT_UNAUTHORIZED === 'true' ? true : false
+        flushInterval: process.env.LOG_ES_FLUSH_INTERVAL ? parseInt(process.env.LOG_ES_FLUSH_INTERVAL) : undefined,
+        rejectUnauthorized: process.env.LOG_ES_REJECT_UNAUTHORIZED === 'true' ? true : false,
     })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditjenpajakri/elasticsearch-logging",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Elasticsearch ",
   "main": "lib.js",
   "bin": {
@@ -16,7 +16,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@elastic/elasticsearch": "^7.17.12",
+    "@elastic/elasticsearch": "8",
     "pump": "^3.0.0",
     "split2": "^4.2.0"
   },