fluent-plugin-grafana-loki 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5beface085cb0713b107553e74ad179ce784a93a74312c7bfa8ca65f8d981c04
-  data.tar.gz: 7559738f0794cbdc0c313a8a6299693d153a6e2dcbd61a4221040e7c7a47917f
+  metadata.gz: edc3f7350833b173b7899a6a7edcada2dba818cd5e5c452b633d9e7c93206799
+  data.tar.gz: 7cb2464e4a85621f9b546162ca985be8021a9330853e9ce020594b7470c1e3e2
 SHA512:
-  metadata.gz: 492a76db23871d115007caeca704db37dc883f5623df5b67c5f0e9d9fe582b5a99cb1af94e7c66d23e2d2e72973ba72ba49e9fb234d27c30ae027ec389951dca
-  data.tar.gz: b1107f60ef666346e1bdb5b8b5e06809ff3c41ff328c581677d615f3bf447a28b133322ec4667968a2821c83db56fec6646ab9e79feab2038b2da3d02981ec3f
+  metadata.gz: edac698c75dc3b600167e85ed20447ffa25a136342c9344dd48dc92b0578b9c6e81d1c7c04c2319d35404d554ee995d00bcb1f69165eefccd328c3a729481459
+  data.tar.gz: f0f9e6dce6b997fe598f6abeb2943cb9e9d7ecc072d568bcb2dcd04926c368364d7c361030722e9f39936f7a7b9ee9bf26458b12b0d2c9ee267c5dce636ffef0

data/lib/fluent/plugin/out_loki.rb

@@ -86,17 +86,26 @@ module Fluent
           @remove_keys_accessors.push(record_accessor_create(key))
         end
 
-        if !@key.nil? && !@cert.nil?
-          @cert = OpenSSL::X509::Certificate.new(File.read(@cert)) if @cert
-          @key = OpenSSL::PKey.read(File.read(@key)) if @key
-
-          if !@key.is_a?(OpenSSL::PKey::RSA) && !@key.is_a?(OpenSSL::PKey::DSA)
-            raise "Unsupported private key type #{key.class}"
-          end
+        if ssl_cert?
+          load_ssl
+          validate_ssl_key
         end
 
-        if !@ca_cert.nil? && !File.exist?(@ca_cert)
-          raise "CA certificate file #{@ca_cert} not found"
+        raise "CA certificate file #{@ca_cert} not found" if !@ca_cert.nil? && !File.exist?(@ca_cert)
+      end
+
+      def ssl_cert?
+        !@key.nil? && !@cert.nil?
+      end
+
+      def load_ssl
+        @cert = OpenSSL::X509::Certificate.new(File.read(@cert)) if @cert
+        @key = OpenSSL::PKey.read(File.read(@key)) if @key
+      end
+
+      def validate_ssl_key
+        if !@key.is_a?(OpenSSL::PKey::RSA) && !@key.is_a?(OpenSSL::PKey::DSA)
+          raise "Unsupported private key type #{key.class}"
         end
       end
 
@@ -127,6 +136,24 @@ module Fluent
         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"
+        res = Net::HTTP.start(uri.hostname, uri.port, **opts) { |http| http.request(req) }
+        unless res&.is_a?(Net::HTTPSuccess)
+          res_summary = if res
+                          "#{res.code} #{res.message} #{res.body}"
+                        else
+                          'res=nil'
+                        end
+          log.warn "failed to #{req.method} #{uri} (#{res_summary})"
+          log.warn Yajl.dump(body)
+
+        end
+      end
+
+      def ssl_opts(uri)
         opts = {
           use_ssl: uri.scheme == 'https'
         }
@@ -139,24 +166,12 @@ module Fluent
           )
         end
 
-        if !@ca_cert.nil?
+        unless @ca_cert.nil?
           opts = opts.merge(
             ca_file: @ca_cert
           )
         end
-
-        log.debug "sending #{req.body.length} bytes to loki"
-        res = Net::HTTP.start(uri.hostname, uri.port, **opts) { |http| http.request(req) }
-        unless res&.is_a?(Net::HTTPSuccess)
-          res_summary = if res
-                          "#{res.code} #{res.message} #{res.body}"
-                        else
-                          'res=nil'
-                        end
-          log.warn "failed to #{req.method} #{uri} (#{res_summary})"
-          log.warn Yajl.dump(body)
-
-        end
+        opts
       end
 
       def generic_to_loki(chunk)
@@ -174,17 +189,14 @@ module Fluent
         false
       end
 
-      def labels_to_protocol(data_labels)
-        formatted_labels = []
-
+      def format_labels(data_labels)
+        formatted_labels = {}
         # merge extra_labels with data_labels. If there are collisions extra_labels win.
         data_labels = {} if data_labels.nil?
         data_labels = data_labels.merge(@extra_labels)
-
-        data_labels.each do |k, v|
-          formatted_labels.push(%(#{k}="#{v.gsub('"', '\\"')}")) if v
-        end
-        '{' + formatted_labels.join(',') + '}'
+        # sanitize label values
+        data_labels.each { |k, v| formatted_labels[k] = v.gsub('"', '\\"') }
+        formatted_labels
       end
 
       def payload_builder(streams)
@@ -193,15 +205,19 @@ module Fluent
           # create a stream for each label set.
           # Additionally sort the entries by timestamp just in case we
           # got them out of order.
-          # 'labels' => '{worker="0"}',
+          entries = v.sort_by.with_index { |hsh, i| [hsh['ts'], i] }
           payload.push(
-            'labels' => labels_to_protocol(k),
-            'entries' => v.sort_by.with_index { |hsh, i| [Time.parse(hsh['ts']), i] }
+            'stream' => format_labels(k),
+            'values' => entries.map { |e| [e['ts'].to_s, e['line']] }
           )
         end
         payload
       end
 
+      def to_nano(time)
+        time.to_i * (10**9) + time.nsec
+      end
+
       def record_to_line(record)
         line = ''
         if @drop_single_key && record.keys.length == 1
@@ -272,7 +288,7 @@ module Fluent
           # NOTE: timestamp must include nanoseconds
           # append to matching chunk_labels key
           streams[chunk_labels].push(
-            'ts' => Time.at(time.to_f).gmtime.iso8601(6),
+            'ts' => to_nano(time),
             'line' => result[:line]
           )
         end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grafana-loki
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - woodsaj
 - briangann
+- cyriltovena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +78,7 @@ description: Output plugin to ship logs to a Grafana Loki server
 email:
 - awoods@grafana.com
 - brian@grafana.com
+- cyril.tovena@grafana.com
 executables: []
 extensions: []
 extra_rdoc_files: []