fluent-plugin-grafana-loki 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81585ccef86ed63befeb100c2387ec09041ea11fdcd5eb6572687f532169acc4
-  data.tar.gz: d33975553c944a36357168ae7373aafd484e1d47f8eb68c1334913f4fa5b4f70
+  metadata.gz: 500a298bd9861429eb29eae445bdaf02f1d8802bcd554e107e9f9c69c9d722f9
+  data.tar.gz: cb1ea3ee1ad170544e32819e654916370fc7e80b8197c51fb5efd32877a257f0
 SHA512:
-  metadata.gz: 262014b0bb6be9bf6b07434c803ea709476c3cfd3978b6bfead2ce8476e1403ad088c50cad792de29f2a12bd455f315e456c65c008ada33bd9a12cc75f671c78
-  data.tar.gz: 6368d9b836044b00823ad9ed061dcfb4be8b7ff1132b9a6db40262bbed59096c349281997ab884f29b10590f873397d27d24a9d2eafba30c9a90c6329a6ab385
+  metadata.gz: 3d3bfc2e5121fd39744099572fb25761842f9039c23e5229b275ae2ecb4179c3157b2367b6edb80b7e3e29606d724b6e1ee562aad8198ade75d5342cd8ffc23f
+  data.tar.gz: 630c02f220ac15861caf3f34dbbc4a5721c96980dbc51bce5dd9bc7dfef93a4a6461640937bcb34cca9028a83220b3e4359fa0173371955f2b06e5ce8fe27295

data/README.md

@@ -166,6 +166,22 @@ If using the GrafanaLab's hosted Loki, the username needs to be set to your inst
 ### tenant
 Loki is a multi-tenant log storage platform and all requests sent must include a tenant.  For some installations the tenant will be set automatically by an authenticating proxy.  Otherwise you can define a tenant to be passed through.  The tenant can be any string value.
 
+### client certificate verification
+Specify a pair of client certificate and private key with `cert` and `key` if a reverse proxy with client certificate verification is configured in front of Loki. `ca_cert` can also be specified if the server uses custom certificate authority.
+
+```
+<match **>
+  @type loki
+
+  url "https://loki"
+
+  cert /path/to/certificate.pem
+  key /path/to/key.key
+  ca_cert /path/to/ca.pem
+
+  ...
+</match>
+```
 
 ### output format
 Loki is intended to index and group log streams using only a small set of labels.  It is not intended for full-text indexing.  When sending logs to Loki the majority of log message will be sent as a single log "line".

data/lib/fluent/plugin/out_loki.rb

@@ -40,6 +40,13 @@ module Fluent
       config_param :username, :string, default: nil
       config_param :password, :string, default: nil, secret: true
 
+      desc 'Client certificate'
+      config_param :cert, :string, default: nil
+      config_param :key, :string, default: nil
+
+      desc 'TLS'
+      config_param :ca_cert, :string, default: nil
+
       desc 'Loki tenant id'
       config_param :tenant, :string, default: nil
 
@@ -78,6 +85,17 @@ module Fluent
         @remove_keys.each do |key|
           @remove_keys_accessors.push(record_accessor_create(key))
         end
+
+        @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 !@ca_cert.nil? && !File.exist?(@ca_cert)
+          raise "CA certificate file #{@ca_cert} not found"
+        end
       end
 
       def multi_workers_ready?
@@ -110,6 +128,21 @@ module Fluent
         opts = {
           use_ssl: uri.scheme == 'https'
         }
+
+        if !@cert.nil? && !@key.nil?
+          opts = opts.merge(
+            verify_mode: OpenSSL::SSL::VERIFY_PEER,
+            cert: @cert,
+            key: @key
+          )
+        end
+
+        if !@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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grafana-loki
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - woodsaj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler