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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e354b4af025ab4d6212f2cc59fd2c356e97d7900fc873cf56798107ce9545dbb
-  data.tar.gz: 4ebb6949a092949b0c2cd8e21d2636a56c2e969f209a89555bddb3467c2a528e
+  metadata.gz: 9ce44716243a51ce3400cdb88a452b7fec82e12642ea0f1e9cdc175e6d8768d0
+  data.tar.gz: 8f4e3cdce49b511820d265d175519f3a65517c38a7b409dec90745bd425741da
 SHA512:
-  metadata.gz: 897bef9550f355493d137d799d21f1c202a60d026299117b931bb6dadee00a219faaa08fe1f2a47f6180afe5037fece2948f4fa37766b7efa1288f1fb0f2bdc9
-  data.tar.gz: 5b21d181a087e333acb4468fed8c3d7ee7e5843a9e1e635c499bec31c8e46c27d3f4b1c87ab6a41fa2c6c43f4d849373f7dd565afb3e14568c99a0fcac879030
+  metadata.gz: '008865155bdee8e274d53f504ec08f2f5e52e91f7de806f4600632066e2995918dd9f01b63e9b18f785e865f662ebf203c9715e1cd3c55eded5e8870855f95ff'
+  data.tar.gz: 88d3b9026053c6cf8feec03f186c870a01dbe898a159fd3d9f06fb6643d4194344fd18a2cf85e52712844a79c3f34fb1e0671d61842433a1ff0a34f0543137f3

data/README.md

@@ -49,7 +49,7 @@ $ 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>

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.rc3"
   spec.authors = ["Hiroshi Hatake"]
   spec.email   = ["hatake@calyptia.com"]
 

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(self.plugin_id).nil?
         @emit_size_metrics.cmetrics.to_msgpack
       },
       'emit_records' => ->(){
+        throw(:skip) if @emit_records_metrics.get(self.plugin_id).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?
@@ -69,7 +69,7 @@ module Fluent::Plugin
         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

@@ -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.rc3
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler