log_sense 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d382278406ac700a6abbf157ad5284e2b7b8e5b27b3957e83bf4bd129c0365af
-  data.tar.gz: c71a914a8636b4f9e4b549ee0cb667e9154fffd0fc67f3cda0d482e6c3627012
+  metadata.gz: f9d29ac7d799d22088daaf7c0c5598030ab6c3290ef6e4dc2d81dc2b72e5209e
+  data.tar.gz: 1fc1f04bdca1d271036fdfdbfa0b6160396bf12bdf303c9e3819375aaadf2b6f
 SHA512:
-  metadata.gz: 9f3c1b4cbe8aa9cafbc1c4af8acf72a78c981f4180e0d777f6eac2eb68f641eab65339790443000f6b0ecf08fd5bd24b42d64ddf271ba310418218ce858661d0
-  data.tar.gz: ebc6623b9b8a8c337efbb480db5153003b980b0ea4a4834eb0042e8b0a0ac70b51023cc25306165e62eb2332387565ad096a51878b9bd6e5031c3af5839340c0
+  metadata.gz: df42cc6bc0a492926115ac9a2b9bbf9c2ed1c37a447f3e5c66d1d8bcc82fca674580607f6b95ce7588467a913725b67cad981508c2ba9d716d595e1a8d1c69fd
+  data.tar.gz: '091a7e61f5d564f4e3ff1789ef89223339f42da0dd29090de024edcdfcc16e8a9bc0514915434213d806018560e0368fba6f25ef5aaef1a69f9819163f9ed399'

data/CHANGELOG.org

@@ -2,26 +2,13 @@
 #+AUTHOR: Adolfo Villafiorita
 #+STARTUP: showall
 
-* Unreleased
+* Changes in log_sense 1.1.2
+  <2021-12-17 Fri>
 
-This changes are in the repository but not yet released to Rubygems.
+- Added Rails Log HTML output
 
-** New Functions and Changes
+* Changes in log_sense 1.1.1 and earlier
+  <2021-12-17 Fri>
 
-** Fixes
-
-** Documentation
-
-** Code
-
-
-* Version 1.0.0
-
-** New Functions and Changes
-
-** Fixes
-
-** Documentation
-
-** Code
+- In the Git commit messages (not very informative, I am afraid).
 

data/README.org

@@ -14,21 +14,15 @@ and [[https://umami.is/][Umami]], focusing on privacy and data-ownership: the da
 generated by LogSense is stored on your computer and owned by
 you (like it should be).
 
-LogSense is also inspired by static websites generators:
-statistics are generated from the command line and accessed as static
-HTML files.  By generating static resources, LogSense
-significantly reduces the attack surface of your webserver and
-installation headaches.
+LogSense is also inspired by *static websites generators*: statistics
+are generated from the command line and accessed as static HTML files.
+By generating static resources, LogSense significantly reduces the
+attack surface of your webserver and installation headaches.
 
 We have, for instance, a cron job running on our servers, generating
 statistics at night.  The generated files are then made available on a
 private area on the web.
 
-Statistics are generated from Apache log formats in the =combined=
-format and from Rails logs.  Reports are tailored, but not limited, to
-web servers serving static websites.  No need to install Java Script
-code on your websites, no cookies installed, no user tracking.
-
 LogSense reports the following data:
 
 - Visitors, hits, unique visitors, bandwidth used
@@ -62,20 +56,29 @@ LogSense generates HTML, txt (Org Mode), and SQLite outputs.
 
   #+RESULTS:
   #+begin_example
-  Usage: apache_log_report [options] [logfile]
-      -l, --limit=N                    Number of entries to show (defaults to 30)
+  Usage: log_sense [options] [logfile]
+          --title=TITLE                Title to use in the report
+      -f, --input-format=FORMAT        Input format (either rails or apache)
+      -i, --input-file=INPUT_FILE      Input file
+      -t, --output-format=FORMAT       Output format: html, org, txt, sqlite. See below for available formats
+      -o, --output-file=OUTPUT_FILE    Output file
       -b, --begin=DATE                 Consider entries after or on DATE
       -e, --end=DATE                   Consider entries before or on DATE
-      -i, --ignore-crawlers            Ignore crawlers
-      -p, --ignore-selfpoll            Ignore apaches self poll entries (from ::1)
-          --only-crawlers              Perform analysis on crawlers only
-      -u, --prefix=PREFIX              Prefix to add to all plots (used to run multiple analyses in the same dir)
-      -w, --suffix=SUFFIX              Suffix to add to all plots (used to run multiple analyses in the same dir)
-      -c, --code-export=WHAT           Control :export directive in Org Mode code blocks (code, results, *both*, none)
-      -f, --format=FORMAT              Output format: html, org, sqlite. Defaults to org mode
+      -l, --limit=N                    Number of entries to show (defaults to 30)
+      -c, --crawlers=POLICY            Decide what to do with crawlers (applies to Apache Logs)
+      -n, --no-selfpolls               Ignore self poll entries (requests from ::1; applies to Apache Logs)
       -v, --version                    Prints version information
       -h, --help                       Prints this help
-  This is version 1.1.6
+
+  This is version 1.1.1
+
+  Output formats
+  apache parsing can produce the following outputs:
+    - sqlite
+    - html
+  rails parsing can produce the following outputs:
+    - sqlite
+    - txt
   #+end_example
 
 * Change Log

data/lib/log_sense/rails_data_cruncher.rb

@@ -26,6 +26,10 @@ module LogSense
       @log_size = db.execute "SELECT count(started_at) from Event"
       @log_size = @log_size[0][0]
 
+      # TODO: I should make the names of events/size/etc uniform betweeen Apache and Rails Logs
+      # SAME AS ABOVE
+      @total_hits = @log_size
+
       # SAME AS ABOVE (but log_size is wrong in the case of Rails
       # logs, since an event takes more than one line)
       @events = db.execute "SELECT count(started_at) from Event"
@@ -88,11 +92,12 @@ module LogSense
 
       @statuses = db.execute "SELECT status, count(status) from Event where #{filter} group by status order by status"
 
+      @by_day_5xx = db.execute "SELECT date(started_at), count(started_at) from Event where substr(status, 1,1) == '5' and #{filter} group by date(started_at)"
       @by_day_4xx = db.execute "SELECT date(started_at), count(started_at) from Event where substr(status, 1,1) == '4' and #{filter} group by date(started_at)"
       @by_day_3xx = db.execute "SELECT date(started_at), count(started_at) from Event where substr(status, 1,1) == '3' and #{filter} group by date(started_at)"
       @by_day_2xx = db.execute "SELECT date(started_at), count(started_at) from Event where substr(status, 1,1) == '2' and #{filter} group by date(started_at)"
 
-      @statuses_by_day = (@by_day_2xx + @by_day_3xx + @by_day_4xx).group_by { |x| x[0] }.to_a.map { |x|
+      @statuses_by_day = (@by_day_2xx + @by_day_3xx + @by_day_4xx + @by_day_5xx).group_by { |x| x[0] }.to_a.map { |x|
         [x[0], x[1].map { |y| y[1] }].flatten
       }
 
@@ -100,8 +105,12 @@ module LogSense
 
       @performance = db.execute "SELECT distinct(controller), count(controller), printf(\"%.2f\", min(duration_total_ms)), printf(\"%.2f\", avg(duration_total_ms)), printf(\"%.2f\", max(duration_total_ms)) from Event group by controller order by controller"
 
-      @fatal = db.execute "SELECT strftime(\"%Y-%m-%d %H:%M\", started_at), ip, url, log_id FROM Event WHERE exit_status == 'F'"
+      @fatal = db.execute ("SELECT strftime(\"%Y-%m-%d %H:%M\", started_at), ip, url, error.description, event.log_id FROM Event JOIN Error ON event.log_id == error.log_id WHERE exit_status == 'F'") || [[]]
+
+      @internal_server_error = (db.execute "SELECT strftime(\"%Y-%m-%d %H:%M\", started_at), status, ip, url, error.description, event.log_id FROM Event JOIN Error ON event.log_id == error.log_id WHERE status is 500") || [[]]
 
+      @error = (db.execute "SELECT log_id, context, description, count(log_id) from Error GROUP BY description") || [[]]
+      
       data = {}
       self.instance_variables.each do |variable|
         var_as_symbol = variable.to_s[1..-1].to_sym

data/lib/log_sense/rails_log_parser.rb

@@ -24,7 +24,7 @@ module LogSense
          allocations INTEGER,
          comment TEXT
       )'
-      
+
       ins = db.prepare("insert into Event(
          exit_status,
          started_at,
@@ -44,6 +44,22 @@ module LogSense
       )
       values (#{Array.new(15, '?').join(', ')})")
 
+      
+      db.execute 'CREATE TABLE IF NOT EXISTS Error(
+         id INTEGER PRIMARY KEY AUTOINCREMENT,
+         log_id TEXT,
+         context TEXT,
+         description TEXT
+      )'
+
+      ins_error = db.prepare("insert into Error(
+         log_id,
+         context,
+         description
+      )
+      values (?, ?, ?)")
+      
+
       # requests in the log might be interleaved.
       #
       # We use the 'pending' variable to progressively store data
@@ -65,8 +81,14 @@ module LogSense
       # Different requests might be interleaved, of course
       
       File.readlines(filename).each do |line|
-        # We discard LOG_LEVEL != 'I'
-        next if line[0] != 'I' and line[0] != 'F'
+        # I and F for completed requests, [ is for error messages
+        next if line[0] != 'I' and line[0] != 'F' and line[0] != '['
+
+        data = self.match_and_process_error line
+        if data
+          ins_error.execute(data[:log_id], data[:context], data[:description])
+          next
+        end
         
         data = self.match_and_process_start line
         if data
@@ -145,39 +167,6 @@ module LogSense
           end
         end
 
-
-        data = self.match_and_process_completed_no_alloc line
-        if data
-          id = data[:log_id]
-
-          # it might as well be that the first event started before
-          # the log.  With this, we make sure we add only events whose
-          # start was logged and parsed
-          if pending[id]
-            event = data.merge (pending[id] || {})
-
-            ins.execute(
-              event[:exit_status],
-              event[:started_at],
-              event[:ended_at],
-              event[:log_id],
-              event[:ip],
-              "#{DateTime.parse(event[:ended_at]).strftime("%Y-%m-%d")} #{event[:ip]}",
-              event[:url],
-              event[:controller],
-              event[:html_verb],
-              event[:status],
-              event[:duration_total_ms],
-              event[:duration_views_ms],
-              event[:duration_ar_ms],
-              event[:allocations],
-              event[:comment]
-            )
-
-            pending.delete(id)
-          end
-        end
-
       end
       
       db
@@ -189,8 +178,30 @@ module LogSense
     URL = /(?<url>[^"]+)/
     IP = /(?<ip>[0-9.]+)/
     STATUS = /(?<status>[0-9]+)/
+    STATUS_IN_WORDS = /(OK|Unauthorized|Found|Internal Server Error|Bad Request|Method Not Allowed|Request Timeout|Not Implemented|Bad Gateway|Service Unavailable)/
     MSECS = /[0-9.]+/
 
+    # Error Messages
+    # [584cffcc-f1fd-4b5c-bb8b-b89621bd4921] ActionController::RoutingError (No route matches [GET] "/assets/foundation-icons.svg"):
+    # [fd8df8b5-83c9-48b5-a056-e5026e31bd5e] ActionView::Template::Error (undefined method `all_my_ancestor' for nil:NilClass):
+    # [d17ed55c-f5f1-442a-a9d6-3035ab91adf0] ActionView::Template::Error (undefined method `volunteer_for' for #<DonationsController:0x007f4864c564b8>
+    CONTEXT = /(?<context>[^ ]+Error)/
+    ERROR_REGEXP = /^\[#{ID}\] #{CONTEXT} \((?<description>.*)\):/
+
+    def self.match_and_process_error line
+      matchdata = ERROR_REGEXP.match line
+      if matchdata
+        {
+          log_id: matchdata[:id],
+          context: matchdata[:context],
+          description: matchdata[:description]
+        }
+      else
+        nil
+      end
+    end
+
+
     # I, [2021-10-19T08:16:34.343858 #10477]  INFO -- : [67103c0d-455d-4fe8-951e-87e97628cb66] Started GET "/grow/people/471" for 217.77.80.35 at 2021-10-19 08:16:34 +0000
     STARTED_REGEXP = /I, \[#{TIMESTAMP} #[0-9]+\]  INFO -- : \[#{ID}\] Started #{VERB} "#{URL}" for #{IP} at/
 
@@ -209,11 +220,15 @@ module LogSense
       end
     end
 
+    # TODO: Add regexps for the performance data (Views ...). We have three cases (view, active records, allocations), (views, active records), (active records, allocations)
     # I, [2021-10-19T08:16:34.712331 #10477]  INFO -- : [67103c0d-455d-4fe8-951e-87e97628cb66] Completed 200 OK in 367ms (Views: 216.7ms | ActiveRecord: 141.3ms | Allocations: 168792)
-    COMPLETED_REGEXP = /I, \[#{TIMESTAMP} #[0-9]+\]  INFO -- : \[#{ID}\] Completed #{STATUS} [^ ]+ in (?<total>#{MSECS})ms \(Views: (?<views>#{MSECS})ms \| ActiveRecord: (?<arec>#{MSECS})ms \| Allocations: (?<alloc>[0-9]+)\)/
+    # I, [2021-12-09T16:53:52.657727 #2735058]  INFO -- : [0064e403-9eb2-439d-8fe1-a334c86f5532] Completed 200 OK in 13ms (Views: 11.1ms | ActiveRecord: 1.2ms)
+    # I, [2021-12-06T14:28:19.736545 #2804090]  INFO -- : [34091cb5-3e7b-4042-aaf8-6c6510d3f14c] Completed 500 Internal Server Error in 66ms (ActiveRecord: 8.0ms | Allocations: 24885)
+    COMPLETED_REGEXP = /I, \[#{TIMESTAMP} #[0-9]+\]  INFO -- : \[#{ID}\] Completed #{STATUS} #{STATUS_IN_WORDS} in (?<total>#{MSECS})ms \((Views: (?<views>#{MSECS})ms \| )?ActiveRecord: (?<arec>#{MSECS})ms( \| Allocations: (?<alloc>[0-9]+))?\)/
 
     def self.match_and_process_completed line
       matchdata = (COMPLETED_REGEXP.match line)
+      # exit_status = matchdata[:status].to_i == 500 ? "E" : "I"
       if matchdata
         {
           exit_status: "I",
@@ -231,29 +246,6 @@ module LogSense
       end
     end
 
-    # I, [2021-12-09T16:53:52.657727 #2735058]  INFO -- : [0064e403-9eb2-439d-8fe1-a334c86f5532] Completed 200 OK in 13ms (Views: 11.1ms | ActiveRecord: 1.2ms)
-    COMPLETED_NO_ALLOC_REGEXP = /I, \[#{TIMESTAMP} #[0-9]+\]  INFO -- : \[#{ID}\] Completed #{STATUS} [^ ]+ in (?<total>#{MSECS})ms \(Views: (?<views>#{MSECS})ms \| ActiveRecord: (?<arec>#{MSECS})ms\)/
-
-    def self.match_and_process_completed_no_alloc line
-      matchdata = (COMPLETED_NO_ALLOC_REGEXP.match line)
-      if matchdata
-        {
-          exit_status: "I",
-          ended_at: matchdata[:timestamp],
-          log_id: matchdata[:id],
-          status: matchdata[:status],
-          duration_total_ms: matchdata[:total],
-          duration_views_ms: matchdata[:views],
-          duration_ar_ms: matchdata[:arec],
-          allocations: -1,
-          comment: ""
-        }
-      else
-        nil
-      end
-    end
-
-
     # I, [2021-10-19T08:16:34.345162 #10477]  INFO -- : [67103c0d-455d-4fe8-951e-87e97628cb66] Processing by PeopleController#show as HTML
     PROCESSING_REGEXP = /I, \[#{TIMESTAMP} #[0-9]+\]  INFO -- : \[#{ID}\] Processing by (?<controller>[^ ]+) as/
 
@@ -289,7 +281,7 @@ module LogSense
     end
 
     # generate a unique visitor id from an event
-    def unique_visitor_id event
+    def self.unique_visitor_id event
       "#{DateTime.parse(event[:started_at] || event[:ended_at] || "1970-01-01").strftime("%Y-%m-%d")} #{event[:ip]}"
     end
 

data/lib/log_sense/templates/rails.html.erb

@@ -0,0 +1,351 @@
+<!doctype html>
+<html class="no-js" lang="en">
+  <head>
+    <title><%= options[:title] || "Log Sense: #{data[:log_file]}" %></title>
+
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="author" content="Log Sense">
+    <meta name="description" content="Analysis of <%= data[:log_file] %>">
+
+    <link rel="preconnect" href="https://fonts.googleapis.com"> 
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> 
+    <link href="https://fonts.googleapis.com/css2?family=PT+Sans&display=swap" rel="stylesheet">
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/foundicons/3.0.0/foundation-icons.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.4/dist/css/foundation.min.css">
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/zf/dt-1.11.3/datatables.min.css"/>
+
+
+    <script src="https://cdn.jsdelivr.net/npm/vega@5.21.0"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vega-lite@5.2.0"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vega-embed@6.20.2"></script>
+
+    <style>
+     body {
+       font-family: 'PT Sans', sans-serif;
+       font-size: 80%;
+     }
+
+     #offCanvas {
+       color: white;
+       background: #0D0630;
+       border-right: none;
+       box-shadow: none;
+       padding: 0.5rem;
+     }
+     #offCanvas a {
+       color: #E6F9AF;
+     }
+
+     .contents-button {
+       font-size: xx-large;
+     }
+
+     .main-section {
+       margin-left: 45px;
+     }
+
+     h1 {
+       font-size: 1.8rem;
+     }
+
+     h2 {
+       font-size: 1.2rem;
+     }
+
+     th {
+       padding: 0.2rem 1.2rem 0.2rem 0.2rem !important
+     }
+
+     td {
+       padding: 0.2rem 1rem 0.2rem 0.2rem !important;
+     }
+
+     .hits, .visits, .size, .count, .s2xx, .s3xx, .so4xx, .total-hits, .total-visits {
+       text-align: right !important;
+     }
+
+     .card-divider {
+       padding: 0.2rem 0.4rem 0.2rem 0.4rem;
+       background: #D30001;
+       color: white;
+     }
+
+     input, select {
+       font-size: 0.8rem !important;
+       height: 1.5rem !important;
+       padding: 0.2rem 0.4rem 0.2rem 0.4rem !important;
+     }
+
+     .dataTables_info {
+       font-size: small;
+       color: rgb(202, 202, 202);
+     }
+
+     ul.pagination, li.paginate_button {
+       font-size: small;
+       margin-top: 0px !important;
+       margin-bottom: 0px !important;
+       padding-top: 0px !important;
+       padding-bottom: 0px !important;
+     }
+
+     .stats-list {
+       list-style-type: none;
+       clear: left;
+       margin: 0;
+       padding: 0;
+       text-align: center;
+       margin-bottom: 30px;
+     }
+
+     .stats-list .stats-list-positive {
+       color: #228b22;
+     }
+
+     .stats-list .stats-list-negative {
+       color: #a52a2a;
+     }
+
+     .stats-list > li {
+       display: inline-block;
+       margin-right: 10px;
+       padding-right: 10px;
+       border-right: 1px solid #cacaca;
+       text-align: center;
+       font-size: 1.1em;
+       font-weight: bold;
+     }
+
+     .stats-list > li:last-child {
+       border: none;
+       margin: 0;
+       padding: 0;
+     }
+
+     .stats-list > li .stats-list-label {
+       display: block;
+       margin-top: 2px;
+       font-size: 0.9em;
+       font-weight: normal;
+     }
+
+     #streaks-table .ip {
+       vertical-align: top;
+     }
+     #streaks-table .date {
+       font-weight: bold;
+     }
+     #streaks-table .res-title {
+       font-decoration: underline;
+     }
+    </style>
+
+  </head>
+
+  <body>
+    <div class="off-canvas-wrapper">
+      <div class="off-canvas position-left" id="offCanvas" data-off-canvas>
+        <nav>
+          <h2>Navigation</h2>
+          <ul class="no-bullet">
+            <% [
+              "Summary",
+              "Log Structure",
+              "Daily Distribution",
+              "Time Distribution",
+              "Statuses",
+              "Rails Performance",
+              "Fatal Events",
+              "IPs",
+              "Command Invocation",
+              "Performance"
+            ].each do |item| %>
+                  <li class="nav-item">
+                    <a href="#<%= item.downcase.gsub(' ', '-') %>" data-close><%= item %></a>
+              </li>
+            <% end %>
+          </ul>
+
+          <p>
+            Generated by
+            <a href="https://github.com/avillafiorita/log_sense">LogSense</a> <br />
+            on <%= DateTime.now.strftime("%Y-%m-%d %H:%M") %>.<br />
+            <a href='https://db-ip.com'>IP Geolocation by DB-IP</a>
+          </p>
+        </nav>
+      </div>
+      <div class="off-canvas-content grid-container grid-x fluid" data-off-canvas-content>
+        <div data-sticky-container>
+          <div class="sticky" data-sticky data-margin-top="0">
+            <div class="contents-button">
+              <i id="hamburger" class="fi-list" data-toggle="offCanvas"></i>
+            </div>
+          </div>
+        </div>
+
+        <section class="main-section">
+          <h1><%= options[:title] || "Log Sense: #{data[:log_file]}" %></h1>
+
+          <p><b>Input File:</b>  <%= (data[:log_file] || "stdin") %></p>
+
+          <div class="grid-x grid-margin-x">
+            <article class="card small-12 large-6 cell">
+              <div class="card-divider">
+                <h2 id="summary">Summary</h2>
+              </div>
+              <div class="card-section">
+                <%= render "summary.html.erb", data: data %>
+              </div>
+            </article>
+
+            <article class="card cell small-12 large-6">
+              <div class="card-divider">
+                <h2 id="log-structure">Log Structure</h2>
+              </div>
+              <div class="card-section">
+                <%= render "log_structure.html.erb", data: data %>
+              </div>
+            </article>
+          </div>
+
+          <% @reports = [
+            { title: "Daily Distribution",
+              header: ["Day", "DOW", "Hits"],
+              rows: data[:daily_distribution],
+              vega_spec: {
+                "mark": {
+                  "type": "line",
+                  "point": {
+                    "filled": false,
+                    "fill": "white"
+                  }
+                },
+                "encoding": {
+                  "x": {"field": "Day", "type": "temporal"},
+                  "y": {"field": "Hits", "type": "quantitative"}
+                }
+              }
+            },
+            { title: "Time Distribution",
+              header: ["Hour", "Hits"],
+              rows: data[:time_distribution],
+              vega_spec: {
+                "mark": "bar",
+                "encoding": {
+                  "x": {"field": "Hour", "type": "nominal"},
+                  "y": {"field": "Hits", "type": "quantitative"}
+                }
+              }
+            },
+            { title: "Statuses",
+              header: ["Status", "Count"],
+              rows: data[:statuses],
+              vega_spec: {
+                "mark": "bar",
+                "encoding": {
+                  "x": {"field": "Status", "type": "nominal"},
+                  "y": {"field": "Count", "type": "quantitative"}
+                }
+              }
+            },
+            { title: "Rails Performance",
+              header: ['Controller', 'Hits', 'Min', 'Avg', 'Max'],
+              rows: @data[:performance]
+            },
+            { title: "Fatal Events",
+              header: ['Date', 'IP', 'URL', 'Description', 'Log ID'], rows: @data[:fatal],
+              col: "small-12 cell"
+            },
+            { title: "Internal Server Errors",
+              header: ['Date', 'Status', 'IP', 'URL', 'Description', 'Log ID'], rows: @data[:internal_server_error],
+              col: "small-12 cell"
+            },
+            { title: "Errors",
+              header: ['Log ID', 'Context', 'Description', 'Count'], rows: @data[:error],
+              col: "small-12 cell"
+            },
+            { title: "IPs",
+              header: ["IPs", "Hits", "Country"],
+              rows: data[:ips]
+            },
+          ]
+          %>
+          <div class="grid-x grid-margin-x">
+            <% @reports.each_with_index do |report, index| %>
+              <article class="card cell <%= report[:col] || "small-12 large-6" %>" >
+                <div class="card-divider">
+                  <h2>
+                    <%= report[:title] %>
+                  </h2>
+                </div>
+
+                <% if report[:vega_spec] %>
+                  <div id="<%= "plot-#{index}" %>"></div>
+                  <script>
+                   plot_spec_<%= index %> = Object.assign(
+                     <%= report[:vega_spec].to_json %>,
+                     { "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
+                       width: "container",
+                       description: "<%= report[:title] %>",
+                       data: {
+                         values: [
+                           <% report[:rows].each do |row| %>
+                           {
+                             <% report[:header].each_with_index do |h, i| %>
+                             "<%= h %>": <%= (row[i].class == Integer or row[i].class == Float) ? row[i] : "\"#{row[i]}\"" %>,
+                             <% end %>
+                           },
+                           <% end %>
+                         ]
+                       },
+                   });
+                   vegaEmbed('#<%= "plot-#{index}"%>', plot_spec_<%= index %>);
+                  </script>
+                <% end %>
+                  <div class="card-section">
+                  <%= render "output_table.html.erb", report %>
+                </div>
+              </article>
+            <% end %>
+          </div>
+
+          <div class="grid-x grid-margin-x">
+            <div class="cell small-12 large-6">
+              <article>
+                <h2 id="command-invocation">Command Invocation</h2>
+
+                <%= render "command_invocation.html.erb", data: data, options: options %>
+              </article>
+            </div>
+
+            <div class="small-12 large-6 cell">
+              <article>
+                <h2 id="performance"> Performance</h2>
+
+                <%=  render "performance.html.erb", data: data %>
+              </article>
+            </div>
+          </div>
+        </section>
+      </div>
+
+      <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+      <script type="text/javascript" src="js/vendor/what-input.js"></script>
+      <script type="text/javascript" src="https://cdn.datatables.net/v/zf/dt-1.11.3/datatables.min.js"></script>
+      <script src="https://cdn.jsdelivr.net/npm/vega@5"></script>    
+      <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.4/dist/js/foundation.min.js" crossorigin="anonymous"></script>
+      <script>
+       $(document).foundation();
+
+       $(document).ready(function () {
+         $('.data-table').each(function () {
+           $(this).DataTable();
+         });
+       });
+      </script>
+    </div>
+  </body>
+</html>

data/lib/log_sense/templates/rails.txt.erb

@@ -26,14 +26,6 @@ table.align_column(2, :right)
 table
 %>
 
-** IP and Country
-
-<%=
-table = Terminal::Table.new headings: ['IP', 'Events', 'Country'], rows: @data[:ips]
-table.align_column(1, :right)
-table
-%>
-
 ** Rails Performance
 
 <%= table = Terminal::Table.new headings: ['Controller', 'Hits', 'Min', 'Avg', 'Max'], rows: @data[:performance]
@@ -46,7 +38,27 @@ table
 
 ** Fatal Events
 
-<%= table = Terminal::Table.new headings: ['Date', 'IP', 'URL', 'Log ID'], rows: @data[:fatal]
+<%= table = Terminal::Table.new headings: ['Date', 'IP', 'URL', 'Description', 'Log ID'], rows: @data[:fatal]
+table
+%>
+
+** Internal Server Errors
+
+<%= table = Terminal::Table.new headings: ['Date', 'Status', 'IP', 'URL', 'Description', 'Log ID'], rows: @data[:internal_server_error]
+table
+%>
+
+** Errors
+
+<%= table = Terminal::Table.new headings: ['Log ID', 'Context', 'Description', 'Count'], rows: @data[:error]
+table
+%>
+
+** IPs
+
+<%=
+table = Terminal::Table.new headings: ['IP', 'Hits', 'Country'], rows: @data[:ips]
+table.align_column(1, :right)
 table
 %>
 

data/lib/log_sense/version.rb

@@ -1,3 +1,3 @@
 module LogSense
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apache_log-parser
@@ -159,6 +159,7 @@ files:
 - lib/log_sense/templates/_summary.html.erb
 - lib/log_sense/templates/_summary.txt.erb
 - lib/log_sense/templates/apache.html.erb
+- lib/log_sense/templates/rails.html.erb
 - lib/log_sense/templates/rails.txt.erb
 - lib/log_sense/version.rb
 - log_sense.gemspec