fluent-plugin-wodby 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c8c562d96d1ccf43a9ec81aa7771ac8fd05ed071282119c62581ae4d45f5db
-  data.tar.gz: 43e377e23fe30e3af5df48ee6f3c144278339b3c5c18d662705e09ee9e50ce2c
+  metadata.gz: e2c0a42ae8e68d022cea68274dec675e8e22b181e1b1ab0a257ece331166eca0
+  data.tar.gz: 4b740c774e644e04201abab355f79312a9f5a25652c6026c7fe55547c65e50d1
 SHA512:
-  metadata.gz: c1f702cfa38258a6a4cacafbe33d94e4fd9dc3bac2334b8ca7eff3ce5f7e1a9622a76533019f1f69b5da8b2abba8a7e33c2912a9963c8eb399467217dc367eee
-  data.tar.gz: 2b42ea373f5daebc31f7fac557d6d45f9939bc93ceb0dd8c3e0e50e127aa17431345a80639d9b07719d1f88c59045fa01d1958f7a8649f63d18b206ff50ce98e
+  metadata.gz: e36b6cde7a8ca346a9e2343ceeeb32a0b6b1ceb028e9b2481c797d17352fe3eeb6336bd96e94649a27fb1410210c8f07e3d3be10f2217af50a9450bc32142970
+  data.tar.gz: c17560e1f313d485a5dd79048dc4deeea97aa6f1045d0ad8b0715c5972ed84ab41ecf4b8985841983f75a22410680a47fe469099aa85226e085e4f4928805805

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.3.1"
+  spec.version = "0.4.0"
   spec.authors = ["Robert Wunderer"]
   spec.email   = ["robert@ramsalt.com"]
 

data/lib/fluent/plugin/filter_wodby.rb

@@ -46,23 +46,28 @@ module Fluent
           unless @instance_map.has_key?(namespace)
             record['wodby']['instance_query'] = namespace
             instance = get_instance(namespace)
-            app = get_app(instance['app_id'])
-            org = get_org(app['org_id'])
-
-            @instance_map[namespace] = {
-              'name' => "#{app['name']}.#{instance['name']}",
-              'title' => "#{app['title']} - #{instance['title']}",
-              'type' => instance['type'],
-              'organization' => org['name'],
-              'organization_title' => org['title'],
-            }
+
+            if instance.empty?
+              @instance_map[namespace] = {
+                'found' => false
+              }
+
+            else
+              app = get_app(instance['app_id'])
+              org = get_org(app['org_id'])
+
+              @instance_map[namespace] = {
+                'found' => true,
+                'instance' => "#{app['name']}.#{instance['name']}",
+                'instance_title' => "#{app['title']} - #{instance['title']}",
+                'instance_type' => instance['type'],
+                'organization' => org['name'],
+                'organization_title' => org['title'],
+              }
+            end
           end
 
-          record['wodby']['instance'] = @instance_map[namespace]['name']
-          record['wodby']['instance_title'] = @instance_map[namespace]['title']
-          record['wodby']['instance_type'] = @instance_map[namespace]['type']
-          record['wodby']['organization'] = @instance_map[namespace]['organization']
-          record['wodby']['organization_title'] = @instance_map[namespace]['organization_title']
+          record['wodby'].merge!(@instance_map[namespace])
         else
           log.info "No namespace found"
           log.info record

data/test/plugin/test_filter_wodby.rb

@@ -19,9 +19,15 @@ class WodbyFilterTest < Test::Unit::TestCase
       d.feed('filter.test', time, { 'kubernetes' => {'namespace_name' => '650241f4-7303-4668-91c7-b8cd1821d81a'}, 'message' => 'hullo', 'wodby.node_name' => 'node' })
       d.feed('filter.test', time, { 'kubernetes' => {'namespace_name' => '7ee5d15f-7c3c-4ce8-873e-34b75154f0f4'}, 'message' => 'hullo', 'wodby.node_name' => 'node' })
       d.feed('filter.test', time, { 'kubernetes' => {'namespace_name' => '650241f4-7303-4668-91c7-b8cd1821d81a'}, 'message' => 'hullo', 'wodby.node_name' => 'node' })
+      d.feed('filter.test', time, { 'kubernetes' => {'namespace_name' => 'renovate'}, 'message' => 'hullo', 'wodby.node_name' => 'node' })
     end
 
-    assert_equal(3, d.filtered_records.size)
+    assert_equal(4, d.filtered_records.size)
+    assert_true(d.filtered_records[0]['wodby']['found'])
+    assert_true(d.filtered_records[1]['wodby']['found'])
+    assert_true(d.filtered_records[2]['wodby']['found'])
+    assert_false(d.filtered_records[3]['wodby']['found'])
+
     assert_equal('dfono.staging', d.filtered_records[0]['wodby']['instance'])
     assert_equal('dfono.prod', d.filtered_records[1]['wodby']['instance'])
     assert_equal('dfono.staging', d.filtered_records[2]['wodby']['instance'])
@@ -29,8 +35,12 @@ class WodbyFilterTest < Test::Unit::TestCase
     assert_equal('dfo.no - Prod', d.filtered_records[1]['wodby']['instance_title'])
     assert_equal('node', d.filtered_records[0]['wodby']['node_name'])
     assert_equal('node', d.filtered_records[1]['wodby']['node_name'])
+    assert_equal('dfo', d.filtered_records[0]['wodby']['organization'])
+    assert_equal('DFØ', d.filtered_records[1]['wodby']['organization_title'])
+
     assert_nil(d.filtered_records[2]['wodby']['instance_query'])
     assert_nil(d.filtered_records[2]['wodby.node_name'])
+
     assert_true(d.filtered_records[0]['wodby']['filter'])
     assert_true(d.filtered_records[1]['wodby']['filter'])
     assert_true(d.filtered_records[2]['wodby']['filter'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-wodby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Wunderer