fluent-plugin-metrics-cmetrics 0.1.0.rc3 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d456fe687adf10998461e508aa867855b1d49e02af09912fe8ed5449e7c96a4
-  data.tar.gz: d5a3b8f57507492b2583cd601003ca140451ff43bc637ead643accded7e651a8
+  metadata.gz: ad64645abdd36ef6d6950fa565d744b2849f74b6255b571dae5e21ce13df8d24
+  data.tar.gz: a3cdc9fdef5e8443c4a8b6593cc626436ced183a5d6ba9d598b29607f6a042a0
 SHA512:
-  metadata.gz: 69afd6afb9aaef6f7ae0ac1857c853a90db83dce90753adc9d76a865ada4b2e1821fc18f21cccd8bc5aa0915b5e6c323a86c819ac3431cb3421f492817d4f620
-  data.tar.gz: 9879e77e725889bd1e4ced8a6c73fa6d23b92f1afff6f64884e787bf0c1e175d880595234e0a752449d727bed6c55bc4587d4d2f69b64fc196d6efb92399c991
+  metadata.gz: f762355693fd0d556aac69ad88419db69c1e16a1d0707239dacc8888e1334d6d83f111ddd59a9ee2b0adec98e29b660782f582963f095f4be35efff2b280b991
+  data.tar.gz: a6a4a82c626cfb3e5703ee51f958866fc4eb39a5763b7fc16091c67fd6441cf650a9d75ee4a7e64f01aa5d97cf0f98f70796703cd22b9aa937acf97783e46ea4

data/.github/workflows/macos-test.yml

@@ -24,9 +24,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - name: Set up Gemfile.local to use developing metrics plugin mechanism
-        run: |
-          echo 'gem "fluentd", github: "cosmo0920/fluentd", branch: "implement-metrics-plugin"' > Gemfile.local
       - name: Run bundle install
         run: bundle install
       - name: Run the default task

data/.github/workflows/ubuntu-test.yml

@@ -24,9 +24,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - name: Set up Gemfile.local to use developing metrics plugin mechanism
-        run: |
-          echo 'gem "fluentd", github: "cosmo0920/fluentd", branch: "implement-metrics-plugin"' > Gemfile.local
       - name: Run bundle install
         run: bundle install
       - name: Run the default task

data/.github/workflows/windows-test.yml

@@ -24,9 +24,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - name: Set up Gemfile.local to use developing metrics plugin mechanism
-        run: |
-          echo 'gem "fluentd", github: "cosmo0920/fluentd", branch: "implement-metrics-plugin"' > Gemfile.local
       - name: Run bundle install
         run: ridk exec bundle install
       - name: Run the default task

data/fluent-plugin-metrics-cmetrics.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("cmetrics", ["~> 0.1.9"])
-  spec.add_runtime_dependency("fluentd", [">= 0.13.0", "< 2"])
+  spec.add_runtime_dependency("cmetrics", [">= 0.2.0"])
+  spec.add_runtime_dependency("fluentd", [">= 0.14.0", "< 2"])
 
   spec.add_development_dependency("rake", ["~> 13.0"])
   spec.add_development_dependency("test-unit", ["~> 3.4"])

data/lib/fluent/plugin/cmetrics/version.rb

@@ -3,7 +3,7 @@
 module Fluent
   module Plugin
     module CMetrics
-      VERSION = "0.1.0.rc3"
+      VERSION = "0.1.2"
     end
   end
 end

data/lib/fluent/plugin/metrics_cmetrics.rb

@@ -23,13 +23,16 @@ module Fluent
     class CMetricsMetrics < Metrics
       Fluent::Plugin.register_metrics('cmetrics', self)
 
-      attr_reader :cmetrics
+      attr_reader :cmetrics, :_subsystem # _subsystem for testing.
+
+      config_param :enable_calyptia_metrics_mapping, :bool, default: true
 
       def initialize
         super
         @cmetrics = nil
         @default_labels_keys = []
         @default_labels_values = []
+        @_subsystem = nil
       end
 
       def configure(conf)
@@ -60,6 +63,9 @@ module Fluent
       end
 
       def create(namespace:, subsystem:, name:, help_text:, labels: {})
+        if @enable_calyptia_metrics_mapping
+          subsystem = calyptia_metrics_subsystem_mapper(subsystem)
+        end
         @cmetrics.create(namespace, subsystem, name, help_text, @labels_keys)
         # Add specified in #create label(s) as static label(s).
         unless labels.empty?
@@ -69,6 +75,16 @@ module Fluent
         end
       end
 
+      def calyptia_metrics_subsystem_mapper(subsystem)
+        case subsystem.to_s
+        when "buffer"
+          # Calyptia's service should handle buffer metrics as storage.
+          subsystem = "storage"
+        end
+        @_subsystem = subsystem
+        subsystem
+      end
+
       def multi_workers_ready?
         true
       end

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metrics-cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc3
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmetrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.22
 signing_key: