fluent-plugin-grafana-loki 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f55e32f690e614bb33d3f905d01881bc0ad1bdc6a55badb1088930725d310c1b
-  data.tar.gz: dd4e2c4477d6edd9ea4f917cf62a821a99cfc0799639fe4445f5ac2635988305
+  metadata.gz: '0867dbf084b2c7642c0433421013b062a414cd9965c7e3aa70b3c90522c7b5e5'
+  data.tar.gz: '090334cc38d3b48384e07922157acc368c5b2bb7db706a1f9706f3d19fb463d4'
 SHA512:
-  metadata.gz: d86cf23b27f243822ee9628e472d26f2bb6869462b471ddc26f9b0f347f36d48dec7f0aa3bce2bf2cac5893352a8509d71d4363f782d4b7dc8db2dcd7e1b1175
-  data.tar.gz: 010ce549ecdc4c6945a9a09fe790f82364eafa6389c3829e5d0483e7f595c5db4f449b584769c1d1214df8c0d1794a29c3a4a1fe8c9e214327be226e38f99cb1
+  metadata.gz: 8571fb5409342a6e68422daadffc7c165be80e52bcd7e6eb7156dda47cbf5271c9d6f8deab85084def1e117d6d46f97e0c55fc803ed0e71314f010155aaeb1bf
+  data.tar.gz: 9a10939c11b479696cab9c245af5168f62a83cb6f138e437c47fc4b90129e2e73eea99228c7e57bf3f3535bcc2c4ca92878a0da7038b8d1ee9d462971938931b

data/README.md

@@ -1,6 +1,8 @@
-# fluent-plugin-grafana-loki
+# FluentD output plugin
 
-[Fluentd](https://fluentd.org/) output plugin to ship logs to a Loki server. See [docs/client/fluentd/README.md](../../docs/clients/fluentd/README.md) for detailed information.
+[Fluentd](https://fluentd.org/) is a data collector for unified logging layer, it can be configured with the Loki output plugin, provided in this folder, to ship logs to Loki.
+
+See [docs/client/fluentd/README.md](../../docs/clients/fluentd/README.md) for detailed information.
 
 ## Development
 
@@ -13,6 +15,62 @@ To create the gem: `gem build fluent-plugin-grafana-loki.gemspec`
 Useful additions:
   `gem install rubocop`
 
+## Testing
+
+Start Loki using:
+```
+docker run -it -p 3100:3100 grafana/loki:latest
+```
+
+Verify that Loki accept and stores logs:
+```
+curl -H "Content-Type: application/json" -XPOST -s "http://localhost:3100/loki/api/v1/push" --data-raw "{\"streams\": [{\"stream\": {\"job\": \"test\"}, \"values\": [[\"$(date +%s)000000000\", \"fizzbuzz\"]]}]}"
+curl "http://localhost:3100/loki/api/v1/query_range" --data-urlencode 'query={job="test"}' --data-urlencode 'step=300' | jq .data.result
+```
+The expected output is:
+```
+[
+  {
+    "stream": {
+      "job": "test"
+    },
+    "values": [
+      [
+        "1588337198000000000",
+        "fizzbuzz"
+      ]
+    ]
+  }
+]
+```
+
+Start FluentBit + FluentD using:
+```
+LOKI_URL=http://{{ IP }}:3100 make fluentd-test
+```
+
+Verify that syslogs are being feeded into Loki:
+```
+curl "http://localhost:3100/loki/api/v1/query_range" --data-urlencode 'query={job="fluentd"}' --data-urlencode 'step=300' | jq .data.result
+```
+The expected output is:
+```
+[
+  {
+    "stream": {
+      "job": "fluentd"
+    },
+    "values": [
+      [
+        "1588336950379591919",
+        "log=\"May  1 14:42:30 ibuprofen avahi-daemon[859]: New relevant interface vethb503225.IPv6 for mDNS.\""
+      ],
+      ...
+    ]
+  }
+]
+```
+
 ## Copyright
 
 * Copyright(c) 2018- Grafana Labs

data/lib/fluent/plugin/out_loki.rb

@@ -133,8 +133,10 @@ module Fluent
         payload = generic_to_loki(chunk)
         body = { 'streams' => payload }
 
+        tenant = extract_placeholders(@tenant, chunk) if @tenant
+
         # add ingest path to loki url
-        res = loki_http_request(body)
+        res = loki_http_request(body, tenant)
 
         return if res.is_a?(Net::HTTPSuccess)
 
@@ -176,18 +178,20 @@ module Fluent
 
       private
 
-      def loki_http_request(body)
+      def loki_http_request(body, tenant)
         req = Net::HTTP::Post.new(
           @uri.request_uri
         )
         req.add_field('Content-Type', 'application/json')
-        req.add_field('X-Scope-OrgID', @tenant) if @tenant
+        req.add_field('X-Scope-OrgID', tenant) if tenant
         req.body = Yajl.dump(body)
         req.basic_auth(@username, @password) if @username
 
         opts = ssl_opts(@uri)
 
-        log.debug "sending #{req.body.length} bytes to loki"
+        msg = "sending #{req.body.length} bytes to loki"
+        msg += " (tenant: \"#{tenant}\")" if tenant
+        log.debug msg
 
         Net::HTTP.start(@uri.host, @uri.port, **opts) { |http| http.request(req) }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grafana-loki
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - woodsaj
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler