fluent-plugin-wodby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13aa893cfb355e20164d075f6b18684fc482e6e89dc5c4bfdd7c7e143a8fc9cc
-  data.tar.gz: '083c6cf98fdfee4fdc6cdc199d8c7e5924da14b045537db2d4344e582c1c9f56'
+  metadata.gz: 38201e01bc10ab5a8e3852d23fe3969058de5cf0d2050157b9206b2466f2bcf1
+  data.tar.gz: a76ea598966087567dd0cd60dd9532574d42fe68c377c79d336c045152c04059
 SHA512:
-  metadata.gz: 7bf8ba304a99a79dc966bd3a27a3ad54dc48f2a9d5d5530dbb0066a44dda7738d7f4d0d368c424fffc08b8cdf9ae64018273d9eccf5d8c970d8829d0fd50e3a1
-  data.tar.gz: ac46fdb14afaf0912004803d8cf35d69f31283e797231e701db104017b70e5d8805df011fc296ad703198a1beb3af56dde3b258f89c5dc3a136367dda9c9a8b4
+  metadata.gz: ab83b527ab0249bccf037e72929b56555061267e80f04146352f76ff71e2e97e2011ef99923f864772a71f06df516ab16a2396d4a07bc47fda4bc19754287965
+  data.tar.gz: e0380bfa99a2a4650d064217f1399c9b68d1f47359b162df0ae1b9fd0fb60013be754024b898507a224a8222802396e6c10a66dc5880dfbce6636614a6fd2fd6

data/Makefile

@@ -0,0 +1,9 @@
+PWD=$(shell pwd)
+
+.PHONY: docker-test
+docker-test:
+	docker run --rm -it -v $(PWD):/build -e WODBY_API_KEY=${WODBY_API_KEY} ruby /bin/bash -c "cd build && bundle install && bundle exec rake test"
+
+.PHONY: docker-tester
+docker-tester:
+	docker run --rm -it -v $(PWD):/build -e WODBY_API_KEY=${WODBY_API_KEY} ruby /bin/bash

data/fluent-plugin-wodby.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-wodby"
-  spec.version = "0.1.2"
+  spec.version = "0.1.3"
   spec.authors = ["Robert Wunderer"]
   spec.email   = ["robert@ramsalt.com"]
 

data/lib/fluent/plugin/filter_wodby.rb

@@ -24,12 +24,25 @@ module Fluent
 
       config_param :api_key, :string, secret: true
 
+      def start
+        super
+
+        @instance_map = {}
+      end
+
       def filter(tag, time, record)
+        record['wodby.filter'] = true
+
         if record.has_key?('kubernetes.namespace_name')
-          instance = get_instance(record['kubernetes.namespace_name'])
-          app = get_app(instance['app_id'])
+          unless @instance_map.has_key?(record['kubernetes.namespace_name'])
+            record['wodby.instance_query'] = record['kubernetes.namespace_name']
+            instance = get_instance(record['kubernetes.namespace_name'])
+            app = get_app(instance['app_id'])
+
+            @instance_map[record['kubernetes.namespace_name']] = "#{app['title']}-#{instance['name']}"
+          end
 
-          record['wodby.instance'] = "#{app['title']}-#{instance['name']}"
+          record['wodby.instance'] = @instance_map[record['kubernetes.namespace_name']]
         end
 
         record
@@ -44,7 +57,7 @@ module Fluent
             headers={'X-API-KEY': @api_key}
           )
           instance = JSON.parse(response)
-        rescue RestClient::ExceptionWithResponse => e
+        rescue RestClient::ExceptionWithResponse
           instance = {}
         end
 
@@ -58,7 +71,7 @@ module Fluent
             headers={'X-API-KEY': @api_key}
           )
           app = JSON.parse(response)
-        rescue RestClient::ExceptionWithResponse => e
+        rescue RestClient::ExceptionWithResponse
           app = {}
         end
 

data/test/plugin/test_filter_wodby.rb

@@ -18,10 +18,16 @@ class WodbyFilterTest < Test::Unit::TestCase
     d.run do
       d.feed('filter.test', time, { 'kubernetes.namespace_name' => '650241f4-7303-4668-91c7-b8cd1821d81a', 'message' => 'hullo' })
       d.feed('filter.test', time, { 'kubernetes.namespace_name' => 'a3d67f12-8341-4245-87db-ed7a6c856e70', 'message' => 'hullo' })
+      d.feed('filter.test', time, { 'kubernetes.namespace_name' => '650241f4-7303-4668-91c7-b8cd1821d81a', 'message' => 'hullo' })
     end
 
-    assert_equal(2, d.filtered_records.size)
+    assert_equal(3, d.filtered_records.size)
     assert_equal('dfo.no-staging', d.filtered_records[0]['wodby.instance'])
     assert_equal('dfo.no-prod', d.filtered_records[1]['wodby.instance'])
+    assert_equal('dfo.no-staging', d.filtered_records[2]['wodby.instance'])
+    assert_nil(d.filtered_records[2]['wodby.instance_query'])
+    assert_true(d.filtered_records[0]['wodby.filter'])
+    assert_true(d.filtered_records[1]['wodby.filter'])
+    assert_true(d.filtered_records[2]['wodby.filter'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-wodby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robert Wunderer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - fluent-plugin-wodby.gemspec