fluent-plugin-wodby 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd53b2bc16d8fca2ff749985b2dccccdf783616aca438f4fe8c5d947064dbc80
-  data.tar.gz: e96d52f0a9c9887abc0c3a01c95cac5e698b0a873417fa0dfdfc3bd9531d36d7
+  metadata.gz: 45c8c562d96d1ccf43a9ec81aa7771ac8fd05ed071282119c62581ae4d45f5db
+  data.tar.gz: 43e377e23fe30e3af5df48ee6f3c144278339b3c5c18d662705e09ee9e50ce2c
 SHA512:
-  metadata.gz: 163226e98013e63f4536daa1d6db67f64d6b71a347a94ecf80afa0ce3600e559afc6d3fd8ba4b5e622a33ac6fa141c6122e8409b4964e6162f1855a288bec9f9
-  data.tar.gz: 7237c58a7a76709f51e6cd3238a5d76de6c40d0341a781e9d7a91c1ed3489289d784c4a5ccc6cdc203ae35f06b78566443aa5eb14af4d01fba46fa6688289bfa
+  metadata.gz: c1f702cfa38258a6a4cacafbe33d94e4fd9dc3bac2334b8ca7eff3ce5f7e1a9622a76533019f1f69b5da8b2abba8a7e33c2912a9963c8eb399467217dc367eee
+  data.tar.gz: 2b42ea373f5daebc31f7fac557d6d45f9939bc93ceb0dd8c3e0e50e127aa17431345a80639d9b07719d1f88c59045fa01d1958f7a8649f63d18b206ff50ce98e

data/.github/workflows/gem-push.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Ruby 3.1
+    - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1'
+        ruby-version: '3.3'
         bundler-cache: true
 
     - name: Publish to GPR

data/Makefile

@@ -2,8 +2,8 @@ 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"
+	docker run --rm -it -v $(PWD):/build -e WODBY_API_KEY=${WODBY_API_KEY} ruby:3.3 /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
+	docker run --rm -it -v $(PWD):/build -e WODBY_API_KEY=${WODBY_API_KEY} ruby:3.3 /bin/bash

data/README.md

@@ -1,8 +1,9 @@
 # fluent-plugin-wodby
 
-[Fluentd](https://fluentd.org/) filter plugin to do something.
+[Fluentd](https://fluentd.org/) filter plugin to enrich logging data with Wodby instance information.
 
-TODO: write description for you plugin.
+This plugin will query the [Wodby](https://wodby.com) API to retrieve information about the
+Wodby instance producing the logs.
 
 ## Installation
 
@@ -38,6 +39,6 @@ You can copy and paste generated documents here.
 
 ## Copyright
 
-* Copyright(c) 2022- TODO: Write your name
+* Copyright(c) 2022-2024: Ramsalt Lab
 * License
   * Apache License, Version 2.0

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.2.2"
+  spec.version = "0.3.1"
   spec.authors = ["Robert Wunderer"]
   spec.email   = ["robert@ramsalt.com"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = test_files
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.3.7"
+  spec.add_development_dependency "bundler", "~> 2.5.0"
   spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "test-unit", "~> 3.5.3"
   spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]

data/lib/fluent/plugin/filter_wodby.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2022- TODO: Write your name
+# Copyright 2022-2024: Ramsalt Lab
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,12 +32,19 @@ module Fluent
       end
 
       def filter(tag, time, record)
-        record['wodby.filter'] = true
+        record['wodby'] = {
+          'filter' => true
+        }
+
+        if record.has_key?('wodby.node_name')
+          record['wodby']['node_name'] = record['wodby.node_name']
+          record.delete('wodby.node_name')
+        end
 
         if record.has_key?('kubernetes') && record['kubernetes'].has_key?('namespace_name')
           namespace = record['kubernetes']['namespace_name']
           unless @instance_map.has_key?(namespace)
-            record['wodby.instance_query'] = namespace
+            record['wodby']['instance_query'] = namespace
             instance = get_instance(namespace)
             app = get_app(instance['app_id'])
             org = get_org(app['org_id'])
@@ -51,11 +58,11 @@ module Fluent
             }
           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']['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']
         else
           log.info "No namespace found"
           log.info record

data/test/plugin/test_filter_wodby.rb

@@ -16,20 +16,23 @@ class WodbyFilterTest < Test::Unit::TestCase
     d = create_driver("api_key #{ENV['WODBY_API_KEY']}")
     time = event_time
     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' })
+      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' })
     end
 
     assert_equal(3, d.filtered_records.size)
-    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'])
-    assert_equal('dfo.no - Staging', d.filtered_records[0]['wodby.instance_title'])
-    assert_equal('dfo.no - Prod', d.filtered_records[1]['wodby.instance_title'])
-    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'])
+    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'])
+    assert_equal('dfo.no - Staging', d.filtered_records[0]['wodby']['instance_title'])
+    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_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'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-wodby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Wunderer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Tranlates Wodbys instance UUIDs into instance names