pgdexter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ad383008579d8dbe952b3f96c827e01aa198c0eb74b3b884188472459b34b8
-  data.tar.gz: b77596742f0e13bb058354edcd901d1e93ec94f61bf6a695957c51fe9c7e41dc
+  metadata.gz: 109808872c6a579e6ce82956d5b2b1da8c66af7c85fae3d5984367e374484eb2
+  data.tar.gz: 6fe0f25f316afd84c287ba2fefe5076846c8a572bf2cbee406843abf632ddb2d
 SHA512:
-  metadata.gz: 1b5f18ce901729f9e22d4222b0ba7ee498be18edb7897221c28069f8beceb65058342c47e9211ce94814d04b380387b95506722b1568a1d44b4d3c8386beeb17
-  data.tar.gz: fa51ae2cde49dfcf9fc181a30bda4941c2ea01f1186fdd6a8cd002059a71c4b3341686cd62f2d1366874c941b92db1a4f74a6abd272baa66063907602e1376c5
+  metadata.gz: c2e5b5d80869c5c90b234af5edbb6d0c0e6118a3dc7191c2d7169209c7ae1505329fb18ea5e3803b045a527dd20b2909a9b2067732dfa030bbce0a931fc88954
+  data.tar.gz: 03d139a0f6ac0e967ad4f98685a6d8e513eab0b2022c7a0f7c6d27eca0da9b6441c30480a19acacf5c5f5f0ec762a7243331c3ee752b071015800a98043cad3b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.1 (2022-10-15)
+
+- Added support for `json` format
+
 ## 0.4.0 (2022-07-27)
 
 - Added support for pg_query 2

data/README.md

@@ -2,7 +2,7 @@
 
 The automatic indexer for Postgres
 
-[Read about how it works](https://ankane.org/introducing-dexter)
+[Read about how it works](https://ankane.org/introducing-dexter) or [watch the talk](https://www.youtube.com/watch?v=Mni_1yTaNbE)
 
 [![Build Status](https://github.com/ankane/dexter/workflows/build/badge.svg?branch=master)](https://github.com/ankane/dexter/actions)
 
@@ -212,7 +212,7 @@ And run it with:
 docker run -ti ankane/dexter <connection-options>
 ```
 
-On Mac and Windows, use `host.docker.internal` as the database hostname for databases on your local machine.
+For databases on the host machine, use `host.docker.internal` as the hostname (on Linux, this requires Docker 20.04 and `--add-host=host.docker.internal:host-gateway`).
 
 ### Homebrew
 

data/lib/dexter/json_log_parser.rb

@@ -0,0 +1,23 @@
+require "json"
+
+module Dexter
+  class JsonLogParser < LogParser
+    FIRST_LINE_REGEX = /\A.+/
+
+    def perform
+      @logfile.each_line do |line|
+        row = JSON.parse(line.chomp)
+        if (m = REGEX.match(row["message"]))
+          # replace first line with match
+          # needed for multiline queries
+          active_line = row["message"].sub(FIRST_LINE_REGEX, m[3])
+
+          add_parameters(active_line, row["detail"]) if row["detail"]
+          process_entry(active_line, m[1].to_f)
+        end
+      end
+    rescue JSON::ParserError => e
+      raise Dexter::Abort, "ERROR: #{e.message}"
+    end
+  end
+end

data/lib/dexter/processor.rb

@@ -13,6 +13,8 @@ module Dexter
           PgStatActivityParser.new(@indexer, @collector)
         elsif options[:input_format] == "csv"
           CsvLogParser.new(logfile, @collector)
+        elsif options[:input_format] == "json"
+          JsonLogParser.new(logfile, @collector)
         elsif options[:input_format] == "sql"
           SqlLogParser.new(logfile, @collector)
         else

data/lib/dexter/version.rb

@@ -1,3 +1,3 @@
 module Dexter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/dexter.rb

@@ -16,6 +16,7 @@ require "dexter/collector"
 require "dexter/indexer"
 require "dexter/log_parser"
 require "dexter/csv_log_parser"
+require "dexter/json_log_parser"
 require "dexter/pg_stat_activity_parser"
 require "dexter/sql_log_parser"
 require "dexter/processor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgdexter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -68,6 +68,7 @@ files:
 - lib/dexter/collector.rb
 - lib/dexter/csv_log_parser.rb
 - lib/dexter/indexer.rb
+- lib/dexter/json_log_parser.rb
 - lib/dexter/log_parser.rb
 - lib/dexter/logging.rb
 - lib/dexter/pg_stat_activity_parser.rb