fluent-plugin-grafana-loki 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b80ced17e5aa680b13c310f15008e9fcbd219b046b9dd40eddfb43a6f454fe
-  data.tar.gz: 4e7721bf9e2bed189dd2ab9c7090aaac30621e8938658291ad6d622272cd0591
+  metadata.gz: f55e32f690e614bb33d3f905d01881bc0ad1bdc6a55badb1088930725d310c1b
+  data.tar.gz: dd4e2c4477d6edd9ea4f917cf62a821a99cfc0799639fe4445f5ac2635988305
 SHA512:
-  metadata.gz: 624c222606aac4e9725e10a69984457d01a0a28e8364ec50f073df570ba783235719b72117a00aacdc64f0252d7ad4f1e740add4b2a51d86b0ccabda3a04c0f6
-  data.tar.gz: 73ff3b3338cf03509890e26ca50449d8b0a956a8c7cc4a946faa030aa2efdabe34500a450dfc6869ceda06eadbb55fef6184df29fbce6b7edda1675568fbbce2
+  metadata.gz: d86cf23b27f243822ee9628e472d26f2bb6869462b471ddc26f9b0f347f36d48dec7f0aa3bce2bf2cac5893352a8509d71d4363f782d4b7dc8db2dcd7e1b1175
+  data.tar.gz: 010ce549ecdc4c6945a9a09fe790f82364eafa6389c3829e5d0483e7f595c5db4f449b584769c1d1214df8c0d1794a29c3a4a1fe8c9e214327be226e38f99cb1

data/lib/fluent/plugin/out_loki.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'fluent/env'
 require 'fluent/plugin/output'
 require 'net/http'
 require 'yajl'
@@ -26,6 +27,8 @@ module Fluent
     class LokiOutput < Fluent::Plugin::Output # rubocop:disable Metrics/ClassLength
       Fluent::Plugin.register_output('loki', self)
 
+      class LogPostError < StandardError; end
+
       helpers :compat_parameters, :record_accessor
 
       attr_accessor :record_accessors
@@ -131,29 +134,16 @@ module Fluent
         body = { 'streams' => payload }
 
         # add ingest path to loki url
+        res = loki_http_request(body)
 
-        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.body = Yajl.dump(body)
-        req.basic_auth(@username, @password) if @username
-
-        opts = ssl_opts(@uri)
+        return if res.is_a?(Net::HTTPSuccess)
 
-        log.debug "sending #{req.body.length} bytes to loki"
-        res = Net::HTTP.start(@uri.host, @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.debug Yajl.dump(body)
+        res_summary = "#{res.code} #{res.message} #{res.body}"
+        log.warn "failed to write post to #{@uri} (#{res_summary})"
+        log.debug Yajl.dump(body)
 
-        end
+        # Only retry 429 and 500s
+        raise(LogPostError, res_summary) if res.is_a?(Net::HTTPTooManyRequests) || res.is_a?(Net::HTTPServerError)
       end
 
       def ssl_opts(uri)
@@ -186,6 +176,22 @@ module Fluent
 
       private
 
+      def loki_http_request(body)
+        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.body = Yajl.dump(body)
+        req.basic_auth(@username, @password) if @username
+
+        opts = ssl_opts(@uri)
+
+        log.debug "sending #{req.body.length} bytes to loki"
+
+        Net::HTTP.start(@uri.host, @uri.port, **opts) { |http| http.request(req) }
+      end
+
       def numeric?(val)
         !Float(val).nil?
       rescue StandardError

metadata

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