@spinajs/log-source-graphana-loki 2.0.400 → 2.0.401
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/index.d.ts +10 -12
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +11 -11
- package/lib/cjs/index.js.map +1 -1
- package/lib/mjs/index.d.ts +10 -12
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +11 -11
- package/lib/mjs/index.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +4 -4
package/lib/cjs/index.d.ts
CHANGED
|
@@ -2,18 +2,16 @@ import { IInstanceCheck } from "@spinajs/di";
|
|
|
2
2
|
import { Log, ILogEntry, LogTarget, ICommonTargetOptions } from "@spinajs/log";
|
|
3
3
|
import { Axios } from "axios";
|
|
4
4
|
export interface IGraphanaOptions extends ICommonTargetOptions {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
app: string;
|
|
16
|
-
};
|
|
5
|
+
interval: number;
|
|
6
|
+
bufferSize: number;
|
|
7
|
+
timeout: number;
|
|
8
|
+
host: string;
|
|
9
|
+
auth: {
|
|
10
|
+
username: string;
|
|
11
|
+
password: string;
|
|
12
|
+
};
|
|
13
|
+
labels: {
|
|
14
|
+
app: string;
|
|
17
15
|
};
|
|
18
16
|
}
|
|
19
17
|
declare enum TargetStatus {
|
package/lib/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAU,MAAM,cAAc,CAAC;AAGvF,OAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGrC,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAU,MAAM,cAAc,CAAC;AAGvF,OAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGrC,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAE5D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAWD,aAAK,YAAY;IACf,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,qBAAsB,SAAQ,SAAS,CAAC,gBAAgB,CAAE,YAAW,cAAc;IAE9F,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IACpC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE,CAAM;IAEzC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAqB;IAEnD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC;IACrC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC;gBAEnB,OAAO,EAAE,gBAAgB;IAarC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,GAAG,OAAO;IAIxD,OAAO,IAAI,IAAI;IAyBf,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA2BtB,OAAO;IAWpB,SAAS,CAAC,KAAK;CA+ChB"}
|
package/lib/cjs/index.js
CHANGED
|
@@ -33,23 +33,23 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
33
33
|
this.Entries = [];
|
|
34
34
|
this.WriteEntries = [];
|
|
35
35
|
this.Status = TargetStatus.IDLE;
|
|
36
|
-
this.Options
|
|
36
|
+
this.Options = Object.assign({
|
|
37
37
|
interval: 3000,
|
|
38
38
|
bufferSize: 10,
|
|
39
39
|
timeout: 1000,
|
|
40
|
-
}, this.Options
|
|
40
|
+
}, this.Options);
|
|
41
41
|
}
|
|
42
42
|
__checkInstance__(creationOptions) {
|
|
43
43
|
return this.Options.name === creationOptions[0].name;
|
|
44
44
|
}
|
|
45
45
|
resolve() {
|
|
46
46
|
this.AxiosInstance = axios_1.default.create({
|
|
47
|
-
baseURL: this.Options.
|
|
47
|
+
baseURL: this.Options.host,
|
|
48
48
|
headers: {
|
|
49
49
|
"Content-Type": "application/json",
|
|
50
|
-
Authorization: `Basic ${Buffer.from(`${this.Options.
|
|
50
|
+
Authorization: `Basic ${Buffer.from(`${this.Options.auth.username}:${this.Options.auth.password}`).toString("base64")}`,
|
|
51
51
|
},
|
|
52
|
-
timeout: this.Options.
|
|
52
|
+
timeout: this.Options.timeout,
|
|
53
53
|
});
|
|
54
54
|
this.FlushTimer = setInterval(() => {
|
|
55
55
|
// do not flush, if we already writting to file
|
|
@@ -61,7 +61,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
61
61
|
setImmediate(() => {
|
|
62
62
|
this.flush();
|
|
63
63
|
});
|
|
64
|
-
}, this.Options.
|
|
64
|
+
}, this.Options.interval ?? 3000);
|
|
65
65
|
}
|
|
66
66
|
write(data) {
|
|
67
67
|
if (!this.Options.enabled) {
|
|
@@ -74,7 +74,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
74
74
|
if (this.Status !== TargetStatus.IDLE) {
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
|
-
if (this.Entries.length >= this.Options.
|
|
77
|
+
if (this.Entries.length >= this.Options.bufferSize) {
|
|
78
78
|
this.Status = TargetStatus.PENDING;
|
|
79
79
|
this.WriteEntries = [...this.WriteEntries, ...this.Entries];
|
|
80
80
|
this.Entries = [];
|
|
@@ -99,7 +99,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
99
99
|
}
|
|
100
100
|
const streams = new Map();
|
|
101
101
|
const keyFor = (x) => {
|
|
102
|
-
return [this.Options.
|
|
102
|
+
return [this.Options.labels.app, x.Variables.logger, x.Variables.level, ...Object.values(this.Options.labels)].join("-");
|
|
103
103
|
};
|
|
104
104
|
const valFor = (x) => [x.Variables["n_timestamp"].toString(), (0, configuration_common_1.format)(x.Variables, this.Options.layout)];
|
|
105
105
|
this.Status = TargetStatus.WRITTING;
|
|
@@ -111,8 +111,8 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
111
111
|
stream: {
|
|
112
112
|
logger: x.Variables.logger,
|
|
113
113
|
level: x.Variables.level,
|
|
114
|
-
app: this.Options.
|
|
115
|
-
...this.Options.
|
|
114
|
+
app: this.Options.labels.app,
|
|
115
|
+
...this.Options.labels,
|
|
116
116
|
},
|
|
117
117
|
values: [valFor(x)],
|
|
118
118
|
});
|
|
@@ -123,7 +123,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends log_1.LogTarget
|
|
|
123
123
|
this.AxiosInstance.post("/loki/api/v1/push", { streams: [...streams.values()] })
|
|
124
124
|
.then(() => {
|
|
125
125
|
this.Status = TargetStatus.IDLE;
|
|
126
|
-
this.Log.trace(`Wrote buffered messages to graphana target at url ${this.Options.
|
|
126
|
+
this.Log.trace(`Wrote buffered messages to graphana target at url ${this.Options.host}, ${this.WriteEntries.length} messages.`);
|
|
127
127
|
this.WriteEntries = [];
|
|
128
128
|
})
|
|
129
129
|
.catch((err) => {
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,qDAAqD;AACrD,wEAAuD;AACvD,oCAA2E;AAC3E,sCAAuF;AAGvF,kDAAqC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/mjs/index.d.ts
CHANGED
|
@@ -2,18 +2,16 @@ import { IInstanceCheck } from "@spinajs/di";
|
|
|
2
2
|
import { Log, ILogEntry, LogTarget, ICommonTargetOptions } from "@spinajs/log";
|
|
3
3
|
import { Axios } from "axios";
|
|
4
4
|
export interface IGraphanaOptions extends ICommonTargetOptions {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
app: string;
|
|
16
|
-
};
|
|
5
|
+
interval: number;
|
|
6
|
+
bufferSize: number;
|
|
7
|
+
timeout: number;
|
|
8
|
+
host: string;
|
|
9
|
+
auth: {
|
|
10
|
+
username: string;
|
|
11
|
+
password: string;
|
|
12
|
+
};
|
|
13
|
+
labels: {
|
|
14
|
+
app: string;
|
|
17
15
|
};
|
|
18
16
|
}
|
|
19
17
|
declare enum TargetStatus {
|
package/lib/mjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAU,MAAM,cAAc,CAAC;AAGvF,OAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGrC,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAU,MAAM,cAAc,CAAC;AAGvF,OAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGrC,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAE5D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAWD,aAAK,YAAY;IACf,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,qBAAsB,SAAQ,SAAS,CAAC,gBAAgB,CAAE,YAAW,cAAc;IAE9F,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IACpC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE,CAAM;IAEzC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAqB;IAEnD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC;IACrC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC;gBAEnB,OAAO,EAAE,gBAAgB;IAarC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,GAAG,OAAO;IAIxD,OAAO,IAAI,IAAI;IAyBf,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA2BtB,OAAO;IAWpB,SAAS,CAAC,KAAK;CA+ChB"}
|
package/lib/mjs/index.js
CHANGED
|
@@ -27,23 +27,23 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
27
27
|
this.Entries = [];
|
|
28
28
|
this.WriteEntries = [];
|
|
29
29
|
this.Status = TargetStatus.IDLE;
|
|
30
|
-
this.Options
|
|
30
|
+
this.Options = Object.assign({
|
|
31
31
|
interval: 3000,
|
|
32
32
|
bufferSize: 10,
|
|
33
33
|
timeout: 1000,
|
|
34
|
-
}, this.Options
|
|
34
|
+
}, this.Options);
|
|
35
35
|
}
|
|
36
36
|
__checkInstance__(creationOptions) {
|
|
37
37
|
return this.Options.name === creationOptions[0].name;
|
|
38
38
|
}
|
|
39
39
|
resolve() {
|
|
40
40
|
this.AxiosInstance = axios.create({
|
|
41
|
-
baseURL: this.Options.
|
|
41
|
+
baseURL: this.Options.host,
|
|
42
42
|
headers: {
|
|
43
43
|
"Content-Type": "application/json",
|
|
44
|
-
Authorization: `Basic ${Buffer.from(`${this.Options.
|
|
44
|
+
Authorization: `Basic ${Buffer.from(`${this.Options.auth.username}:${this.Options.auth.password}`).toString("base64")}`,
|
|
45
45
|
},
|
|
46
|
-
timeout: this.Options.
|
|
46
|
+
timeout: this.Options.timeout,
|
|
47
47
|
});
|
|
48
48
|
this.FlushTimer = setInterval(() => {
|
|
49
49
|
// do not flush, if we already writting to file
|
|
@@ -55,7 +55,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
55
55
|
setImmediate(() => {
|
|
56
56
|
this.flush();
|
|
57
57
|
});
|
|
58
|
-
}, this.Options.
|
|
58
|
+
}, this.Options.interval ?? 3000);
|
|
59
59
|
}
|
|
60
60
|
write(data) {
|
|
61
61
|
if (!this.Options.enabled) {
|
|
@@ -68,7 +68,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
68
68
|
if (this.Status !== TargetStatus.IDLE) {
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
|
-
if (this.Entries.length >= this.Options.
|
|
71
|
+
if (this.Entries.length >= this.Options.bufferSize) {
|
|
72
72
|
this.Status = TargetStatus.PENDING;
|
|
73
73
|
this.WriteEntries = [...this.WriteEntries, ...this.Entries];
|
|
74
74
|
this.Entries = [];
|
|
@@ -93,7 +93,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
93
93
|
}
|
|
94
94
|
const streams = new Map();
|
|
95
95
|
const keyFor = (x) => {
|
|
96
|
-
return [this.Options.
|
|
96
|
+
return [this.Options.labels.app, x.Variables.logger, x.Variables.level, ...Object.values(this.Options.labels)].join("-");
|
|
97
97
|
};
|
|
98
98
|
const valFor = (x) => [x.Variables["n_timestamp"].toString(), format(x.Variables, this.Options.layout)];
|
|
99
99
|
this.Status = TargetStatus.WRITTING;
|
|
@@ -105,8 +105,8 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
105
105
|
stream: {
|
|
106
106
|
logger: x.Variables.logger,
|
|
107
107
|
level: x.Variables.level,
|
|
108
|
-
app: this.Options.
|
|
109
|
-
...this.Options.
|
|
108
|
+
app: this.Options.labels.app,
|
|
109
|
+
...this.Options.labels,
|
|
110
110
|
},
|
|
111
111
|
values: [valFor(x)],
|
|
112
112
|
});
|
|
@@ -117,7 +117,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
|
|
|
117
117
|
this.AxiosInstance.post("/loki/api/v1/push", { streams: [...streams.values()] })
|
|
118
118
|
.then(() => {
|
|
119
119
|
this.Status = TargetStatus.IDLE;
|
|
120
|
-
this.Log.trace(`Wrote buffered messages to graphana target at url ${this.Options.
|
|
120
|
+
this.Log.trace(`Wrote buffered messages to graphana target at url ${this.Options.host}, ${this.WriteEntries.length} messages.`);
|
|
121
121
|
this.WriteEntries = [];
|
|
122
122
|
})
|
|
123
123
|
.catch((err) => {
|
package/lib/mjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,0CAA0C;AAC1C,qDAAqD;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAkB,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAa,SAAS,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAGvF,OAAO,KAAgB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|