fluent-plugin-calyptia-monitoring 0.1.0.rc8 → 0.1.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 071d15721bdabcee712ce74be5d1f7125458e97f79f88c8e1b30927d353a9f04
-  data.tar.gz: 8704372a766aeb87d7993cf7e42ff0b2a07b6927398a25ee125bda03d035315d
+  metadata.gz: e42e4240470d5d46bcf2d098699d82d1d0eb6440f88fd89ff004d7c79b5789f7
+  data.tar.gz: 7f164695485c5202e003a31defc1b5a4022b67ed25ac71550011eb6400946f43
 SHA512:
-  metadata.gz: 5c8c50b693112a46959ee857d356a53957957fd1823eb4d98773765e7f3141535e0c3aac3e17e4cba80d930aea0f8b33e5174105955dfef0cb2d01a341ad05d1
-  data.tar.gz: 59a2cb53277e5bc524f5e18a534764252a523d94c3ce5b9e3fdd46214f5a61bb191398255fbcd99f858dc335ebd22f3537ba4b23fc76734bfb2720381dc7aa79
+  metadata.gz: ce39e348d421451fda13460ec7072d35e6e79df6c5bc74dfb48fb8f5d9237ff3c4a97bee8034d6e69ba76540b0c375b0cc599b78606b18adecb146a8b316d24a
+  data.tar.gz: 171bf4f4c6230b68174aafb76d042059956f0404294157c06b6a763ffb4cd2d726fb93cf9dc9956aa598c12ed5cda1aebdba1fac0a8a7af293907d230e91ef18

data/README.md

@@ -91,7 +91,7 @@ Usage:
 ```
 Usage: calyptia-config-generator api_key [options]
 
-Output plugin config definitions
+Generate Calyptia monitoring plugin config definitions
 
 Arguments:
 	api_key: Specify your API_KEY

data/fluent-plugin-calyptia-monitoring.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-calyptia-monitoring"
-  spec.version = "0.1.0.rc8"
+  spec.version = "0.1.0.rc9"
   spec.authors = ["Hiroshi Hatake"]
   spec.email   = ["hatake@calyptia.com"]
 
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.2.15"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "test-unit", "~> 3.3"
-  spec.add_runtime_dependency "fluentd", [">= 1.13.0", "< 2"]
+  spec.add_runtime_dependency "fluentd", [">= 1.14.0.rc", "< 2"]
   spec.add_runtime_dependency "fluent-plugin-metrics-cmetrics", ">= 0.1.0.rc3"
 end

data/lib/fluent/plugin/calyptia_monitoring_calyptia_api_requester.rb

@@ -37,12 +37,17 @@ module Fluent::Plugin
         ENV['HTTPS_PROXY'] || ENV['HTTP_PROXY'] || ENV['http_proxy'] || ENV['https_proxy']
       end
 
+      def create_go_semver(version)
+        version.gsub(/.(?<prever>(rc|alpha|beta|pre))/,
+                     '-\k<prever>')
+      end
+
       def agent_metadata(current_config)
         metadata = {
           "name" => Socket.gethostname,
           "type" => "fluentd",
           "rawConfig" => current_config,
-          "version" => Fluent::VERSION,
+          "version" => create_go_semver(Fluent::VERSION),
           "edition" => "community".freeze,
         }
         if system_config.workers.to_i > 1

data/test/plugin/test_calyptia_monitoring_calyptia_api_requester.rb

@@ -0,0 +1,29 @@
+require "helper"
+require "logger"
+require "fluent/plugin/calyptia_monitoring_calyptia_api_requester"
+
+class CalyptiaMonitoringMachineIdTest < Test::Unit::TestCase
+  API_KEY = 'YOUR_API_KEY'.freeze
+  API_ENDPOINT = "https://cloud-api.calyptia.com".freeze
+
+  setup do
+    @log = Logger.new($stdout)
+    worker_id = [1,2,3,4,5,6,7,8,9,10,11].sample
+    @api_requester = Fluent::Plugin::CalyptiaAPI::Requester.new(API_ENDPOINT,
+                                                                API_KEY,
+                                                                @log,
+                                                                worker_id)
+  end
+
+  data("rc" => ["1.14.0.rc", "1.14.0-rc"],
+       "rc2" => ["1.14.0.rc2", "1.14.0-rc2"],
+       "alpha" => ["1.14.0.alpha", "1.14.0-alpha"],
+       "beta" => ["1.14.0.beta", "1.14.0-beta"],
+       "pre" => ["1.14.0.pre", "1.14.0-pre"],
+      )
+  def test_create_go_semver(data)
+    version, expected = data
+    actual = @api_requester.create_go_semver(version)
+    assert_equal expected, actual
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calyptia-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc8
+  version: 0.1.0.rc9
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0.rc
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0.rc
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -109,6 +109,7 @@ files:
 - templates/calyptia-conf.erb
 - test/command/test_config_generator.rb
 - test/helper.rb
+- test/plugin/test_calyptia_monitoring_calyptia_api_requester.rb
 - test/plugin/test_calyptia_montoring_machine_id.rb
 - test/plugin/test_in_calyptia_monitoring.rb
 homepage: https://github.com/calyptia/fluent-plugin-calyptia-monitoring
@@ -137,5 +138,6 @@ summary: Monitoring Fluentd via Calyptia Cloud
 test_files:
 - test/command/test_config_generator.rb
 - test/helper.rb
+- test/plugin/test_calyptia_monitoring_calyptia_api_requester.rb
 - test/plugin/test_calyptia_montoring_machine_id.rb
 - test/plugin/test_in_calyptia_monitoring.rb