fluent-plugin-postgresql-csvlog 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad3612d27a56001c2eb7f206db3009a8735a68aec57c086f4aec7017a436987
-  data.tar.gz: ff593c807e71fc82465ea8f93844e744c33ef8efa6bee9b92fa1bd56fdb0bf56
+  metadata.gz: e36a1382a11ed800637467180b1af1a28b16f1125ecd5bf2c5b7dd0b4c708223
+  data.tar.gz: 36f9ea068ffd9674c7a0450feffd3ff7344774a88e63fb8934e3871155ca40a6
 SHA512:
-  metadata.gz: f608d3f94c498f29287c82e82ffc4cbc76d2b64777bd0e9f0931ca1391ce14d2cffaf6d3c523e2e1646aaef83aba5657c0a4d56c6dda9fa255a5c616f5c84fe8
-  data.tar.gz: 17405afcba62970d0a39ab0d654e5f883be745262a12e2f17eaad443c49934d35dbb464a0c69e0ffd63ff71ce88f7b799408efa7ec967ee11cc6d70168e08c35
+  metadata.gz: e5fe1bd18ada66464c1c6fa57d3cf31f389aa6831e248095d63e2c6d30b737dd363ce72dcf7b80baf771e93921bada05c7d26267969ab161f862d0dc35cc0e57
+  data.tar.gz: bff45c6bf1911f8106b4dd36248df2b14bd8c8d08f1d3214b95d5930c85c385ccfd1ecd23d2d712df8e044c49f5bad4e543f1b18f4de7ab81ecdd0d9001f831c

data/example-fluentd.conf

@@ -13,6 +13,10 @@
   time_slice_format %Y%m%d%H%M%S
   flush_interval 1s
   utc
+
+  <format>
+    @type json
+  </format>
 </match>
 
 <source>
@@ -23,3 +27,15 @@
   password testpass
   interval 1
 </source>
+
+<match postgres.pg_stat_activity>
+  @type file
+  path /var/log/pg/pg_stat_activity
+  time_slice_format %Y%m%d%H%M%S
+  flush_interval 1s
+  utc
+  <format>
+    @type json
+  </format>
+</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.5.0'
+  s.version     = '0.6.0'
   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/in_pg_stat_statements.rb

@@ -11,7 +11,7 @@ module Fluent::Plugin
   #  'fingerprint' => '8a6e9896bd9048a2',
   #  'query' => 'SELECT * FROM table ORDER BY queryid LIMIT $1',
   #  'query_length' => 58,
-  #  'queryid' => 3239318621761098074
+  #  'queryid' => '3239318621761098074'
   # }
   class PgStatStatementsInput < PollingPostgresInputPlugin
     Fluent::Plugin.register_input('pg_stat_statements', self)
@@ -35,7 +35,7 @@ module Fluent::Plugin
 
       # We record the query_length as it will help in understanding whether unparseable
       # queries are truncated.
-      record = { 'queryid' => row['queryid'], 'query_length' => query&.length }
+      record = { 'queryid' => row['queryid'].to_s, 'query_length' => query&.length }
 
       return record unless query
 

data/test/plugin/itest_in_pg_stat_statements.rb

@@ -98,8 +98,7 @@ class PgStatStatementsInputIntegrationTest < Test::Unit::TestCase
       expected_record = {
         'fingerprint' => '8a6e9896bd9048a2',
         'query' => 'SELECT * FROM pg_stat_statements ORDER BY queryid LIMIT $1',
-        'query_length' => 58,
-        'queryid' => 3_239_318_621_761_098_074
+        'query_length' => 58
       }
       known_statement_event = emits.find do |event|
         record = event[2]
@@ -114,7 +113,8 @@ class PgStatStatementsInputIntegrationTest < Test::Unit::TestCase
       assert_equal 'postgres.pg_stat_statements', tag
       assert_equal expected_record['fingerprint'], record['fingerprint']
       assert_equal expected_record['query_length'], record['query_length']
-      assert_true expected_record.include? 'queryid'
+      assert_true record.include? 'queryid'
+      assert_true record['queryid'].is_a? String
     end
   end
 end

data/test/plugin/test_in_pg_stat_statements.rb

@@ -75,7 +75,7 @@ class PgStatStatementsInputTest < Test::Unit::TestCase
         )
       SQL
 
-      record = d.instance.record_for_row({ 'queryid' => '1234', 'query' => ddl_sql })
+      record = d.instance.record_for_row({ 'queryid' => 1234, 'query' => ddl_sql })
 
       expected = {
         'fingerprint' => 'fa9c9d26757c4f9b',
@@ -88,7 +88,7 @@ class PgStatStatementsInputTest < Test::Unit::TestCase
 
     test 'set command' do
       d = create_driver
-      record = d.instance.record_for_row({ 'queryid' => '1234', 'query' => "SET TIME ZONE 'PST8PDT'" })
+      record = d.instance.record_for_row({ 'queryid' => 1234, 'query' => "SET TIME ZONE 'PST8PDT'" })
 
       expected = {
         'fingerprint' => '23f8d6eb1d3125c3',
@@ -102,7 +102,7 @@ class PgStatStatementsInputTest < Test::Unit::TestCase
 
     test 'unparseable sql' do
       d = create_driver
-      record = d.instance.record_for_row({ 'queryid' => '1234', 'query' => 'SELECT * FROM' })
+      record = d.instance.record_for_row({ 'queryid' => 1234, 'query' => 'SELECT * FROM' })
 
       expected = { 'query_length' => 13, 'query_unparseable' => true, 'queryid' => '1234' }
       assert_equal expected, record

data/test/verify-docker-compose.sh

@@ -5,7 +5,8 @@
 
 cleanup() {
   echo "# removing all logs"
-  rm -rf /var/log/pg/*
+  rm -rf /var/log/pg/pg_stat_statements.*.log
+  rm -rf /var/log/pg/pg_stat_activity.*.log
 }
 
 die() {
@@ -17,6 +18,11 @@ die() {
 cleanup
 echo "# sleeping 10, awaiting logs"
 sleep 10;
-find /var/log/pg/ -name "pg_stat_statements.*.log" || die "No pg_stat_statements files created"
+
+(find /var/log/pg/ -name "pg_stat_statements.*.log" | grep .) || die "No pg_stat_statements files created"
+cat /var/log/pg/pg_stat_statements.*.log | tail -1
+
+(find /var/log/pg/ -name "pg_stat_activity.*.log" | grep .) || die "No pg_stat_activity files created"
+cat /var/log/pg/pg_stat_activity.*.log | tail -1
 
 cleanup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-postgresql-csvlog
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - stanhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd