log_sense 1.2.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d2fbdba26d6fa20cef0fc82c16ecd29eeb135ece6178804a9737d6bc95e838
-  data.tar.gz: 5ac8a548f0f2ac3db060ac4375d4756539a5262b95b9aebc0fc496e6e0003caf
+  metadata.gz: 6498507bb6ae7e6ba5505609421154358790f095bd9cfe5ab912920b2409f7d1
+  data.tar.gz: 0ccb5fa005b8f1e47545bf98ce05273f07bd452d3be54c5bd1a7f124c96558d9
 SHA512:
-  metadata.gz: 0bdecd45808f1257cb7aeaa97d2cf13cf0e62fbde74365c351a2e5440784e99bbfa29271746db66a5dba2bb5e1ae5891aaac4cb982f37ef8072d9e079e3b032a
-  data.tar.gz: d88cca775be4a8828ebaecec757cee87e52338f36784c3a59d6ab8b703328982ecff71233640560f832c4b1f9d7fa4c299a47344d3b79139f518404e02f32380
+  metadata.gz: e12760ccdfc518c7221afa337f4ac1c8a77219cd3ed65510486e3ce945e6129519aa3fe93b05845a5430b9bc52359d70591e0fcbd346e971527af1760c304e5c
+  data.tar.gz: 8d38d8ed84287722b77f51599598b84a2257f9f86d2dd3815faf25dfb7db4ab16e68dbf737c7d005519ac5f9fe1d4b41cd896dfaf862eabb6a7dc4f033d2bb13

data/CHANGELOG.org

@@ -2,13 +2,20 @@
 #+AUTHOR: Adolfo Villafiorita
 #+STARTUP: showall
 
-* Changes in log_sense 1.1.2
-  <2021-12-17 Fri>
+* 1.3.2
 
-- Added Rails Log HTML output
+- [Code] HTML reports now generate JSON data which is shared between
+  DataTable and Vega Light: this should reduce page size and loading
+  time of HTML reports
+- [Doc] Added screenshot and fixed some text
+- [Doc] Fixes requirements on Ruby version
 
-* Changes in log_sense 1.1.1 and earlier
-  <2021-12-17 Fri>
+* 1.3.1
 
-- In the Git commit messages (not very informative, I am afraid).
+- [Code] Strengthened parsing of Apache Logs (added WebDav and other methods)
 
+* 1.3.0
+
+- [Code] Removed dependency from =apache_log-parser= and implemented our own
+  parser for the combined format.
+  

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    log_sense (1.0.7)
-      apache_log-parser
+    log_sense (1.3.1)
       browser
       ipaddr
       iso_country_codes
@@ -12,7 +11,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    apache_log-parser (3.1.2)
     browser (5.3.1)
     byebug (11.1.3)
     ipaddr (1.2.3)

data/README.org

@@ -4,24 +4,10 @@
 
 * Introduction
 
-LogSense generates reports and statistics from Apache web logs in the
-=combined= format and from Rails logs.  Written in Ruby, it runs from
-the command line, it is fast, and it can be installed on any system
-which supports Ruby.
-
-LogSense moves along the lines of tools such as [[https://goaccess.io/][GoAccess]]
-and [[https://umami.is/][Umami]], focusing on privacy and data-ownership: the data
-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.
-
-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.
+LogSense generates reports and statistics from Apache and Ruby on
+Rails logs.  Written in Ruby, it runs from the command line, it is
+fast, and it can be installed on any system with a relatively recent
+version of Ruby.  We tested on Ruby 2.6.9, Ruby 3.0.x and later.
 
 LogSense reports the following data:
 
@@ -40,7 +26,27 @@ LogSense reports the following data:
 Filters from the command line allow to analyze specific periods and
 distinguish traffic generated by self polls and crawlers.
 
-LogSense generates HTML, txt (Org Mode), and SQLite outputs.
+LogSense generates HTML, txt, and SQLite outputs.
+
+And, of course, the compulsory screenshot:
+
+#+ATTR_HTML: :width 80%
+[[file:./apache-screenshot.png]]
+
+* Motivation
+
+LogSense moves along the lines of tools such as [[https://goaccess.io/][GoAccess]] (which
+strongly inspired the development of Log Sense) and [[https://umami.is/][Umami]], focusing on
+*privacy* and *data-ownership*: the data generated by LogSense is
+stored on your computer and owned by you (like it should be)[fn:1].
+
+LogSense is also inspired by *static websites generators*: statistics
+are generated from the command line and accessed as static HTML files.
+LogSense thus 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.
+
 
 * Installation
 
@@ -81,37 +87,48 @@ LogSense generates HTML, txt (Org Mode), and SQLite outputs.
     - txt
   #+end_example
 
+Examples:
+
+#+begin_example sh
+log_sense -f apache -i access.log -t txt > access-data.txt
+log_sense -f rails -i production.log -t html > performance.txt
+#+end_example
+
 * Change Log
 
 See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
 * Compatibility
 
-LogSense should run on any system on which Ruby runs.
+LogSense should run on any system on which a recent version of Ruby
+runs.  We tested it with Ruby 2.6.9 and Ruby 3.x.x.
 
 Concerning the outputs:
 
-- The HTML report uses [[https://picturepan2.github.io/spectre/][Spectre.css]] and (will use) [[https://vega.github.io/vega-lite/][Vega Light]], which
-  are downloaded from a CDN
-- The textual format is compatible with Org Mode and can be further
-  processed to any format Org Mode can be exported to (including HTML
-  and PDF),
+- HTML reports use [[https://get.foundation/][Zurb Foundation]], [[https://www.datatables.net/][Data Tables]], and [[https://vega.github.io/vega-lite/][Vega Light]], which
+  are all downloaded from a CDN
+- The textual format is compatible with [[https://orgmode.org/][Org Mode]] and can be further
+  processed to any format [[https://orgmode.org/][Org Mode]] can be exported to (including HTML
+  and PDF)
 
 * Author and Contributors
 
-[[http://ict4g.net/adolfo][Adolfo Villafiorita]].
+[[https://shair.tech][Shair.Tech]]
 
 * Known Bugs
 
-Some known bugs and an unknown number of unknown bugs.
-
+No known bugs; an unknown number of unknown bugs.
 (See the open issues for the known bugs.)
 
 * License
 
 Distributed under the terms of the [[http://opensource.org/licenses/MIT][MIT License]].
 
-Geolocation is made possible by the DB-IP.com IP to City database, released under
-a CC license.
-
+Geolocation is made possible by the DB-IP.com IP to City database,
+released under a CC license.
 
+[fn:1] There is a small catch: CSS and JavaScript for layout and plots
+are downloaded from a CDN.  Technically, thus, if you generate HTML
+reports and open them, a request is performed and the CDN might keep a
+track (see [[https://en.wikipedia.org/wiki/Content_delivery_network#Security_and_privacy][CDN Security and Privacy on Wikipedia]] for more details).
+Textual reports don't have this issue.

data/lib/log_sense/apache_log_line_parser.rb

@@ -0,0 +1,56 @@
+module LogSense
+  class ApacheLogLineParser
+    # parses a query and makes it into an expression which can be evaluated
+    # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
+    #
+    # %h: IP
+    # %l: ident or -
+    # %u: userid or -
+    # %t: [10/Oct/2000:13:55:36 -0700]
+    #   day = 2*digit
+    #   month = 3*letter
+    #   year = 4*digit
+    #   hour = 2*digit
+    #   minute = 2*digit
+    #   second = 2*digit
+    #   zone = (`+' | `-') 4*digit
+    # %r: GET /apache_pb.gif HTTP/1.0
+    # %{User-agent}: "
+    #
+    # 116.179.32.16 - - [19/Dec/2021:22:35:11 +0100] "GET / HTTP/1.1" 200 135 "-" "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)"
+
+    DAY = /[0-9]{2}/
+    MONTH = /[A-Za-z]{3}/
+    YEAR = /[0-9]{4}/
+    TIMEC = /[0-9]{2}/
+    TIMEZONE = /(\+|-)[0-9]{4}/
+
+    IP = /(?<ip>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|::1)/
+    IDENT = /(?<ident>[^ ]+|-)/
+    USERID = /(?<userid>[^ ]+|-)/
+
+    TIMESTAMP = /(?<date>#{DAY}\/#{MONTH}\/#{YEAR}):(?<time>#{TIMEC}:#{TIMEC}:#{TIMEC} #{TIMEZONE})/
+
+    HTTP_METHODS=/GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH/
+    WEBDAV_METHODS=/COPY|LOCK|MKCOL|MOVE|PROPFIND|PROPPATCH|UNLOCK/
+    OTHER_METHODS=/SEARCH|REPORT/
+    METHOD=/(?<method>#{HTTP_METHODS}|#{WEBDAV_METHODS}|#{OTHER_METHODS})/
+    PROTOCOL=/(?<protocol>HTTP\/[0-9]\.[0-9])/
+    URL=/(?<url>[^ ]+)/
+    REFERER=/(?<referer>[^ ]+)/
+    RETURN_CODE=/(?<status>[1-5][0-9][0-9])/
+    SIZE=/(?<size>[0-9]+|-)/
+
+    USER_AGENT = /(?<user_agent>[^"]+)/
+
+    attr_reader :format
+
+    def initialize 
+      @format = /#{IP} #{IDENT} #{USERID} \[#{TIMESTAMP}\] "#{METHOD} #{URL} #{PROTOCOL}" #{RETURN_CODE} #{SIZE} "#{REFERER}" "#{USER_AGENT}"/
+    end
+
+    def parse line
+      hash = @format.match(line) || raise("Apache LogLine Parser Error: Could not parse #{line}")
+    end
+  end
+end

data/lib/log_sense/apache_log_parser.rb

@@ -1,4 +1,3 @@
-require 'apache_log/parser'
 require 'sqlite3'
 require 'browser'
 
@@ -50,21 +49,20 @@ module LogSense
                 platform_version)
               values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
 
-      parser = ApacheLog::Parser.new(options[:format] || 'combined')
+      parser = ApacheLogLineParser.new
       
       content.each do |line|
         begin
           hash = parser.parse line
-
           ua = Browser.new(hash[:user_agent], accept_language: "en-us")
           ins.execute(
-            hash[:datetime].iso8601,
-            hash[:remote_host],
-            hash[:user],
-            hash[:datetime].strftime("%Y-%m-%d") + " " + hash[:remote_host] + " " + hash[:user_agent],
-            hash[:request][:method],
-            hash[:request][:path],
-            (hash[:request][:path] ? File.extname(hash[:request][:path]) : ""),
+            DateTime.parse("#{hash[:date]}T#{hash[:time]}").iso8601,
+            hash[:ip],
+            hash[:userid],
+            unique_visitor_id(hash),
+            hash[:method],
+            hash[:url],
+            (hash[:url] ? File.extname(hash[:url]) : ""),
             hash[:status],
             hash[:size].to_i,
             hash[:referer],
@@ -75,13 +73,17 @@ module LogSense
             (ua.platform.name || ""),
             (ua.platform.version || "")
           )
-        rescue
-          STDERR.puts "Apache Log parser error: could not parse #{line}"
+        rescue StandardError => e
+          STDERR.puts e.message
         end
       end
       
       db
     end
 
+    def self.unique_visitor_id hash
+      "#{hash[:date]} #{hash[:ip]} #{hash[:user_agent]}"
+    end
+
   end
 end

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

@@ -14,11 +14,11 @@
     <%= data[:log_size] %> <span class="stats-list-label">Total Entries</span>
   </li>
   <li class="stats-list-negative">
-    <%= data[:selfpolls_size] %> <span class="stats-list-label">Self Polls Entries</span>
+    <%= data[:selfpolls_size] %> <span class="stats-list-label">Self Polls</span>
   </li>
   <li class="stats-list-negative">
     <td><%= data[:crawlers_size] %></td>
-    <span class="stats-list-label">Crawlers Entries</span>
+    <span class="stats-list-label">Crawlers</span>
   </li>
 </ul>
 

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

@@ -4,22 +4,26 @@ def slugify string
 end
 %>
 
-<table id="<%= slugify(title || "") %>-table" class="table unstriped data-table <%= slugify(title || "") %>">
+<table id="table-<%= index %>" class="table unstriped">
   <thead>
     <tr>
-      <% header.each do |heading| %>
-        <th class="<%= slugify(heading) %>"><%= heading %></th>
+      <% report[:header].each do |header| %>
+        <th><%= header %></th>
       <% end %>
     </tr>
   </thead>
   <tbody>
-    <% rows.each do |row| %>
-      <tr>
-        <% row.each_with_index do |cell, i| %>
-          <td class="<%= slugify (header[i] || "") %>"><%= cell %></td>
-        <% end %>
-      </tr>
-    <% end %>
   </tbody>
 </table>
-
+<script>
+ $(document).ready(function(){
+   $('#table-<%= index %>').dataTable({
+     data: data_<%= index %>,
+     columns: [
+       <% report[:header].each do |header| %>
+       { data: '<%= header %>', className: '<%= slugify(header) %>' },
+       <% end %>
+     ]
+   });
+ });
+</script>

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

@@ -0,0 +1,12 @@
+<script>
+ /* this is used both by Vega and DataTable */
+ data_<%= index %> = [
+   <% 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 %>
+ ]
+</script>

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

@@ -17,6 +17,8 @@
     <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 type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.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.21.0"></script>
     <script src="https://cdn.jsdelivr.net/npm/vega-lite@5.2.0"></script>
@@ -29,14 +31,14 @@
      }
 
      #offCanvas {
-       color: white;
-       background: #0D0630;
+       color: #DEDEDE;
+       background: #1C1C1C;
        border-right: none;
        box-shadow: none;
        padding: 0.5rem;
      }
      #offCanvas a {
-       color: #E6F9AF;
+       color: #FFFFFF;
      }
 
      .contents-button {
@@ -69,7 +71,7 @@
 
      .card-divider {
        padding: 0.2rem 0.4rem 0.2rem 0.4rem;
-       background: #0d0630;
+       background: #1C1C1C;
        color: white;
      }
 
@@ -224,24 +226,93 @@
               header: ["Day", "DOW", "Hits", "Visits", "Size"],
               rows: data[:daily_distribution],
               vega_spec: {
-                "mark": {
-                  "type": "line",
-                  "point": {
-                    "filled": false,
-                    "fill": "white"
-                  }
-                },
+                "layer": [
+                  {
+                    "mark": {
+                      "type": "line",
+                      "point": {
+                        "filled": false,
+                        "fill": "white"
+                      }
+                    },
+                    "encoding": {
+                      "y": {"field": "Hits", "type": "quantitative"}
+                    }
+                  },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "color": "#3E5772",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"},
+                      "y": {"field": "Hits", "type": "quantitative"}
+                    }
+                  },
+
+                  {
+                    "mark": {
+                      "type": "line",
+                      "color": "#A52A2A",
+                      "point": {
+                        "color": "#A52A2A",
+                        "filled": false,
+                        "fill": "white",
+                      }
+                    },
+                    "encoding": {
+                      "y": {"field": "Visits", "type": "quantitative"}
+                    }
+                  },
+
+                  {
+                    "mark": {
+                      "type": "text",
+                      "color": "#A52A2A",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Visits", "type": "quantitative"},
+                      "y": {"field": "Visits", "type": "quantitative"}
+                    }
+                  },
+                  
+                ],
                 "encoding": {
                   "x": {"field": "Day", "type": "temporal"},
-                  "y": {"field": "Hits", "type": "quantitative"}
                 }
               }
+              
             },
             { title: "Time Distribution",
               header: ["Hour", "Hits", "Visits", "Size"],
               rows: data[:time_distribution],
               vega_spec: {
-                "mark": "bar",
+                "layer": [
+                  {
+                    "mark": "bar"
+                  },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"},
+                      "y": {"field": "Hits", "type": "quantitative"}
+                    }
+                  },
+                ],
                 "encoding": {
                   "x": {"field": "Hour", "type": "nominal"},
                   "y": {"field": "Hits", "type": "quantitative"}
@@ -299,7 +370,21 @@
               header: ["Browser", "Hits", "Visits", "Size"],
               rows: data[:browsers],
               vega_spec: {
-                "mark": "bar",
+                "layer": [
+                  { "mark": "bar" },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"},
+                    }
+                  },
+                ],
                 "encoding": {
                   "x": {"field": "Browser", "type": "nominal"},
                   "y": {"field": "Hits", "type": "quantitative"}
@@ -310,7 +395,21 @@
               header: ["Platform", "Hits", "Visits", "Size"],
               rows: data[:platforms],
               vega_spec: {
-                "mark": "bar",
+                "layer": [
+                  { "mark": "bar" },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"},
+                    }
+                  },
+                ],
                 "encoding": {
                   "x": {"field": "Platform", "type": "nominal"},
                   "y": {"field": "Hits", "type": "quantitative"}
@@ -325,11 +424,11 @@
             <% @reports.each_with_index do |report, index| %>
               <article class="card cell <%= report[:col] || "small-12 large-6" %>" >
                 <div class="card-divider">
-                  <h2>
+                  <h2 id="<%= report[:title].downcase.gsub(' ', '-') %>">
                     <%= report[:title] %>
                   </h2>
                 </div>
-
+                <%= render "report_data.html.erb", report: report, index: index %>
                 <% if report[:vega_spec] %>
                   <div id="<%= "plot-#{index}" %>"></div>
                   <script>
@@ -339,22 +438,15 @@
                        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 %>
-                         ]
+                         values: data_<%= index %>
                        },
                    });
                    vegaEmbed('#<%= "plot-#{index}"%>', plot_spec_<%= index %>);
                   </script>
                 <% end %>
-                  <div class="card-section">
-                  <%= render "output_table.html.erb", report %>
+
+                <div class="card-section">
+                  <%= render "output_table.html.erb", report: report, index: index %>
                 </div>
               </article>
             <% end %>
@@ -472,9 +564,7 @@
         </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>

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

@@ -17,6 +17,8 @@
     <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 type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.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.21.0"></script>
     <script src="https://cdn.jsdelivr.net/npm/vega-lite@5.2.0"></script>
@@ -29,14 +31,14 @@
      }
 
      #offCanvas {
-       color: white;
-       background: #0D0630;
+       color: #CECECE;
+       background: #BD000D;
        border-right: none;
        box-shadow: none;
        padding: 0.5rem;
      }
      #offCanvas a {
-       color: #E6F9AF;
+       color: #FFFFFF;
      }
 
      .contents-button {
@@ -218,24 +220,55 @@
               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"}
-                }
+                },
+                "layer": [
+                  {
+                    "mark": {
+                      "type": "line",
+                      "point": {
+                        "filled": false,
+                        "fill": "white"
+                      }
+                    }
+                  },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "left",
+                      "baseline": "middle",
+                      "dx": 5
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"}
+                    }
+                  }
+                ]
               }
             },
             { title: "Time Distribution",
               header: ["Hour", "Hits"],
               rows: data[:time_distribution],
               vega_spec: {
-                "mark": "bar",
+                "layer": [
+                  {
+                    "mark": "bar",
+                  },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "middle",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -15
+                    },
+                    "encoding": {
+                      "text": {"field": "Hits", "type": "quantitative"}
+                    }
+                  }
+                ],
                 "encoding": {
                   "x": {"field": "Hour", "type": "nominal"},
                   "y": {"field": "Hits", "type": "quantitative"}
@@ -246,7 +279,23 @@
               header: ["Status", "Count"],
               rows: data[:statuses],
               vega_spec: {
-                "mark": "bar",
+                "layer": [
+                  {
+                    "mark": "bar"
+                  },
+                  {
+                    "mark": {
+                      "type": "text",
+                      "align": "left",
+                      "baseline": "top",
+                      "dx": -10,
+                      "yOffset": -20
+                    },
+                    "encoding": {
+                      "text": {"field": "Count", "type": "quantitative"}
+                    }
+                  }
+                ],
                 "encoding": {
                   "x": {"field": "Status", "type": "nominal"},
                   "y": {"field": "Count", "type": "quantitative"}
@@ -257,7 +306,11 @@
               header: ['Controller', 'Hits', 'Min', 'Avg', 'Max'],
               rows: @data[:performance],
               vega_spec: {
-                "mark": "point",
+                "layer": [
+                  {
+                    "mark": "point"
+                  },
+                ],
                 "encoding": {
                   "x": {"field": "Avg", "type": "quantitative"},
                   "y": {"field": "Hits", "type": "quantitative"}
@@ -286,11 +339,11 @@
             <% @reports.each_with_index do |report, index| %>
               <article class="card cell <%= report[:col] || "small-12 large-6" %>" >
                 <div class="card-divider">
-                  <h2>
+                  <h2 id="<%= report[:title].downcase.gsub(' ', '-') %>">
                     <%= report[:title] %>
                   </h2>
                 </div>
-
+                <%= render "report_data.html.erb", report: report, index: index %>
                 <% if report[:vega_spec] %>
                   <div id="<%= "plot-#{index}" %>"></div>
                   <script>
@@ -300,22 +353,14 @@
                        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 %>
-                         ]
+                         values: data_<%= index %>
                        },
                    });
                    vegaEmbed('#<%= "plot-#{index}"%>', plot_spec_<%= index %>);
                   </script>
                 <% end %>
                 <div class="card-section">
-                  <%= render "output_table.html.erb", report %>
+                  <%= render "output_table.html.erb", report: report, index: index %>
                 </div>
               </article>
             <% end %>
@@ -341,9 +386,7 @@
         </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>

data/lib/log_sense/version.rb

@@ -1,3 +1,3 @@
 module LogSense
-  VERSION = "1.2.2"
+  VERSION = "1.3.2"
 end

data/lib/log_sense.rb

@@ -1,5 +1,6 @@
 require 'log_sense/version'
 require 'log_sense/options_parser'
+require 'log_sense/apache_log_line_parser'
 require 'log_sense/apache_log_parser'
 require 'log_sense/apache_data_cruncher'
 require 'log_sense/rails_log_parser'

data/log_sense.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Generate analystics in HTML, txt, and SQLite format from an Apache and Rails log files.}
   spec.homepage      = "https://www.ict4g.net/gitea/adolfo/log_sense"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.9")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "apache_log-parser"
   spec.add_dependency "browser"
   spec.add_dependency "ipaddr"
   spec.add_dependency "iso_country_codes"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: apache_log-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -138,12 +124,14 @@ files:
 - LICENSE.txt
 - README.org
 - Rakefile
+- apache-screenshot.png
 - bin/console
 - bin/setup
 - exe/log_sense
 - ip_locations/dbip-country-lite.sqlite3
 - lib/log_sense.rb
 - lib/log_sense/apache_data_cruncher.rb
+- lib/log_sense/apache_log_line_parser.rb
 - lib/log_sense/apache_log_parser.rb
 - lib/log_sense/emitter.rb
 - lib/log_sense/ip_locator.rb
@@ -156,6 +144,7 @@ files:
 - lib/log_sense/templates/_output_table.html.erb
 - lib/log_sense/templates/_performance.html.erb
 - lib/log_sense/templates/_performance.txt.erb
+- lib/log_sense/templates/_report_data.html.erb
 - lib/log_sense/templates/_summary.html.erb
 - lib/log_sense/templates/_summary.txt.erb
 - lib/log_sense/templates/apache.html.erb
@@ -182,14 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: Generate analytics from an Apache and Rails log file.