fluent-plugin-postgresql-csvlog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb322f50f848a7b196962dae916a75f30a77f1461167bb314494ae203f8ef9d6
-  data.tar.gz: 077266e6c7f3589813d0c4db8ddccfde76f7d6ecd0b6d6388b67a4e6328ad858
+  metadata.gz: 81cfb53854390b0aae43fd6f8cfaf05e11c4251a4442bf40ccdee016db11b3f6
+  data.tar.gz: 0e705c2af91af84e400e96d41b5275f0d01f4d6dc4ec0a37b3bfed0974e8a424
 SHA512:
-  metadata.gz: 9b130aa84b1285a62466b3bf68ff6d02acc7e95cd53cc91ee7e34ec81ee4440e06358738790f86f8d436cb8a72ad232f12ac2c0f9d8aca16fd5c6ba19bbdfe49
-  data.tar.gz: e9480110be0cadfad86c5fcc554eb5d1d7264559714e4fd88ea396ae9bb913027b15782c70cd2f4c06e1f4cc5a5bbafe55632ca8eba02ce57e610d98f8440c09
+  metadata.gz: 24bb505d30f06847e16b2f631e1e2ce011559edcc11724556d62abc0089ee99b00e5b911c1f23d87740720fd4d57235af1ee104991cbff72ac8ba790c700280a
+  data.tar.gz: d42ae8976276b4392c1963d6c83e7691732f7eec8dbf87eaf270e3b4547ceba8f9f2b76056006163d6b594e0791b4a9b49183c6ae1793610e7f6555a92b9d190

data/Dockerfile

@@ -0,0 +1,18 @@
+# Dockerfile useful for manual testing purposes
+FROM fluent/fluentd:v1.13-1
+USER root
+RUN apk add bash alpine-sdk postgresql-dev postgresql-client ruby-dev
+
+WORKDIR /src/
+
+ADD Gemfile /src/
+ADD fluent-plugin-postgresql-csvlog.gemspec /src/
+
+ADD . /src/
+
+RUN bundle install
+RUN rake build
+
+RUN fluent-gem install pkg/*.gem
+
+ENTRYPOINT [ "/bin/bash"]

data/docker-compose.yml

@@ -0,0 +1,19 @@
+# Docker Compose setup useful for testing and development purposes
+version: "3.9"
+services:
+  fluentd:
+    build: .
+    links:
+      - postgres
+    entrypoint: /usr/bin/fluentd -vvv -c /src/example-fluentd.conf
+  postgres:
+    image: postgres
+    restart: always
+    environment:
+      - POSTGRES_USER=testuser
+      - POSTGRES_PASSWORD=testpass
+    ports:
+      - '5438:5432'
+    command: postgres -c shared_preload_libraries=pg_stat_statements -c pg_stat_statements.track=all
+    volumes:
+      - ./sql/create_extension.sql:/docker-entrypoint-initdb.d/create_extension.sql

data/example-fluentd.conf

@@ -0,0 +1,12 @@
+<source>
+  @type pg_stat_statements
+  tag postgres.pg_stat_statements
+  host postgres
+  username testuser
+  password testpass
+  interval 1
+</source>
+
+<match postgres.pg_stat_statements>
+  @type stdout
+</match>

data/fluent-plugin-postgresql-csvlog.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-postgresql-csvlog'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   s.authors     = ['stanhu']
   s.email       = ['stanhu@gmail.com']
   s.homepage    = 'https://gitlab.com/gitlab-org/fluent-plugins/fluent-plugin-postgresql-csvlog'

data/lib/fluent/plugin/{input_pg_stat_statements.rb → in_pg_stat_statements.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'fluent/input'
+require 'fluent/plugin/input'
 require 'pg'
 require 'pg_query'
 
-module Fluent
+module Fluent::Plugin
   # PgStatStatementsInput will periodically poll postgres, querying pg_stat_statements
   # for queryid to query mappings. These are then normalized for security purposes
   # fingerprinted and emitted as records with the following format:
@@ -101,9 +101,9 @@ module Fluent
 
     # Query the database and emit statements to fluentd router
     def emit_statements_to_stream(conn)
-      me = MultiEventStream.new
+      me = Fluent::MultiEventStream.new
 
-      now = Engine.now
+      now = Fluent::Engine.now
       conn.exec('SELECT queryid, query FROM pg_stat_statements').each do |row|
         record = record_for_row(row)
         me.add(now, record)

data/sql/create_extension.sql

@@ -0,0 +1 @@
+CREATE EXTENSION pg_stat_statements;

data/test/helper.rb

@@ -16,4 +16,4 @@ Test::Unit::TestCase.extend(Fluent::Test::Helpers)
 require 'fluent/plugin/filter_postgresql_slowlog'
 require 'fluent/plugin/filter_postgresql_redactor'
 require 'fluent/plugin/filter_marginalia'
-require 'fluent/plugin/input_pg_stat_statements'
+require 'fluent/plugin/in_pg_stat_statements'

data/test/plugin/{itest_input_pg_stat_statements.rb → itest_in_pg_stat_statements.rb}

@@ -3,10 +3,11 @@
 require_relative '../helper'
 
 class PgStatStatementsInputIntegrationTest < Test::Unit::TestCase
-  # These items are configured in .gitlab-ci.yml on the postgres service
-  HOST = 'postgres'
-  USERNAME = 'testuser'
-  PASSWORD = 'testpass'
+  # The defaults values work with the configuration in .gitlab-ci.yml on the postgres service
+  # Override with env vars for local development
+  HOST = ENV.fetch('PG_TEST_HOST', 'postgres')
+  USERNAME = ENV.fetch('PG_TEST_USER', 'testuser')
+  PASSWORD = ENV.fetch('PG_TEST_PASSWORD', 'testpass')
 
   def setup
     Fluent::Test.setup
@@ -53,7 +54,7 @@ class PgStatStatementsInputIntegrationTest < Test::Unit::TestCase
   )
 
   def create_driver(config)
-    Fluent::Test::InputTestDriver.new(Fluent::PgStatStatementsInput).configure(config)
+    Fluent::Test::InputTestDriver.new(Fluent::Plugin::PgStatStatementsInput).configure(config)
   end
 
   sub_test_case 'configuration' do

data/test/plugin/{test_input_pg_stat_statements.rb → test_in_pg_stat_statements.rb}

@@ -20,7 +20,7 @@ class PgStatStatementsInputTest < Test::Unit::TestCase
   )
 
   def create_driver
-    Fluent::Test::InputTestDriver.new(Fluent::PgStatStatementsInput).configure(CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::Plugin::PgStatStatementsInput).configure(CONFIG)
   end
 
   sub_test_case 'configuration' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-postgresql-csvlog
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - stanhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,22 +94,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitlab-ci.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
+- example-fluentd.conf
 - fluent-plugin-postgresql-csvlog.gemspec
 - lib/fluent/plugin/filter_marginalia.rb
 - lib/fluent/plugin/filter_postgresql_redactor.rb
 - lib/fluent/plugin/filter_postgresql_slowlog.rb
-- lib/fluent/plugin/input_pg_stat_statements.rb
+- lib/fluent/plugin/in_pg_stat_statements.rb
 - lib/fluent/plugin/parser_multiline_csv.rb
+- sql/create_extension.sql
 - test/helper.rb
-- test/plugin/itest_input_pg_stat_statements.rb
+- test/plugin/itest_in_pg_stat_statements.rb
 - test/plugin/test_filter_marginalia.rb
 - test/plugin/test_filter_postgresql_redactor.rb
 - test/plugin/test_filter_postgresql_slowlog.rb
-- test/plugin/test_input_pg_stat_statements.rb
+- test/plugin/test_in_pg_stat_statements.rb
 homepage: https://gitlab.com/gitlab-org/fluent-plugins/fluent-plugin-postgresql-csvlog
 licenses: []
 metadata: {}
@@ -134,8 +138,8 @@ specification_version: 4
 summary: fluentd plugins to work with PostgreSQL CSV logs
 test_files:
 - test/helper.rb
-- test/plugin/itest_input_pg_stat_statements.rb
+- test/plugin/itest_in_pg_stat_statements.rb
 - test/plugin/test_filter_marginalia.rb
 - test/plugin/test_filter_postgresql_redactor.rb
 - test/plugin/test_filter_postgresql_slowlog.rb
-- test/plugin/test_input_pg_stat_statements.rb
+- test/plugin/test_in_pg_stat_statements.rb