fluent-plugin-sumologic_output 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 129fc1c24fc6e1ac2b446b80fdfc7ac5165b7986
-  data.tar.gz: b9f01bee4b86185e306c7155c228a54cde730145
+SHA256:
+  metadata.gz: 4346ff078527905ff2b54424eef12afbbb88b37174fdca0e7b36cb6addadf2a7
+  data.tar.gz: 83bfd102b85451d7f4ec5d6635482efbdd945fe8ef2e52d14bfd56ca1b48cb18
 SHA512:
-  metadata.gz: e64e61a98fd1a39122b11661cdd3dd03507a0f5968700f69042604ff26ff0eb34d4d8095b46390fbc30d758570314b8b346b105a3affb9c4b63164b50a0ee953
-  data.tar.gz: 1b41b319196744540f98839e5f6d04d670fbfa492b31d6594868c76e193bf075f7c78eb180494b5e69bf1306bb174f8ab78f34cbd24ff841f681e33c12206063
+  metadata.gz: 6ac64815e9d60e5ecd9af2fb867e28822185b12d368ed0a3566bdfc0f0a958dc77d2ae5bef11cefba13306f4691a5b72e892c28b9a7e8282fb4193c645799d43
+  data.tar.gz: 27623a54343eab0c96f7c1e8577176cc6deccffcd65d34af7d9411b0334051d365bfe6ea9e7bae34462163282cc84af86bded65300130ff908a0b47d86c9f63a

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 *.rbc
 Gemfile.lock
-.idea/
+.idea/
+TAGS

data/.travis.yml

@@ -1,5 +1,12 @@
 lang: ruby
-
-script: bundle exec rake
-
-rvm: 2.3
+before_install: gem install bundler
+script: ci/build.sh
+deploy:
+  provider: rubygems
+  skip_cleanup: true
+  api_key:
+    secure: mzu7CaM8x5BLZ2QvgQJFfY/xvzZN2+gpMieRoBnmefjhhs+zGjqzBn9wN+4/IZNQUKhDE729CEx1xSEegz44Ru73sNEsS4Y/jLNqr24Swcr4xyYcqxX58x18o1K28HD1Mp9NhS8gLIkd/sucCcSAHPag6Zkk00gETGsGCXFHxYP5HpXbBMKy1OFZ3o7dGv+Hv4g5XtDaM1Kjwcku398PsQsBmh0jJyag+NL804dUL66weTA3P7q94/TEVZ1lbvUZlokzxHBhkO0eHM2fuCdKzW1BneePxYnMRFzjRxXcYoalfEVoy9KHi3mDBCtj4Bw6hSgfnrDFVjZzoMPybOLJDt9DlYEplcWlXlS3EuDr5aYgyfkUbuv1OZm/94EdkMa4epH51vq0r6AHstG7ZCmrBxiLUMs0wgwRSPTIK1hJG+UFuCxGASU+IH8OD8bTav21cXEhVLDw5dEzk6smnfY+mpAexiW5ytIc9wf0qkP6bbICH9zRHYUWHxcCTqouhArHPyyESSngAYkpdHbRql+uGll8ab6IaVp33WvKqYQK2QnTcb1A7pgtiAxzhl0yBTR/oNIRdj6X6y7FmRuaEmkU29jzuetcq4xdgQTkNfbeLITwyRn2hJBGHIEcvHPwilzZGIfr96QcqBw/AGrcIirkD3NuZ86DJZ8Ucn3BbKXEmTU=
+  gem: fluent-plugin-sumologic_output
+  on:
+    tags: true
+    repo: SumoLogic/fluentd-output-sumologic

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/SumoLogic/fluentd-output-sumologic.svg?branch=master)](https://travis-ci.org/SumoLogic/fluentd-output-sumologic) ![](https://ruby-gem-downloads-badge.herokuapp.com/fluent-plugin-sumologic_output?type=total) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/SumoLogic/fluentd-output-sumologic/issues)
+[![Build Status](https://travis-ci.org/SumoLogic/fluentd-output-sumologic.svg?branch=master)](https://travis-ci.org/SumoLogic/fluentd-output-sumologic) [![Gem Version](https://badge.fury.io/rb/fluent-plugin-sumologic_output.svg)](https://badge.fury.io/rb/fluent-plugin-sumologic_output) ![](https://ruby-gem-downloads-badge.herokuapp.com/fluent-plugin-sumologic_output?type=total) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/SumoLogic/fluentd-output-sumologic/issues)
 
 # fluent-plugin-sumologic_output, a plugin for [Fluentd](http://fluentd.org)
 
@@ -34,7 +34,7 @@ Configuration options for fluent.conf are:
 * `add_timestamp` - Add `timestamp` (or `timestamp_key`) field to logs before sending to sumologic (default `true`)
 * `timestamp_key` - Field name when `add_timestamp` is on (default `timestamp`)
 * `proxy_uri` - Add the `uri` of the `proxy` environment if present.
-* `metric_data_format` - The format of metrics you will be sending, either `graphite` or `carbon2` (Default is `graphite `)
+* `metric_data_format` - The format of metrics you will be sending, either `graphite` or `carbon2` or `prometheus` (Default is `graphite `)
 * `disable_cookies` - Option to disable cookies on the HTTP Client. (Default is `false `)
 
 ### Example Configuration

data/ci/build.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+echo "Starting build process in: `pwd`"
+set -e
+
+VERSION="${TRAVIS_TAG:=0.0.0}"
+echo "Building for tag $VERSION, modify .gemspec file..."
+sed -i.bak "s/0.0.0/$VERSION/g" ./fluent-plugin-sumologic_output.gemspec
+rm -f ./fluent-plugin-sumologic_output.gemspec.bak
+
+echo "Install bundler..."
+bundle install
+
+echo "Run unit tests..."
+bundle exec rake
+
+echo "DONE"

data/fluent-plugin-sumologic_output.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-sumologic_output"
-  gem.version       = "1.4.0"
+  gem.version       = "1.4.1"
   gem.authors       = ["Steven Adams", "Frank Reno"]
   gem.email         = ["stevezau@gmail.com", "frank.reno@me.com"]
   gem.description   = %q{Output plugin to SumoLogic HTTP Endpoint}
@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.has_rdoc      = false
 
   gem.required_ruby_version = '>= 2.0.0'
 

data/lib/fluent/plugin/out_sumologic.rb

@@ -32,8 +32,10 @@ class SumologicConnection
         headers['Content-Type'] = 'application/vnd.sumologic.graphite'
       when 'carbon2'
         headers['Content-Type'] = 'application/vnd.sumologic.carbon2'
+      when 'prometheus'
+        headers['Content-Type'] = 'application/vnd.sumologic.prometheus'
       else
-        raise RuntimeError, "Invalid #{metric_data_format}, must be graphite or carbon2"
+        raise RuntimeError, "Invalid #{metric_data_format}, must be graphite or carbon2 or prometheus"
       end
     end
     return headers
@@ -63,9 +65,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
   LOGS_DATA_TYPE = "logs"
   METRICS_DATA_TYPE = "metrics"
   DEFAULT_DATA_TYPE = LOGS_DATA_TYPE
-  GRAPHITE_METRIC_FORMAT_TYPE = "graphite"
-  CARBON2_METRIC_FORMAT_TYPE = "carbon2"
-  DEFAULT_METRIC_FORMAT_TYPE = CARBON2_METRIC_FORMAT_TYPE
+  DEFAULT_METRIC_FORMAT_TYPE = 'graphite'
 
   config_param :data_type, :string, :default => DEFAULT_DATA_TYPE
   config_param :metric_data_format, :default => DEFAULT_METRIC_FORMAT_TYPE
@@ -121,8 +121,8 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
     end
 
     if conf['data_type'] == METRICS_DATA_TYPE && ! conf['metrics_data_type'].nil?
-      unless conf['metrics_data_type'] =~ /\A(?:graphite|carbon2)\z/
-        raise Fluent::ConfigError, "Invalid metrics_data_type #{conf['metrics_data_type']} must be graphite or carbon2"
+      unless conf['metrics_data_type'] =~ /\A(?:graphite|carbon2|pronetheus)\z/
+        raise Fluent::ConfigError, "Invalid metrics_data_type #{conf['metrics_data_type']} must be graphite or carbon2 or prometheus"
       end
     end
 
@@ -182,15 +182,15 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
     true
   end
 
-  def sumo_key(sumo_metadata, record, tag)
+  def sumo_key(sumo_metadata, chunk)
     source_name = sumo_metadata['source'] || @source_name
-    source_name = expand_param(source_name, tag, nil, record)
+    source_name = extract_placeholders(source_name, chunk) unless source_name.nil?
 
     source_category = sumo_metadata['category'] || @source_category
-    source_category = expand_param(source_category, tag, nil, record)
+    source_category = extract_placeholders(source_category, chunk) unless source_category.nil?
 
     source_host = sumo_metadata['host'] || @source_host
-    source_host = expand_param(source_host, tag, nil, record)
+    source_host = extract_placeholders(source_host, chunk) unless source_host.nil?
 
     "#{source_name}:#{source_category}:#{source_host}"
   end
@@ -200,38 +200,8 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
     time.to_s.length == 13 ? time : time * 1000
   end
 
-  # copy from https://github.com/uken/fluent-plugin-elasticsearch/commit/1722c58758b4da82f596ecb0a5075d3cb6c99b2e#diff-33bfa932bf1443760673c69df745272eR221
-  def expand_param(param, tag, time, record)
-    # check for '${ ... }'
-    #   yes => `eval`
-    #   no  => return param
-    return param if (param =~ /\${.+}/).nil?
-
-    # check for 'tag_parts[]'
-    # separated by a delimiter (default '.')
-    tag_parts = tag.split(@delimiter) unless (param =~ /tag_parts\[.+\]/).nil? || tag.nil?
-
-    # pull out section between ${} then eval
-    inner = param.clone
-    while inner.match(/\${.+}/)
-      to_eval = inner.match(/\${(.+?)}/) { $1 }
-
-      if !(to_eval =~ /record\[.+\]/).nil? && record.nil?
-        return to_eval
-      elsif !(to_eval =~/tag_parts\[.+\]/).nil? && tag_parts.nil?
-        return to_eval
-      elsif !(to_eval =~/time/).nil? && time.nil?
-        return to_eval
-      else
-        inner.sub!(/\${.+?}/, eval(to_eval))
-      end
-    end
-    inner
-  end
-
   # This method is called every flush interval. Write the buffer chunk
   def write(chunk)
-    tag = chunk.metadata.tag
     messages_list = {}
 
     # Sort messages
@@ -240,7 +210,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
       # https://github.com/uken/fluent-plugin-elasticsearch/commit/8597b5d1faf34dd1f1523bfec45852d380b26601#diff-ae62a005780cc730c558e3e4f47cc544R94
       next unless record.is_a? Hash
       sumo_metadata = record.fetch('_sumo_metadata', {:source => record[@source_name_key] })
-      key           = sumo_key(sumo_metadata, record, tag)
+      key           = sumo_key(sumo_metadata, chunk)
       log_format    = sumo_metadata['log_format'] || @log_format
 
       # Strip any unwanted newlines

data/test/plugin/test_out_sumologic.rb

@@ -47,7 +47,7 @@ class SumologicOutput < Test::Unit::TestCase
       metrics_data_type   foo
     }
     exception = assert_raise(Fluent::ConfigError) {create_driver(config)}
-    assert_equal("Invalid metrics_data_type foo must be graphite or carbon2", exception.message)
+    assert_equal("Invalid metrics_data_type foo must be graphite or carbon2 or prometheus", exception.message)
   end
 
   def test_default_configure
@@ -57,7 +57,7 @@ class SumologicOutput < Test::Unit::TestCase
     instance = create_driver(config).instance
 
     assert_equal instance.data_type, 'logs'
-    assert_equal instance.metric_data_format, 'carbon2'
+    assert_equal instance.metric_data_format, 'graphite'
     assert_equal instance.endpoint, 'https://SUMOLOGIC_URL'
     assert_equal instance.log_format, 'json'
     assert_equal instance.log_key, 'message'
@@ -213,7 +213,7 @@ class SumologicOutput < Test::Unit::TestCase
       driver.feed("output.test", time, {'foo' => 'bar', 'message' => 'test', '_sumo_metadata' => {
           "host": "#{ENV['HOST']}",
           "source": "${tag}",
-          "category": "test"
+          "category": "${tag[1]}"
       }})
     end
     assert_requested :post, "https://collectors.sumologic.com/v1/receivers/http/1234",
@@ -306,4 +306,25 @@ class SumologicOutput < Test::Unit::TestCase
                      times:1
   end
 
+  def test_emit_prometheus
+    config = %{
+      endpoint            https://collectors.sumologic.com/v1/receivers/http/1234
+      data_type           metrics
+      metric_data_format  prometheus
+      source_category     test
+      source_host         test
+      source_name         test
+    }
+    driver = create_driver(config)
+    time = event_time
+    stub_request(:post, 'https://collectors.sumologic.com/v1/receivers/http/1234')
+    driver.run do
+      driver.feed("output.test", time, {'message' =>'cpu{cluster="prod", node="lb-1"} 87.2 1501753030'})
+    end
+    assert_requested :post, "https://collectors.sumologic.com/v1/receivers/http/1234",
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test', 'Content-Type'=>'application/vnd.sumologic.prometheus'},
+                     body: 'cpu{cluster="prod", node="lb-1"} 87.2 1501753030',
+                     times:1
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sumologic_output
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Steven Adams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ci/build.sh
 - fluent-plugin-sumologic_output.gemspec
 - lib/fluent/plugin/out_sumologic.rb
 - test/helper.rb
@@ -133,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Output plugin to SumoLogic HTTP Endpoint