fluent-plugin-loki-custom 0.2.1 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b815d4e264c1d731d4c525c0178b944889d7ba64622e1808dfcb07ac1bf684
-  data.tar.gz: 80ff786898637a053f43c4802456669efb166b11cc4a3428e73ed9ebd2f664a8
+  metadata.gz: 9bd4c79e88a97fa9e5b02083cfccc7c8a7b6100843693dbcc5ba711e982d8c77
+  data.tar.gz: b7a1dd40adb50c2d829cfb9a1c99984bc2ca2b10c8ff9642d503970657cc096a
 SHA512:
-  metadata.gz: 97a306915c7e181be0b043aa0cf79a922e4cf601ab0da71134ae8799888547b506bdf56fa58046d1b277fb21dc1392fe3a1016a5b149c887d5cd0c44a54f856f
-  data.tar.gz: d97351b8bf00421f33d73f9e6b46c375ba6176f677c6a2e335220f65f318ccd7d0a22f88f20a1d5b1f1c67ffa9da2660e4c75f1b91f24b618b0c9bddb8c820db
+  metadata.gz: 74147ebd54540b94b5ba09032f371b9e53d7e82936add26d8fefaecaa4356ede397bb3bfc04cb666e117867123e3ab4788521a9e28d3f3d4cc7d9139ca464870
+  data.tar.gz: 79377b96d6e2f531a1c0f218393f8bcd8e9c43ac29ebe3d79cfb27b6c518ddc91b45d8b9a87304e2b5ebc3e4ea2e3ee63439aa5cfab5d9cf232636a18b80c613

data/fluent-plugin-loki.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |gem|
     gem.name          = "fluent-plugin-loki-custom"
-    gem.version       = "0.2.1"
-    gem.authors       = ["Edan Shahmoon"]
-    gem.email         = ["edan100@gmail.com"]
+    gem.version       = "0.2.7"
+    gem.authors       = ["Edan Shahmoon", "Saher El-Neklawy"]
+    gem.email         = ["edan100@gmail.com", "saher.neklawy@gmail.com"]
     gem.summary       = %q{A Fluentd output plugin to send logs to Grafana Loki}
     gem.description   = gem.summary
     gem.homepage      = "https://github.com/eeddaann/fluent-plugin-loki"

data/lib/fluent/plugin/out_loki.rb

@@ -126,11 +126,11 @@ class Fluent::Plugin::LokiOutput < Fluent::Plugin::Output
   end
 
   def send_request(req, uri)
-    is_rate_limited = (@rate_limit_msec != 0 and not @last_request_time.nil?)
-    if is_rate_limited and ((Time.now.to_f - @last_request_time) * 1000.0 < @rate_limit_msec)
-      log.info('Dropped request due to rate limiting')
-      return
-    end
+    #is_rate_limited = (@rate_limit_msec != 0 and not @last_request_time.nil?)
+    #if is_rate_limited and ((Time.now.to_f - @last_request_time) * 1000.0 < @rate_limit_msec)
+      #log.info('Dropped request due to rate limiting')
+      #return
+    #end
 
     res = nil
 
@@ -175,14 +175,15 @@ class Fluent::Plugin::LokiOutput < Fluent::Plugin::Output
       st+= "#{key}=\"#{val}\","
     end
     record.each do |key, val|
-      st+= "#{key}=\"#{val}\","
+      st+= "#{key}=\"#{val}\"," unless key == "log"
     end
     st[-1]="}"
     return st
   end
   def handle_record(tag, time, record)
-    rec = {"streams"=>[{"labels"=>format_labels(@labels, record), "entries"=>[{"ts"=>Time.now.iso8601(3), "line"=>record.to_json}]}]}
+    rec = {"streams"=>[{"labels"=>format_labels(@labels, record), "entries"=>[{"ts"=>Time.now.iso8601(3), "line"=>record["log"]}]}]}
     # I used time now instead of at 'time' because it cause 'Entry out of order' on loki's side
+    log.debug(rec.to_json)
     req, uri = create_request(tag, time, rec)
     send_request(req, uri)
   end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-loki-custom
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.7
 platform: ruby
 authors:
 - Edan Shahmoon
+- Saher El-Neklawy
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -89,6 +90,7 @@ dependencies:
 description: A Fluentd output plugin to send logs to Grafana Loki
 email:
 - edan100@gmail.com
+- saher.neklawy@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []