fluent-plugin-calyptia-monitoring 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc0b5aeb01b9d8633b36bf2f3b9f58edbcb9ef013714e3e835521701351a4d4
-  data.tar.gz: db62765482fe0dd3cc2a3ceba7267f40a9da21bb4b52f99d230ccda39c52d27f
+  metadata.gz: c8a47c5ddcd660a66dcec0b732510d97f65d5df3c732faf3f6575828948076de
+  data.tar.gz: d4796efe64fe5cc8bdd6c531a3f3b27de8c759e3fed3fadb5d7e79e5345f76fd
 SHA512:
-  metadata.gz: 9d56cd4f622355e6b7f3939044e33290fdfd1dc017fe77988296af190f1ba89020d0be45e123a782083e7bc7d617125ef92c2042e2d4777f7ef57736da0f75de
-  data.tar.gz: 36c91c64f0e13a06d9c2dd57c265989c6bf132dd7c9a57d388b22c6ba9d324af361253272763d761c6b21a99b8355f199ddd22b03539e6abd697488994c99767
+  metadata.gz: 3af292be5c20644444af230895df1b6a1f918513d899736e2f8d97cedec6b9d2335f25469e557cb7b8a14d78b6cdabe5bf3e59e2c5863e19f131a066876bce57
+  data.tar.gz: fbc3e6d065c9fe6ed75cfe31e58f81367d7b1fdc02c5c93d0e5148fe789ccab2cfdcf4cae42948a309a5cf6ea206c4b129da157ca489540884bcf623ca98a125

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

data/lib/fluent/plugin/calyptia_monitoring_in_tail.rb

@@ -0,0 +1,68 @@
+#
+# fluent-plugin-calyptia-monitoring
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'fluent/plugin/in_monitor_agent'
+
+module Fluent::Plugin
+  class CalyptiaMonitoringInTailInput < MonitorAgentInput
+    CALYPTIA_PLUGIN_METRIC_INFO = {
+      'files_opened_total' => ->(){
+        throw(:skip) unless instance_variable_defined?(:@metrics) && !@metrics.nil? && !@metrics.opened.get.nil?
+        @metrics.opened.cmetrics.to_msgpack
+      },
+      'files_closed_total' => ->(){
+        throw(:skip) unless instance_variable_defined?(:@metrics) && !@metrics.nil? && !@metrics.closed.get.nil?
+        @metrics.closed.cmetrics.to_msgpack
+      },
+      'files_rotated_total' => ->(){
+        throw(:skip) unless instance_variable_defined?(:@metrics) && !@metrics.nil? && !@metrics.rotated.get.nil?
+        @metrics.rotated.cmetrics.to_msgpack
+      },
+    }
+
+    def plugins_info_all(opts={})
+      agent_info = all_plugins.select {|pe|
+        pe.config['@type'] == "tail".freeze rescue nil
+      }
+
+      agent_info.map do |pe|
+        get_monitor_info(pe, opts)
+      end
+    end
+
+    def get_monitor_info(pe, opts = {})
+      obj = {}
+
+      obj['metrics'] = get_plugin_metric(pe)
+
+      obj
+    end
+
+    def get_plugin_metric(pe)
+      metrics = {}
+      CALYPTIA_PLUGIN_METRIC_INFO.each_pair { |key, code|
+        begin
+          v = pe.instance_exec(&code)
+          unless v.nil?
+            metrics[key] = v
+          end
+        rescue
+        end
+      }
+
+      metrics
+    end
+  end
+end

data/lib/fluent/plugin/in_calyptia_monitoring.rb

@@ -22,6 +22,7 @@ require "fluent/plugin/input"
 require "serverengine"
 require_relative "calyptia_monitoring_ext"
 require_relative "calyptia_monitoring_buffer_ext"
+require_relative "calyptia_monitoring_in_tail"
 require_relative "calyptia_monitoring_calyptia_api_requester"
 
 module Fluent
@@ -135,6 +136,7 @@ module Fluent
         raise Fluent::ConfigError, "cmetrics plugin should be used to collect metrics on Calyptia Cloud" unless enabled_cmetrics
         @monitor_agent = Fluent::Plugin::CalyptiaMonitoringExtInput.new
         @monitor_agent_buffer = Fluent::Plugin::CalyptiaMonitoringBufferExtInput.new
+        @monitor_agent_in_tail = Fluent::Plugin::CalyptiaMonitoringInTailInput.new
         @api_requester = Fluent::Plugin::CalyptiaAPI::Requester.new(@cloud_monitoring.endpoint,
                                                                     @cloud_monitoring.api_key,
                                                                     log,
@@ -272,6 +274,12 @@ module Fluent
             buffer += v
           end
         }
+        @monitor_agent_in_tail.plugins_info_all(opts).each {|record|
+          metrics = record["metrics"]
+          metrics.each_pair do |k, v|
+            buffer += v
+          end
+        }
         if buffer.empty?
           log.debug "No initialized metrics is found. Trying to send cmetrics on the next tick."
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calyptia-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/fluent/plugin/calyptia_monitoring_buffer_ext.rb
 - lib/fluent/plugin/calyptia_monitoring_calyptia_api_requester.rb
 - lib/fluent/plugin/calyptia_monitoring_ext.rb
+- lib/fluent/plugin/calyptia_monitoring_in_tail.rb
 - lib/fluent/plugin/calyptia_monitoring_machine_id.rb
 - lib/fluent/plugin/in_calyptia_monitoring.rb
 - templates/calyptia-conf.erb