Compare commits
44 Commits
Author | SHA1 | Date | |
---|---|---|---|
c71cff4011 | |||
75aecdb064 | |||
faf736f353 | |||
dca54899bf | |||
7dac427f00 | |||
e451c38f32 | |||
540e5be2fa | |||
7d29f88356 | |||
9d81f059fe | |||
52cdf6f9fe | |||
1339db1adf | |||
2b42bd59c5 | |||
4cd9ce8510 | |||
cf2620bd41 | |||
1d1a438f8e | |||
aec150a240 | |||
958a5d4db5 | |||
3a2af6634d | |||
d89b610006 | |||
56bc5dfcdd | |||
f49062d247 | |||
bd45505c6a | |||
e7f2ecc8d6 | |||
3950af87bd | |||
9d2b689d01 | |||
9384dcc60e | |||
a03395d5b2 | |||
a26080a50a | |||
7d0207b4e3 | |||
650cdfbfb8 | |||
4febec9e89 | |||
b65f3af9cf | |||
373b02adb4 | |||
11b08cc0a3 | |||
a586069305 | |||
8a8c4efcbb | |||
dbb5843f52 | |||
d021e934b9 | |||
3bd8ebb29d | |||
2429e7b7c1 | |||
2bf5665fea | |||
7d62306913 | |||
484e5d51cc | |||
a8bac181a4 |
16
.gitignore
vendored
16
.gitignore
vendored
@ -1,6 +1,20 @@
|
||||
.nogit/
|
||||
node_modules/
|
||||
|
||||
# artifacts
|
||||
coverage/
|
||||
public/
|
||||
pages/
|
||||
|
||||
# installs
|
||||
node_modules/
|
||||
|
||||
# caches
|
||||
.yarn/
|
||||
.cache/
|
||||
.rpt2_cache
|
||||
|
||||
# builds
|
||||
dist/
|
||||
dist_*/
|
||||
|
||||
# custom
|
138
.gitlab-ci.yml
138
.gitlab-ci.yml
@ -1,16 +1,16 @@
|
||||
# gitzone standard
|
||||
image: hosttoday/ht-docker-node:npmci
|
||||
# gitzone ci_default
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
|
||||
cache:
|
||||
paths:
|
||||
- .npmci_cache/
|
||||
key: "$CI_BUILD_STAGE"
|
||||
- .npmci_cache/
|
||||
key: '$CI_BUILD_STAGE'
|
||||
|
||||
stages:
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
|
||||
# ====================
|
||||
# security stage
|
||||
@ -18,114 +18,104 @@ stages:
|
||||
mirror:
|
||||
stage: security
|
||||
script:
|
||||
- npmci git mirror
|
||||
- npmci git mirror
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
snyk:
|
||||
audit:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci command npm install -g snyk
|
||||
- npmci command npm install --ignore-scripts
|
||||
- npmci command snyk test
|
||||
- npmci command npm config set registry https://registry.npmjs.org
|
||||
- npmci command npm audit --audit-level=high
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
# ====================
|
||||
# test stage
|
||||
# ====================
|
||||
testLEGACY:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install legacy
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
allow_failure: true
|
||||
|
||||
testLTS:
|
||||
testStable:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install lts
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
testSTABLE:
|
||||
- lossless
|
||||
- docker
|
||||
- priv
|
||||
|
||||
testBuild:
|
||||
stage: test
|
||||
script:
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci npm test
|
||||
- npmci npm prepare
|
||||
- npmci node install stable
|
||||
- npmci npm install
|
||||
- npmci command npm run build
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
release:
|
||||
stage: release
|
||||
script:
|
||||
- npmci node install stable
|
||||
- npmci npm publish
|
||||
- npmci node install stable
|
||||
- npmci npm publish
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
# ====================
|
||||
# metadata stage
|
||||
# ====================
|
||||
codequality:
|
||||
stage: metadata
|
||||
image: docker:stable
|
||||
allow_failure: true
|
||||
services:
|
||||
- docker:stable-dind
|
||||
script:
|
||||
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
|
||||
- docker run
|
||||
--env SOURCE_CODE="$PWD"
|
||||
--volume "$PWD":/code
|
||||
--volume /var/run/docker.sock:/var/run/docker.sock
|
||||
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
|
||||
artifacts:
|
||||
paths: [codeclimate.json]
|
||||
- npmci command npm install -g tslint typescript
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||
tags:
|
||||
- docker
|
||||
- priv
|
||||
- lossless
|
||||
- docker
|
||||
- priv
|
||||
|
||||
trigger:
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci trigger
|
||||
- npmci trigger
|
||||
only:
|
||||
- tags
|
||||
- tags
|
||||
tags:
|
||||
- docker
|
||||
- notpriv
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
pages:
|
||||
image: hosttoday/ht-docker-node:npmci
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci command npm install -g typedoc typescript
|
||||
- npmci node install lts
|
||||
- npmci command npm install -g @gitzone/tsdoc
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
|
||||
- npmci command tsdoc
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
only:
|
||||
@ -133,15 +123,5 @@ pages:
|
||||
artifacts:
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- public
|
||||
allow_failure: true
|
||||
|
||||
windowsCompatibility:
|
||||
image: stefanscherer/node-windows:10-build-tools
|
||||
stage: metadata
|
||||
script:
|
||||
- npm install & npm test
|
||||
coverage: /\d+.?\d+?\%\s*coverage/
|
||||
tags:
|
||||
- windows
|
||||
- public
|
||||
allow_failure: true
|
||||
|
29
.vscode/launch.json
vendored
Normal file
29
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "current file",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"${relativeFile}"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"name": "test.ts",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"test/test.ts"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
}
|
||||
]
|
||||
}
|
26
.vscode/settings.json
vendored
Normal file
26
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
"json.schemas": [
|
||||
{
|
||||
"fileMatch": ["/npmextra.json"],
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"npmci": {
|
||||
"type": "object",
|
||||
"description": "settings for npmci"
|
||||
},
|
||||
"gitzone": {
|
||||
"type": "object",
|
||||
"description": "settings for gitzone",
|
||||
"properties": {
|
||||
"projectType": {
|
||||
"type": "string",
|
||||
"enum": ["website", "element", "service", "npm"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -2,5 +2,16 @@
|
||||
"npmci": {
|
||||
"npmGlobalTools": [],
|
||||
"npmAccessLevel": "public"
|
||||
},
|
||||
"gitzone": {
|
||||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "mojoio",
|
||||
"gitrepo": "logdna",
|
||||
"shortDescription": "an unoffical package for the logdna api",
|
||||
"npmPackagename": "@mojoio/logdna",
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
26128
package-lock.json
generated
26128
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
47
package.json
47
package.json
@ -1,30 +1,43 @@
|
||||
{
|
||||
"name": "@mojoio/logdna",
|
||||
"version": "1.0.15",
|
||||
"version": "1.0.37",
|
||||
"private": false,
|
||||
"description": "anunoffical package for the logdna api",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
"description": "an unoffical package for the logdna api",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
"author": "Lossless GmbH",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"test": "(tstest test/)",
|
||||
"build": "(tsbuild)",
|
||||
"build": "(tsbuild --web)",
|
||||
"format": "(gitzone format)"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.0.22",
|
||||
"@gitzone/tstest": "^1.0.15",
|
||||
"@pushrocks/qenv": "^2.0.2",
|
||||
"@pushrocks/tapbundle": "^3.0.7",
|
||||
"@types/node": "^10.12.2",
|
||||
"tslint": "^5.11.0",
|
||||
"tslint-config-prettier": "^1.15.0"
|
||||
"@gitzone/tsbuild": "^2.1.25",
|
||||
"@gitzone/tstest": "^1.0.54",
|
||||
"@pushrocks/qenv": "^4.0.10",
|
||||
"@pushrocks/tapbundle": "^3.2.14",
|
||||
"@types/node": "^14.0.11",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@pushrocks/smartlog-interfaces": "^2.0.1",
|
||||
"@pushrocks/smartrequest": "^1.1.14",
|
||||
"@pushrocks/smartstring": "^3.0.4",
|
||||
"@pushrocks/taskbuffer": "^2.0.5"
|
||||
}
|
||||
"@pushrocks/lik": "^4.0.20",
|
||||
"@pushrocks/smartlog-interfaces": "^2.0.22",
|
||||
"@pushrocks/smartrequest": "^1.1.52",
|
||||
"@pushrocks/smartstring": "^3.0.24",
|
||||
"@pushrocks/taskbuffer": "^2.1.13"
|
||||
},
|
||||
"files": [
|
||||
"ts/**/*",
|
||||
"ts_web/**/*",
|
||||
"dist/**/*",
|
||||
"dist_*/**/*",
|
||||
"dist_ts/**/*",
|
||||
"dist_ts_web/**/*",
|
||||
"assets/**/*",
|
||||
"cli.js",
|
||||
"npmextra.json",
|
||||
"readme.md"
|
||||
]
|
||||
}
|
||||
|
81
readme.md
Normal file
81
readme.md
Normal file
@ -0,0 +1,81 @@
|
||||
# @mojoio/logdna
|
||||
an unoffical package for the logdna api
|
||||
|
||||
## Availabililty and Links
|
||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/logdna)
|
||||
* [gitlab.com (source)](https://gitlab.com/mojoio/logdna)
|
||||
* [github.com (source mirror)](https://github.com/mojoio/logdna)
|
||||
* [docs (typedoc)](https://mojoio.gitlab.io/logdna/)
|
||||
|
||||
## Status for master
|
||||
|
||||
Status Category | Status Badge
|
||||
-- | --
|
||||
GitLab Pipelines | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
TypeScript Support | [](https://lossless.cloud)
|
||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
Code Style | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||
|
||||
## Usage
|
||||
|
||||
Use TypeScript for best in class instellisense.
|
||||
|
||||
This package is an unofficial package for the logdna.com service. It comes with the following features:
|
||||
|
||||
- aggregate logs that require the same uri query parameters and sends them as bundle. This ensures the correct order of logs within logdna.
|
||||
- resend logs that failed to send.
|
||||
- support smartlog messages and the smartlog ecosystem
|
||||
- support giraffe.cloud ecosystem
|
||||
|
||||
```typescript
|
||||
import { ILogPackage } from '@pushrocks/smartlog-interfaces';
|
||||
|
||||
import { LogdnaAccount, LogdnaMessage } from '@mojoio/logdna';
|
||||
|
||||
// lets create a logDnaAccount
|
||||
const logDnaAccount = new LogdnaAccount(process.env.LOGDNA_APIKEY);
|
||||
|
||||
// lets create a smartlog message (smartlog normally takes care of creating those objects)
|
||||
const smartlogPackage: ILogPackage = {
|
||||
timestamp: Date.now(),
|
||||
type: 'log',
|
||||
level: 'info',
|
||||
context: {
|
||||
company: 'Lossless GmbH',
|
||||
companyunit: 'lossless.cloud',
|
||||
containerName: 'ci-mojoio-logdna',
|
||||
environment: 'test',
|
||||
runtime: 'node',
|
||||
zone: 'shipzone'
|
||||
},
|
||||
message: 'this is an awesome log message sent by the tapbundle test'
|
||||
};
|
||||
|
||||
const logdnaMessage = LogdnaMessage.fromSmartLogPackage(smartlogPackage);
|
||||
|
||||
logDnaAccount.sendLogdnaMessage(logdnaMessage);
|
||||
|
||||
// alternatively simply send the smartlogPackage
|
||||
// creation of the LogdnaMessage is done for you
|
||||
logDnaAccount.sendSmartlogPackage(smartlogPackage);
|
||||
|
||||
// most of the above funtions return promises should you want to wait for a log to be fully sent
|
||||
```
|
||||
|
||||
## Contribution
|
||||
|
||||
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||
|
||||
For further information read the linked docs at the top of this readme.
|
||||
|
||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
||||
|
||||
[](https://maintainedby.lossless.com)
|
80
test/test.ts
80
test/test.ts
@ -2,6 +2,7 @@ import { expect, tap } from '@pushrocks/tapbundle';
|
||||
import * as logdna from '../ts/index';
|
||||
|
||||
import { Qenv } from '@pushrocks/qenv';
|
||||
import { ILogPackage } from '@pushrocks/smartlog-interfaces';
|
||||
|
||||
const testQenv = new Qenv('./', './.nogit');
|
||||
|
||||
@ -9,12 +10,13 @@ let testLogDnaAccount: logdna.LogdnaAccount;
|
||||
let testLogMessage: logdna.LogdnaMessage;
|
||||
|
||||
tap.test('should create a valid logDna account', async () => {
|
||||
testLogDnaAccount = new logdna.LogdnaAccount(process.env.LOGDNA_APIKEY);
|
||||
testLogDnaAccount = new logdna.LogdnaAccount(testQenv.getEnvVarOnDemand('LOGDNA_APIKEY'));
|
||||
});
|
||||
|
||||
tap.test('should create a standard log message', async () => {
|
||||
testLogMessage = logdna.LogdnaMessage.fromSmartLogPackage({
|
||||
type: 'log',
|
||||
timestamp: Date.now(),
|
||||
type: 'log',
|
||||
level: 'info',
|
||||
context: {
|
||||
company: 'Lossless GmbH',
|
||||
@ -24,12 +26,82 @@ tap.test('should create a standard log message', async () => {
|
||||
runtime: 'node',
|
||||
zone: 'shipzone'
|
||||
},
|
||||
message: 'this is an awesome log message :)'
|
||||
correlation: {
|
||||
id: '123',
|
||||
type: 'none'
|
||||
},
|
||||
message: 'this is an awesome log message sent by the tapbundle test'
|
||||
});
|
||||
});
|
||||
|
||||
tap.test('should send the message', async () => {
|
||||
await testLogDnaAccount.sendLogDnaMessage(testLogMessage);
|
||||
await testLogDnaAccount.sendLogdnaMessage(testLogMessage);
|
||||
});
|
||||
|
||||
tap.test('should send in order', async () => {
|
||||
let i = 1;
|
||||
while (i < 21) {
|
||||
const testSmartlogMessage: ILogPackage = {
|
||||
timestamp: Date.now(),
|
||||
type: 'log',
|
||||
level: 'info',
|
||||
context: {
|
||||
company: 'Lossless GmbH',
|
||||
companyunit: 'lossless.cloud',
|
||||
containerName: 'ci-mojoio-logdna',
|
||||
environment: 'test',
|
||||
runtime: 'node',
|
||||
zone: 'shipzone'
|
||||
},
|
||||
message: `this is an awesome log message sent by the tapbundle test #${i}`,
|
||||
correlation: {
|
||||
id: '123',
|
||||
type: 'none'
|
||||
}
|
||||
};
|
||||
testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage);
|
||||
i++;
|
||||
}
|
||||
|
||||
const testSmartlogMessage2: ILogPackage = {
|
||||
timestamp: Date.now(),
|
||||
type: 'log',
|
||||
level: 'warn',
|
||||
context: {
|
||||
company: 'Lossless GmbH',
|
||||
companyunit: 'lossless.cloud',
|
||||
containerName: 'ci-mojoio-logdna',
|
||||
environment: 'test',
|
||||
runtime: 'node',
|
||||
zone: 'shipzone'
|
||||
},
|
||||
correlation: {
|
||||
id: '123',
|
||||
type: 'none'
|
||||
},
|
||||
message: `this is an awesome log message sent by the tapbundle test #${i}`
|
||||
};
|
||||
testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage2);
|
||||
|
||||
const testSmartlogMessage3: ILogPackage = {
|
||||
timestamp: Date.now(),
|
||||
type: 'log',
|
||||
level: 'error',
|
||||
context: {
|
||||
company: 'Lossless GmbH',
|
||||
companyunit: 'lossless.cloud',
|
||||
containerName: 'ci-mojoio-logdna',
|
||||
environment: 'test',
|
||||
runtime: 'node',
|
||||
zone: 'shipzone'
|
||||
},
|
||||
correlation: {
|
||||
id: '123',
|
||||
type: 'none'
|
||||
},
|
||||
message: `this is an awesome log message sent by the tapbundle test #${i}`
|
||||
};
|
||||
testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage3);
|
||||
});
|
||||
|
||||
tap.start();
|
||||
|
61
ts/logdna.aggregator.ts
Normal file
61
ts/logdna.aggregator.ts
Normal file
@ -0,0 +1,61 @@
|
||||
import * as plugins from './logdna.plugins';
|
||||
import { LogdnaAccount } from './logdna.logdnaaccount';
|
||||
|
||||
export interface ILogCandidate {
|
||||
urlIdentifier: string;
|
||||
logLines: any[];
|
||||
}
|
||||
|
||||
export class LogAggregator {
|
||||
private apiKey: string;
|
||||
private baseUrl = 'https://logs.logdna.com/logs/ingest';
|
||||
|
||||
private logObjectMap = new plugins.lik.ObjectMap<ILogCandidate>();
|
||||
|
||||
constructor(apiKeyArg: string) {
|
||||
this.apiKey = apiKeyArg;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create basic authentication
|
||||
*/
|
||||
private createBasicAuth() {
|
||||
const userNamePasswordString = `${this.apiKey}:`;
|
||||
return `Basic ${plugins.smartstring.base64.encode(userNamePasswordString)}`;
|
||||
}
|
||||
|
||||
public addLog(urlIdentifierArg: string, logLineArg: any) {
|
||||
let existinglogCandidate = this.logObjectMap.find(logCandidate => {
|
||||
return logCandidate.urlIdentifier === urlIdentifierArg;
|
||||
});
|
||||
if (!existinglogCandidate) {
|
||||
existinglogCandidate = { urlIdentifier: urlIdentifierArg, logLines: [] };
|
||||
this.logObjectMap.add(existinglogCandidate);
|
||||
setTimeout(() => {
|
||||
this.sendAggregatedLogs(existinglogCandidate);
|
||||
}, 500);
|
||||
}
|
||||
existinglogCandidate.logLines.push(logLineArg);
|
||||
}
|
||||
|
||||
private async sendAggregatedLogs(logCandidate: ILogCandidate) {
|
||||
this.logObjectMap.remove(logCandidate);
|
||||
// lets post the message to logdna
|
||||
const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`;
|
||||
const response = await plugins.smartrequest.postJson(
|
||||
url,
|
||||
{
|
||||
headers: {
|
||||
Authorization: this.createBasicAuth(),
|
||||
charset: 'UTF-8'
|
||||
},
|
||||
requestBody: {
|
||||
lines: logCandidate.logLines
|
||||
}
|
||||
}
|
||||
);
|
||||
if (response.statusCode !== 200) {
|
||||
console.log(response.body);
|
||||
}
|
||||
}
|
||||
}
|
@ -6,6 +6,11 @@ import { TLogLevel, TEnvironment, ILogPackage } from '@pushrocks/smartlog-interf
|
||||
* the constructor options for LogdnaMessage
|
||||
*/
|
||||
export interface ILogdnaMessageContructorOptions {
|
||||
/**
|
||||
* a timestamp for then the log message was created
|
||||
*/
|
||||
timestamp: number;
|
||||
|
||||
/**
|
||||
* the hostname where the log message was created
|
||||
*/
|
||||
@ -60,12 +65,15 @@ export class LogdnaMessage {
|
||||
* create lgdna messages from smartlog package
|
||||
* @param smartlogPackageArg
|
||||
*/
|
||||
static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage {
|
||||
public static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage {
|
||||
return new LogdnaMessage({
|
||||
timestamp: smartlogPackageArg.timestamp,
|
||||
line: smartlogPackageArg.message,
|
||||
meta: {
|
||||
...smartlogPackageArg.context,
|
||||
logType: smartlogPackageArg.type
|
||||
logType: smartlogPackageArg.type,
|
||||
correlation: smartlogPackageArg.correlation,
|
||||
data: smartlogPackageArg.data || {}
|
||||
},
|
||||
env: smartlogPackageArg.context.environment,
|
||||
hostname: smartlogPackageArg.context.zone,
|
||||
|
@ -1,86 +1,75 @@
|
||||
import * as plugins from './logdna.plugins';
|
||||
|
||||
import { LogdnaMessage } from './logdna.classes.logmessage';
|
||||
import { LogAggregator } from './logdna.aggregator';
|
||||
import { ILogPackage, ILogDestination } from '@pushrocks/smartlog-interfaces';
|
||||
|
||||
/**
|
||||
* the main logdna account
|
||||
*/
|
||||
export class LogdnaAccount {
|
||||
private apiKey: string;
|
||||
private baseUrl = 'https://logs.logdna.com/logs/ingest';
|
||||
|
||||
/**
|
||||
* Create basic authentication
|
||||
*/
|
||||
private createBasicAuth() {
|
||||
const userNamePasswordString = `${this.apiKey}:`;
|
||||
return `Basic ${plugins.smartstring.base64.encode(userNamePasswordString)}`;
|
||||
}
|
||||
private logAggregator: LogAggregator;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param apiKeyArg
|
||||
*/
|
||||
constructor(apiKeyArg: string) {
|
||||
this.apiKey = apiKeyArg;
|
||||
this.logAggregator = new LogAggregator(apiKeyArg);
|
||||
}
|
||||
|
||||
/**
|
||||
* sends a logmessage
|
||||
* async, so it returns a Promise. In most cases it does not make sense to wait for it though.
|
||||
*/
|
||||
public async sendLogDnaMessage(logdnaMessageArg: LogdnaMessage) {
|
||||
public async sendLogdnaMessage(logdnaMessageArg: LogdnaMessage) {
|
||||
const lm = logdnaMessageArg;
|
||||
const euc = encodeURIComponent;
|
||||
|
||||
// let construct the request uri
|
||||
const requestUrlWithParams = `${this.baseUrl}?hostname=${euc(lm.options.hostname)}&mac=${euc(
|
||||
lm.options.mac
|
||||
)}&ip=1${euc(lm.options.ip)}&now=${Date.now()}`;
|
||||
const uriHostname = euc(lm.options.hostname);
|
||||
const uriMac = euc(lm.options.mac);
|
||||
const uriIp = euc(lm.options.ip);
|
||||
const uriTags = euc(
|
||||
(() => {
|
||||
let first = true;
|
||||
return lm.options.tags.reduce((reduced, newItem) => {
|
||||
if (first) {
|
||||
first = false;
|
||||
reduced = euc(reduced);
|
||||
}
|
||||
return `${reduced},${euc(newItem)}`;
|
||||
});
|
||||
})()
|
||||
)
|
||||
|
||||
const requestBodyObject = {
|
||||
lines: [
|
||||
{
|
||||
line: lm.options.line,
|
||||
app: lm.options.app,
|
||||
level: lm.options.level,
|
||||
env: lm.options.env,
|
||||
meta: lm.options.meta,
|
||||
tags: (() => {
|
||||
return lm.options.tags.reduce((reduced, newItem) => {
|
||||
return `${reduced},${newItem}`;
|
||||
});
|
||||
})()
|
||||
}
|
||||
]
|
||||
// let construct the request uri
|
||||
const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`;
|
||||
|
||||
const logLine = {
|
||||
timestamp: lm.options.timestamp,
|
||||
line: lm.options.line,
|
||||
app: lm.options.app,
|
||||
level: lm.options.level,
|
||||
env: lm.options.env,
|
||||
meta: lm.options.meta
|
||||
};
|
||||
|
||||
// console.log(requestBodyObject);
|
||||
|
||||
// lets post the message to logdna
|
||||
await plugins.smartrequest.postJson(requestUrlWithParams, {
|
||||
headers: {
|
||||
Authorization: this.createBasicAuth(),
|
||||
charset: 'UTF-8'
|
||||
},
|
||||
requestBody: requestBodyObject
|
||||
});
|
||||
this.logAggregator.addLog(requestUrlWithParams, logLine);
|
||||
}
|
||||
|
||||
/**
|
||||
* convenience function for smartlog
|
||||
*/
|
||||
public async sendSmartlogPackage (smartlogPackageArg: ILogPackage) {
|
||||
this.sendLogDnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg));
|
||||
public async sendSmartlogPackage(smartlogPackageArg: ILogPackage) {
|
||||
this.sendLogdnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg));
|
||||
}
|
||||
|
||||
/**
|
||||
* returns a smartlog compatible log destination
|
||||
*/
|
||||
public get smartlogDestination (): ILogDestination {
|
||||
public get smartlogDestination(): ILogDestination {
|
||||
return {
|
||||
handleLog: (logPackageArg) => {
|
||||
handleLog: async logPackageArg => {
|
||||
this.sendSmartlogPackage(logPackageArg);
|
||||
}
|
||||
};
|
||||
|
@ -1,5 +1,6 @@
|
||||
import * as lik from '@pushrocks/lik';
|
||||
import * as smartrequest from '@pushrocks/smartrequest';
|
||||
import * as smartstring from '@pushrocks/smartstring';
|
||||
import * as smartlogInterfaces from '@pushrocks/smartlog-interfaces';
|
||||
|
||||
export { smartrequest, smartstring, smartlogInterfaces };
|
||||
export { lik, smartrequest, smartstring, smartlogInterfaces };
|
||||
|
Reference in New Issue
Block a user