RubyGems - fluent-plugin-splunk-hec - Versions diffs - 1.2.6 → 1.2.7 - Mend

fluent-plugin-splunk-hec 1.2.6 → 1.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/Gemfile.lock +17 -19
data/VERSION +1 -1
data/fluent-plugin-splunk-hec.gemspec +1 -1
data/lib/fluent/plugin/out_splunk.rb +28 -18
metadata +6 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010d7729182f03560365cd5fd4d17eb4dbcb9ce487b41235611e61e88cbd6110
-  data.tar.gz: 2c27aac20a1301d9c94386642ca1005e1d359e1629ea63f203cc193ed02622f8
+  metadata.gz: 82583190560421481d9200800ba359a624e90e9abcfb8c34ff192e3a030802b7
+  data.tar.gz: 83b5d8718c249a48771f6baee0e0ff7519aacd1122c80598e67bd615a02f0727
 SHA512:
-  metadata.gz: e2771aa9aa10244e3de558466c8b3e8a0a08d6ab2b4e052ac38da8eabab86c788c491c7de4825a3077be4c036e576d6adbd0513602ef5e4d7bb5ccd77e9ff540
-  data.tar.gz: c0024af0008b91f4cfa93c7fd9e70a0da0ff2346d21c228a9a2d5775a47f4f16aa63f47e63b4d75965b046e6b989a255538beb775d771b50018c8e1c931dc1aa
+  metadata.gz: 149aef4f611a186754d61eb04a1329615f811ad2f9a6c4b07c0a2153f2d0b30564fd7166beadcd233ff87900d2cf75d6d51e347725f1bbf657a01a9d07b6f42d
+  data.tar.gz: 5f2f8109fb5c3ed10c88f9d3b95f94d10c52c3df4c812f480780e7f7234c3339c69c0451a931c0da94ba42ab58a5894f7f8cfb9a1534fcac51322d21fedda3bc

data/Gemfile.lock CHANGED Viewed

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.2.6)
+    fluent-plugin-splunk-hec (1.2.7)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
-      prometheus-client (< 0.10.0)
+      prometheus-client (>= 2.1.0)
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
@@ -30,11 +30,11 @@ GEM
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
-    docile (1.3.5)
-    fluentd (1.13.0)
+    docile (1.4.0)
+    fluentd (1.13.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
@@ -44,7 +44,7 @@ GEM
       webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.7.0)
     httpclient (2.8.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
@@ -72,14 +72,12 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     power_assert (2.0.0)
     powerpack (0.1.3)
-    prometheus-client (0.9.0)
-      quantile (~> 0.2.1)
+    prometheus-client (2.1.0)
     public_suffix (4.0.6)
-    quantile (0.2.1)
     rack (2.2.3)
     rack-oauth2 (1.17.0)
       activesupport
@@ -88,8 +86,8 @@ GEM
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
-    rexml (3.2.4)
+    rake (13.0.6)
+    rexml (3.2.5)
     rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -107,13 +105,13 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     strptime (0.2.5)
     swd (1.2.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    test-unit (3.4.0)
+    test-unit (3.4.4)
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -151,4 +149,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 BUNDLED WITH
-   2.2.21
+   2.2.23

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.2.6
1	+ 1.2.7

data/fluent-plugin-splunk-hec.gemspec CHANGED Viewed

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_json', '~> 1.13'
   spec.add_runtime_dependency 'net-http-persistent', '~> 3.1'
   spec.add_runtime_dependency 'openid_connect', '~> 1.1.8'
-  spec.add_runtime_dependency 'prometheus-client', '< 0.10.0'
+  spec.add_runtime_dependency 'prometheus-client', '>= 2.1.0'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '>= 12.0'

data/lib/fluent/plugin/out_splunk.rb CHANGED Viewed

@@ -100,11 +100,11 @@ module Fluent::Plugin
         write_to_splunk(chunk)
       end
-      @metrics[:record_counter].increment(metric_labels, chunk.size_of_events)
-      @metrics[:bytes_counter].increment(metric_labels, chunk.bytesize)
-      @metrics[:write_records_histogram].observe(metric_labels, chunk.size_of_events)
-      @metrics[:write_bytes_histogram].observe(metric_labels, chunk.bytesize)
-      @metrics[:write_latency_histogram].observe(metric_labels, t)
+      @metrics[:record_counter].increment(labels: metric_labels, by: chunk.size_of_events)
+      @metrics[:bytes_counter].increment(labels: metric_labels, by: chunk.bytesize)
+      @metrics[:write_records_histogram].observe(chunk.size_of_events, labels: metric_labels)
+      @metrics[:write_bytes_histogram].observe(chunk.bytesize, labels: metric_labels, )
+      @metrics[:write_latency_histogram].observe(t, labels: metric_labels, )
     end
     def write_to_splunk(_chunk)
@@ -153,7 +153,7 @@ module Fluent::Plugin
     def process_response(response, _request_body)
       log.trace { "[Response] POST #{@api}: #{response.inspect}" }
-      @metrics[:status_counter].increment(metric_labels(status: response.code.to_s))
+      @metrics[:status_counter].increment(labels: metric_labels(status: response.code.to_s))
       raise_err = response.code.to_s.start_with?('5') || (!@consume_chunk_on_4xx_errors && response.code.to_s.start_with?('4'))
@@ -235,28 +235,34 @@ module Fluent::Plugin
       @metrics = {
         record_counter: register_metric(::Prometheus::Client::Counter.new(
-                                          :splunk_output_write_records_count,
-                                          'The number of log records being sent'
+                                          :splunk_output_write_records_count, docstring:
+                                          'The number of log records being sent',
+                                          labels: metric_label_keys
                                         )),
         bytes_counter: register_metric(::Prometheus::Client::Counter.new(
-                                         :splunk_output_write_bytes_count,
-                                         'The number of log bytes being sent'
+                                         :splunk_output_write_bytes_count, docstring:
+                                         'The number of log bytes being sent',
+                                         labels: metric_label_keys
                                        )),
         status_counter: register_metric(::Prometheus::Client::Counter.new(
-                                          :splunk_output_write_status_count,
-                                          'The count of sends by response_code'
+                                          :splunk_output_write_status_count, docstring:
+                                          'The count of sends by response_code',
+                                          labels: metric_label_keys(status: "")
                                         )),
         write_bytes_histogram: register_metric(::Prometheus::Client::Histogram.new(
-                                                 :splunk_output_write_payload_bytes,
-                                                 'The size of the write payload in bytes', {}, [1024, 23_937, 47_875, 95_750, 191_500, 383_000, 766_000, 1_149_000]
+                                                 :splunk_output_write_payload_bytes, docstring:
+                                                 'The size of the write payload in bytes', buckets: [1024, 23_937, 47_875, 95_750, 191_500, 383_000, 766_000, 1_149_000],
+                                                 labels: metric_label_keys
                                                )),
         write_records_histogram: register_metric(::Prometheus::Client::Histogram.new(
-                                                   :splunk_output_write_payload_records,
-                                                   'The number of records written per write', {}, [1, 10, 25, 100, 200, 300, 500, 750, 1000, 1500]
+                                                   :splunk_output_write_payload_records, docstring:
+                                                   'The number of records written per write', buckets: [1, 10, 25, 100, 200, 300, 500, 750, 1000, 1500],
+                                                   labels: metric_label_keys
                                                  )),
         write_latency_histogram: register_metric(::Prometheus::Client::Histogram.new(
-                                                   :splunk_output_write_latency_seconds,
-                                                   'The latency of writes'
+                                                   :splunk_output_write_latency_seconds, docstring:
+                                                   'The latency of writes',
+                                                   labels: metric_label_keys
                                                  ))
       }
     end
@@ -266,6 +272,10 @@ module Fluent::Plugin
       @metric_labels.merge other_labels
     end
+    def metric_label_keys(other_labels = {})
+      (@metric_labels.merge other_labels).keys
+    end
     # Encode as UTF-8. If 'coerce_to_utf8' is set to true in the config, any
     # non-UTF-8 character would be replaced by the string specified by
     # 'non_utf8_replacement_string'. If 'coerce_to_utf8' is set to false, any

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunk-hec
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -70,16 +70,16 @@ dependencies:
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement