fluent-plugin-calyptia-monitoring 0.1.0.rc2 → 0.1.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e354b4af025ab4d6212f2cc59fd2c356e97d7900fc873cf56798107ce9545dbb
-  data.tar.gz: 4ebb6949a092949b0c2cd8e21d2636a56c2e969f209a89555bddb3467c2a528e
+  metadata.gz: bc96c5b09c542854a7fc86e735d01c1b8d15d6ffcacc35d21bc4e02578f7d379
+  data.tar.gz: 1deccf93ccb4b41f802099d72b33670459d78c65917af979dd074041de6b964f
 SHA512:
-  metadata.gz: 897bef9550f355493d137d799d21f1c202a60d026299117b931bb6dadee00a219faaa08fe1f2a47f6180afe5037fece2948f4fa37766b7efa1288f1fb0f2bdc9
-  data.tar.gz: 5b21d181a087e333acb4468fed8c3d7ee7e5843a9e1e635c499bec31c8e46c27d3f4b1c87ab6a41fa2c6c43f4d849373f7dd565afb3e14568c99a0fcac879030
+  metadata.gz: ba2e21ff1a791fcf81d33d3c568874ac672c3b9882e942007e57c403f2f0d0a12d211b473244bff8303f58bb5b853f2d9acb6c2d527e0d9623484c0a626f26b1
+  data.tar.gz: 62b0c374c5917ca03d8b836fdf2508838e4cc134d04e25873021fd972fa9914f5a38888e2de62d335b5576883307c343ec72b3f00d5959eb502cf9cd8ec9e87d

data/README.md

@@ -49,13 +49,16 @@ $ bundle
 
 This plugin works well with [cmetrics Fluentd extension for metrics plugin](https://github.com/calyptia/fluent-plugin-metrics-cmetrics).
 
-And enabling RPC and configDump endpoint is requireed if sending Fluentd configuration:
+And enabling RPC and configDump endpoint is required if sending Fluentd configuration:
 
 ```aconf
 <system>
 # If users want to use multi workers feature which corresponds to logical number of CPUs, please comment out this line.
 #  workers "#{require 'etc'; Etc.nprocessors}"
   enable_input_metrics true
+  # This record size measuring settings might impact for performance.
+  # Please be careful for high loaded environment to turn on.
+  enable_size_metrics true
   <metrics>
     @type cmetrics
   </metrics>

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.rc2"
+  spec.version = "0.1.0.rc6"
   spec.authors = ["Hiroshi Hatake"]
   spec.email   = ["hatake@calyptia.com"]
 
@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   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 "fluent-plugin-metrics-cmetrics", ">= 0.1.0.rc2"
+  spec.add_runtime_dependency "fluent-plugin-metrics-cmetrics", ">= 0.1.0.rc3"
 end

data/lib/fluent/plugin/calyptia_monitoring_calyptia_api_requester.rb

@@ -51,10 +51,10 @@ module Fluent::Plugin
         metadata
       end
 
-      # POST /api/v1/agents
+      # POST /v1/agents
       # Authorization: X-Project-Token
       def create_agent(current_config)
-        url = URI("#{@endpoint}/api/v1/agents")
+        url = URI("#{@endpoint}/v1/agents")
 
         https = if proxy = proxies
                   proxy_uri = URI.parse(proxy)
@@ -75,10 +75,10 @@ module Fluent::Plugin
         return [response.code, agent, machine_id]
       end
 
-      # PATCH /api/v1/agents/:agent_id
+      # PATCH /v1/agents/:agent_id
       # Authorization: X-Agent-Token
       def update_agent(current_config, agent, machine_id)
-        url = URI("#{@endpoint}/api/v1/agents/#{agent['id']}")
+        url = URI("#{@endpoint}/v1/agents/#{agent['id']}")
 
         https = if proxy = proxies
                   proxy_uri = URI.parse(proxy)
@@ -100,10 +100,10 @@ module Fluent::Plugin
         return [response.code, body]
       end
 
-      # POST /api/v1/agents/:agent_id/metrics
+      # POST /v1/agents/:agent_id/metrics
       # Authorization: X-Agent-Token
       def add_metrics(metrics, agent_token, agent_id)
-        url = URI("#{@endpoint}/api/v1/agents/#{agent_id}/metrics")
+        url = URI("#{@endpoint}/v1/agents/#{agent_id}/metrics")
 
         https = if proxy = proxies
                   proxy_uri = URI.parse(proxy)

data/lib/fluent/plugin/calyptia_monitoring_ext.rb

@@ -19,9 +19,11 @@ module Fluent::Plugin
   class CalyptiaMonitoringExtInput < MonitorAgentInput
     CALYPTIA_PLUGIN_METRIC_INFO = {
       'emit_size' => ->(){
+        throw(:skip) if @emit_size_metrics.get.nil?
         @emit_size_metrics.cmetrics.to_msgpack
       },
       'emit_records' => ->(){
+        throw(:skip) if @emit_records_metrics.get.nil?
         @emit_records_metrics.cmetrics.to_msgpack
       },
       'retry_count' => ->(){

data/lib/fluent/plugin/calyptia_monitoring_machine_id.rb

@@ -53,7 +53,7 @@ module Fluent::Plugin
       require 'open3'
       o,_e, s = Open3.capture3 %q(ioreg -d2 -c IOPlatformExpertDevice | awk -F\" '/IOPlatformUUID/{print $(NF-1)}')
       unless s.success?
-        @log.warn "MachineID is not retrived from ioreg. Using UUID instead."
+        @log.info "MachineID is not retrived from ioreg. Using UUID instead."
         "#{SecureRandom.uuid}:#{@worker_id}"
       else
         # TODO: The prefix should be removed?
@@ -65,11 +65,11 @@ module Fluent::Plugin
       machine_id = ""
       begin
         machine_id = File.read(DBUS_MACHINE_ID_PATH).strip
-      rescue Errno::NOENT
+      rescue Errno::ENOENT
         machine_id = File.read(ETC_MACHINE_ID_PATH).strip rescue ""
       end
       if machine_id.empty?
-        @log.warn "MachineID is not retrived from #{DBUS_MACHINE_ID_PATH} or #{ETC_MACHINE_ID_PATH}. Using UUID instead."
+        @log.info "MachineID is not retrived from #{DBUS_MACHINE_ID_PATH} or #{ETC_MACHINE_ID_PATH}. Using UUID instead."
         "#{SecureRandom.uuid}:#{@worker_id}"
       else
         # TODO: The prefix should be removed?
@@ -85,7 +85,7 @@ module Fluent::Plugin
         machine_id = key.read("MachineGuid")[1] rescue ""
       end
       if machine_id.empty?
-        @log.warn "MachineID is not retrived from Registry. Using UUID instead."
+        @log.info "MachineID is not retrived from Registry. Using UUID instead."
         "#{SecureRandom.uuid}:#{@worker_id}"
       else
         # TODO: The prefix should be removed?

data/lib/fluent/plugin/in_calyptia_monitoring.rb

@@ -45,7 +45,7 @@ module Fluent
 
       config_section :cloud_monitoring, multi: false, required: true do
         desc 'The endpoint for Monitoring API HTTP request, e.g. http://example.com/api'
-        config_param :endpoint, :string, default: "https://cloud-monitoring-api-dev.fluentbit.io"
+        config_param :endpoint, :string, default: "https://cloud-api.calyptia.com"
         desc 'The API KEY for Monitoring API HTTP request'
         config_param :api_key, :string, secret: true
         desc 'Emit monitoring values interval. (minimum interval is 30 seconds.)'
@@ -222,8 +222,12 @@ module Fluent
             buffer += v
           end
         }
-        unless add_metrics(buffer)
-          log.warn "Sending metrics is failed. Trying to send pending buffers in the next interval: #{@cloud_monitoring.rate}, next sending time: #{Time.now + @cloud_monitoring.rate}"
+        if buffer.empty?
+          log.debug "No initialized metrics is found. Trying to send cmetrics on the next tick."
+        else
+          unless add_metrics(buffer)
+            log.warn "Sending metrics is failed. Trying to send pending buffers in the next interval: #{@cloud_monitoring.rate}, next sending time: #{Time.now + @cloud_monitoring.rate}"
+          end
         end
       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.rc2
+  version: 0.1.0.rc6
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.rc2
+        version: 0.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.rc2
+        version: 0.1.0.rc3
 description: Monitoring Fluentd via Calyptia Cloud
 email:
 - hatake@calyptia.com
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Monitoring Fluentd via Calyptia Cloud