diff --git a/package-lock.json b/package-lock.json index 1b09a8c..56c3bc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -127,12 +127,19 @@ "integrity": "sha512-HbH2b6ybd1cD8VTlx5kEt4N/Vgh9TQTHKlUV4kAORFIOTJOQD5WbCMIVWo+VqYHvYQtokoYFCjM1gctp4M1aWw==", "requires": { "@pushrocks/smartlog-interfaces": "^1.0.9" + }, + "dependencies": { + "@pushrocks/smartlog-interfaces": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.15.tgz", + "integrity": "sha512-dn9a+IhneukhtVGQG031oodOITmmQ5s5hcMThd+cMUQL3XYTbLPnZVuJfTDeWCT0iqLqrBD/qp2d1RRc3W/qIQ==" + } } }, "@pushrocks/smartlog-interfaces": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.15.tgz", - "integrity": "sha512-dn9a+IhneukhtVGQG031oodOITmmQ5s5hcMThd+cMUQL3XYTbLPnZVuJfTDeWCT0iqLqrBD/qp2d1RRc3W/qIQ==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-2.0.0.tgz", + "integrity": "sha512-rk3uEp78AXLULS81SUe6YtZvyQiDImuJu/zxnIzzUFDB6ciisqtJ1qVcHYbVsW/kImeo8vBFlQyKY9/YaNgkDw==" }, "@pushrocks/smartpath": { "version": "4.0.1", @@ -268,9 +275,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "10.12.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.1.tgz", - "integrity": "sha512-i1sl+WCX2OCHeUi9oi7PiCNUtYFrpWhpcx878vpeq/tlZTKzcFdHePlyFHVbWqeuKN0SRPl/9ZFDSTsfv9h7VQ==" + "version": "10.12.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz", + "integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ==" }, "@types/vinyl": { "version": "2.0.2", diff --git a/package.json b/package.json index 2aafb9f..caf55c5 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "@gitzone/tstest": "^1.0.15", "@pushrocks/qenv": "^2.0.2", "@pushrocks/tapbundle": "^3.0.7", - "@types/node": "^10.11.7", + "@types/node": "^10.12.2", "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0" }, "dependencies": { - "@pushrocks/smartlog-interfaces": "^1.0.15", + "@pushrocks/smartlog-interfaces": "^2.0.0", "@pushrocks/smartrequest": "^1.1.14", "@pushrocks/smartstring": "^3.0.4", "@pushrocks/taskbuffer": "^2.0.5" diff --git a/test/test.ts b/test/test.ts index b2c7f94..6af19fd 100644 --- a/test/test.ts +++ b/test/test.ts @@ -14,7 +14,9 @@ tap.test('should create a valid logDna account', async () => { tap.test('should create a standard log message', async () => { testLogMessage = logdna.LogdnaMessage.fromSmartLogPackage({ - logContext: { + type: 'log', + level: 'info', + context: { company: 'Lossless GmbH', companyunit: 'lossless.cloud', containerName: 'ci-mojoio-logdna', @@ -22,7 +24,6 @@ tap.test('should create a standard log message', async () => { runtime: 'node', zone: 'ship.zone' }, - logLevel: 'info', message: 'this is a awesome log message :)' }); }); diff --git a/ts/logdna.classes.logmessage.ts b/ts/logdna.classes.logmessage.ts index 0bff99c..cf19709 100644 --- a/ts/logdna.classes.logmessage.ts +++ b/ts/logdna.classes.logmessage.ts @@ -63,15 +63,15 @@ export class LogdnaMessage { static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage { return new LogdnaMessage({ line: smartlogPackageArg.message, - meta: smartlogPackageArg.logContext, - env: smartlogPackageArg.logContext.environment, - hostname: smartlogPackageArg.logContext.zone, - level: smartlogPackageArg.logLevel, - app: smartlogPackageArg.logContext.zone, + meta: smartlogPackageArg.context, + env: smartlogPackageArg.context.environment, + hostname: smartlogPackageArg.context.zone, + level: smartlogPackageArg.level, + app: smartlogPackageArg.context.zone, tags: (() => { const tagArray: string[] = []; - tagArray.push(smartlogPackageArg.logContext.company); - tagArray.push(smartlogPackageArg.logContext.companyunit); + tagArray.push(smartlogPackageArg.context.company); + tagArray.push(smartlogPackageArg.context.companyunit); return tagArray; })(), ip: '0.0.0.0', diff --git a/ts/logdna.logdnaaccount.ts b/ts/logdna.logdnaaccount.ts index fb9d5fb..93ffea6 100644 --- a/ts/logdna.logdnaaccount.ts +++ b/ts/logdna.logdnaaccount.ts @@ -1,18 +1,19 @@ import * as plugins from './logdna.plugins'; import { LogdnaMessage } from './logdna.classes.logmessage'; +import { ILogPackage } from '@pushrocks/smartlog-interfaces'; /** * the main logdna account */ export class LogdnaAccount { - apiKey: string; - baseUrl = 'https://logs.logdna.com/logs/ingest'; + private apiKey: string; + private baseUrl = 'https://logs.logdna.com/logs/ingest'; /** * Create basic authentication */ - createBasicAuth() { + private createBasicAuth() { const userNamePasswordString = `${this.apiKey}:`; return `Basic ${plugins.smartstring.base64.encode(userNamePasswordString)}`; } @@ -66,4 +67,11 @@ export class LogdnaAccount { requestBody: requestBodyObject }); } + + /** + * convenience function for smartlog + */ + async sendSmartlogPackage (smartlogPackageArg: ILogPackage) { + this.sendLogDnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg)); + } }