1.0.41

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiclient.xyz/elasticsearch",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "private": false,
   "description": "log to elasticsearch in a kibana compatible format",
   "main": "dist_ts/index.js",

qenv.yml

@@ -1,5 +1,4 @@
 required:
-  - ELK_DOMAIN
+  - ELK_NODE
-  - ELK_PORT
   - ELK_USER
   - ELK_PASS

test/test.nonci.ts

@@ -10,9 +10,9 @@ tap.test('first test', async () => {
   testElasticLog = new elasticsearch.ElasticSearch({
     indexPrefix: 'smartlog',
     indexRetention: 7,
-    domain: testQenv.getEnvVarOnDemand('ELK_DOMAIN'),
+    node: testQenv.getEnvVarOnDemand('ELK_NODE'),
-    port: parseInt(testQenv.getEnvVarOnDemand('ELK_PORT'), 10),
+    user: '',
-    ssl: true,
+    pass: '',
   });
   expect(testElasticLog).toBeInstanceOf(elasticsearch.ElasticSearch);
 });

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@apiclient.xyz/elasticsearch',
-  version: '1.0.39',
+  version: '1.0.41',
   description: 'log to elasticsearch in a kibana compatible format'
 }

ts/elasticsearch.classes.elasticsearch.ts

@@ -14,9 +14,7 @@ export interface IStandardLogParams {
 export interface IElasticSearchConstructorOptions {
   indexPrefix: string;
   indexRetention: number;
-  port: number;
+  node: string;
-  domain: string;
-  ssl: boolean;
   user?: string;
   pass?: string;
 }
@@ -35,31 +33,16 @@ export class ElasticSearch<T> {
    */
   constructor(optionsArg: IElasticSearchConstructorOptions) {
     this.client = new ElasticClient({
-      node: this.computeHostString(optionsArg),
+      node: optionsArg.node,
-      // log: 'trace'
+      auth: {
+        username: optionsArg.user,
+        password: optionsArg.pass,
+      }
     });
     this.indexPrefix = optionsArg.indexPrefix;
     this.indexRetention = optionsArg.indexRetention;
   }
 
-  /**
-   * computes the host string from the constructor options
-   * @param optionsArg
-   */
-  private computeHostString(optionsArg: IElasticSearchConstructorOptions): string {
-    let hostString = `${optionsArg.domain}:${optionsArg.port}`;
-    if (optionsArg.user && optionsArg.pass) {
-      hostString = `${optionsArg.user}:${optionsArg.pass}@${hostString}`;
-    }
-    if (optionsArg.ssl) {
-      hostString = `https://${hostString}`;
-    } else {
-      hostString = `http://${hostString}`;
-    }
-    console.log(hostString);
-    return hostString;
-  }
-
   public async log(logPackageArg: ILogPackage, scheduleOverwrite = false) {
     const now = new Date();
     const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${(