Merge pull request #95 from JaniAnttonen/development

Merge new release to master

.eslintrc.js

@@ -1,10 +1,10 @@
 module.exports = {
-  extends: "standard",
+  extends: 'standard',
   env: {
     node: true,
     jest: true
   },
   rules: {
-    "no-console": "error"
+    'no-console': 'error'
   }
-};
+}

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 .coveralls.yml
 test/coverage
+
+/.idea

README.md

@@ -29,6 +29,7 @@ LokiTransport() takes a Javascript object as an input. These are the options tha
 | `format`           | winston format (https://github.com/winstonjs/winston#formats) | simple()           | null          |
 | `gracefulShutdown` | Enable/disable graceful shutdown (wait for any unsent batches) | false             | true          |
 | `timeout`          | timeout for requests to grafana loki in ms                | 30000                  | null          | 
+| `basicAuth`        | basic authentication credentials to access Loki over HTTP | username:password      | null          | 
 
 ### Example
 With default formatting:
@@ -58,7 +59,7 @@ TODO: Add custom formatting example
 ### Requirements
 Running a local Loki for testing is probably required, and the easiest way to do that is to follow this guide: https://github.com/grafana/loki/tree/master/production#run-locally-using-docker. After that, Grafana Loki instance is available at `http://localhost:3100`, with a Grafana instance running at `http://localhost:3000`. Username `admin`, password `admin`. Add the Loki source with the URL `http://loki:3100`, and the explorer should work.
 
-Refer to https://github.com/grafana/loki/blob/master/docs/api.md for documentation about the available endpoints, data formats etc.
+Refer to https://grafana.com/docs/loki/latest/api/ for documentation about the available endpoints, data formats etc.
 
 ### Example
 ```sh

index.js

@@ -61,11 +61,13 @@ class LokiTransport extends Transport {
     if (this.labels) {
       lokiLabels = Object.assign(lokiLabels, this.labels)
     } else {
-      lokiLabels['job'] = label
+      lokiLabels.job = label
     }
 
     // follow the format provided
-    const line = this.useCustomFormat ? info[MESSAGE] : `${message} ${
+    const line = this.useCustomFormat
+      ? info[MESSAGE]
+      : `${message} ${
       rest && Object.keys(rest).length > 0 ? JSON.stringify(rest) : ''
     }`