@spinajs/log-source-graphana-loki 2.0.81 → 2.0.82

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.
@@ -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,EACL,IAAI,EACJ,SAAS,EACT,SAAS,EACT,oBAAoB,EAErB,MAAM,cAAc,CAAC;AAKtB,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAC;CACH;AAYD,aAAK,YAAY;IACf,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,qBACX,SAAQ,SAAS,CAAC,gBAAgB,CAClC,YAAW,cAAc;IAGzB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC;IAEpB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAqB;IAEnD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC;gBAEvB,OAAO,EAAE,gBAAgB;IAarC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO;IAItD,OAAO,IAAI,IAAI;IAaf,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAwBtB,OAAO;IAQpB,SAAS,CAAC,KAAK;CA6DhB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EACL,IAAI,EACJ,SAAS,EACT,SAAS,EACT,oBAAoB,EAErB,MAAM,cAAc,CAAC;AAKtB,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAC;CACH;AAcD,aAAK,YAAY;IACf,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,qBACX,SAAQ,SAAS,CAAC,gBAAgB,CAClC,YAAW,cAAc;IAEzB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC;IAEpB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAqB;IAEnD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC;gBAEvB,OAAO,EAAE,gBAAgB;IAarC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO;IAItD,OAAO,IAAI,IAAI;IAaf,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAwBtB,OAAO;IAQpB,SAAS,CAAC,KAAK;CA8DhB"}
package/lib/index.js CHANGED
@@ -80,26 +80,27 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
80
80
  }
81
81
  this.Status = TargetStatus.WRITTING;
82
82
  this.Entries.forEach((entry) => {
83
- let stream = batch.find((b) => _.isEqual(b.labels, {
83
+ let stream = batch.find((b) => _.isEqual(b.stream, {
84
84
  app: this.Options.options.labels.app,
85
85
  logger: entry.Variables.logger,
86
86
  level: entry.Variables.level,
87
- ...this.Options.options.labels,
88
87
  }));
89
88
  if (!stream) {
90
89
  stream = {
91
90
  labels: {
92
- app: this.Options.options.labels.app,
91
+ ...this.Options.options.labels,
92
+ },
93
+ stream: {
93
94
  logger: entry.Variables.logger,
94
95
  level: entry.Variables.level,
95
- ...this.Options.options.labels,
96
+ app: this.Options.options.labels.app,
96
97
  },
97
98
  values: [],
98
99
  };
99
100
  batch.push(stream);
100
101
  }
101
102
  stream.values.push([
102
- entry.Variables["n_timestamp"],
103
+ entry.Variables["n_timestamp"].toString(),
103
104
  JSON.stringify(format(entry.Variables, this.Options.layout)),
104
105
  ]);
105
106
  });
@@ -109,7 +110,7 @@ let GraphanaLokiLogTarget = class GraphanaLokiLogTarget extends LogTarget {
109
110
  "Content-Type": "application/json",
110
111
  },
111
112
  timeout: this.Options.options.timeout,
112
- data: batch,
113
+ data: { streams: batch },
113
114
  })
114
115
  .then(() => {
115
116
  this.Entries = [];
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "2.0.81",
2
+ "version": "2.0.82",
3
3
  "description": "Log lib for all spinejs related libs",
4
4
  "exports": "./lib/index.js",
5
5
  "type": "module",
@@ -44,9 +44,9 @@
44
44
  },
45
45
  "gitHead": "002dc553b0ffffd72193d0121ac425a4083bc9ee",
46
46
  "dependencies": {
47
- "@spinajs/configuration-common": "^2.0.81",
48
- "@spinajs/di": "^2.0.81",
49
- "@spinajs/log": "^2.0.81",
47
+ "@spinajs/configuration-common": "^2.0.82",
48
+ "@spinajs/di": "^2.0.82",
49
+ "@spinajs/log": "^2.0.82",
50
50
  "axios": "^1.2.3",
51
51
  "lodash": "^4.17.21"
52
52
  }