apache_log_report 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45396921f6e594c2b2dcce25320c292c08f4bb35ab7c19dc72fb99cec8520dd4
-  data.tar.gz: 990dacd5e607a0f62a55f7248396ac095f2867f905807f91c3df1f6c06b5def0
+  metadata.gz: 3ad003b9ae4768923ebb253dc937277372ff9adee264d77eb3db103153d8bcb5
+  data.tar.gz: f843e794726853611240ca3267cfed35666e3a04c030a78426bb524a8e40c632
 SHA512:
-  metadata.gz: a1c69d138504939d0c1917c7d9f278fff974fce0c27f82c64fd45b80641070924ea5f63a17b6efb4c64c63ea54f458a8b7d3d3f3e100664c70cdc3488be78950
-  data.tar.gz: a675921834c7551b2b95bf983c08a71f40f94f1f16e2b24d6b4fb10c4be61f9ffd8abb9947f985f0419d1678045758934e448d7e77f4904d806f3c966b8af358
+  metadata.gz: 9a609336d73e83d15dd97939c1e1282ebe73b82d1b8e6d2cf07d2af769d4ad1e93803e825a38549c198d64f5f7e32637dcb6d3dea39eee14711e23b8adde35a0
+  data.tar.gz: 7fecc82af8cbb5debc54542f271855607479d1f142d1a725175afa51acbcc921f8955f4ba444594abc4e2cda4a6baf30421822c5d01e7d07bffcaf68eadbfe1e

data/README.org

@@ -4,21 +4,102 @@
 
 * Introduction
 
+ApacheLogReport generates reports and statistics from Apache web logs
+in the =combined= format.  Written in Ruby, it runs from the command
+line, it is fast, and it can be installed on any system which supports
+Ruby.
+
+ApacheLogReport 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 ApacheLogReport is stored on your computer and owned by
+you (like it should be).
+
+ApacheLogReport is also inspired by static websites generators:
+statistics are generated from the command line and accessed as static
+HTML files.  By generating static resources, ApacheLogReport
+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.  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.
+
+ApacheLogReport reports the following data:
+
+- Visitors, hits, unique visitors, bandwidth used
+- Most accessed HTML pages
+- Most accessed resources  
+- Response statuses
+- referers
+- OS, browsers, and devices
+- Streaks: resources accessed by a given IP over time
+- Potential attacks: access to resources which are not meant to be
+  served by a web server serving static websites
+ 
+Filters from the command line allow to analyze specific periods and
+distinguish traffic generated by self polls and crawlers.
+
+ApacheLogReport generates HTML and SQLite outputs.  Moreover, it can
+also generate reports in Org Mode format, which can be then processed
+to various formats (including LaTeX and HTML).
+
 * Installation
 
+  #+begin_src bash
+  gem install apache_log_report
+  #+end_src
+
 * Usage
 
+  #+begin_src bash :results raw output :wrap example
+  apache_log_report --help
+  #+end_src
+
+  #+RESULTS:
+  #+begin_example
+  Usage: apache_log_report [options] [logfile]
+      -l, --limit=N                    Number of entries to show (defaults to 30)
+      -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
+      -v, --version                    Prints version information
+      -h, --help                       Prints this help
+  This is version 1.1.6
+  #+end_example
+
 * Change Log
 
 See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
 * Todo
 
+** TODO Referers should only include the hostname?
 ** TODO Graphs in HTML output
-** TODO Countries
+** TODO Countries/IP Lookup
+** TODO Light and Dark Theme
+** TODO Embed CSS
+** TODO Declare datatypes in table outputs, so that we can format data
 
 * Compatibility
 
+ApacheLogReport should run on any system on which Ruby runs.
+
+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
+- Org Mode plots data using [[http://gnuplot.info/][Gnuplot]]
 
 * Author and Contributors
 

data/lib/apache_log_report/data_cruncher.rb

@@ -1,17 +1,41 @@
+
 module ApacheLogReport
   module DataCruncher
 
     #
     # take a sqlite3 database and analyze data
     #
+    # @ variables are automatically put in the returned data
+    #
 
     def self.crunch db, options = {}
-      @first_day      = db.execute "SELECT datetime from LogLine order by datetime limit 1"
-      @last_day       = db.execute "SELECT datetime from LogLine order by datetime desc limit 1"
+      first_day_s = db.execute "SELECT datetime from LogLine order by datetime limit 1"
+      last_day_s  = db.execute "SELECT datetime from LogLine order by datetime desc limit 1"
+
+      # make first and last day into dates or nil
+      @first_day = first_day_s.empty? ? nil : Date.parse(first_day_s[0][0])
+      @last_day = last_day_s.empty? ? nil : Date.parse(last_day_s[0][0])
+
+      @total_days = 0
+      if @first_day and @last_day
+        @total_days = (@last_day - @first_day).to_i
+      end
+
       @log_size       = db.execute "SELECT count(datetime) from LogLine"
       @crawlers_size  = db.execute "SELECT count(datetime) from LogLine where bot == 1"
       @selfpolls_size = db.execute "SELECT count(datetime) from LogLine where ip == '::1'"
 
+      @first_day_requested = options[:from_date]
+      @last_day_requested = options[:to_date]
+
+      @first_day_in_analysis = date_intersect options[:from_date], @first_day, :max
+      @last_day_in_analysis = date_intersect options[:to_date], @last_day, :min
+
+      @total_days_in_analysis = 0
+      if @first_day_in_analysis and @last_day_in_analysis
+        @total_days_in_analysis = (@last_day_in_analysis - @first_day_in_analysis).to_i
+      end
+
       #
       # generate the where clause corresponding to the command line options to filter data
       #
@@ -39,12 +63,23 @@ module ApacheLogReport
       END AS size
       EOS
 
+      human_readable_day = <<-EOS
+        case cast (strftime('%w', datetime) as integer)
+          when 0 then 'Sunday'
+          when 1 then 'Monday'
+          when 2 then 'Tuesday'
+          when 3 then 'Wednesday'
+          when 4 then 'Thursday'
+          when 5 then 'Friday'
+          else 'Saturday'
+        end as dow
+      EOS
+
       @total_hits = db.execute "SELECT count(datetime) from LogLine where #{filter}"
       @total_unique_visitors = db.execute "SELECT count(distinct(unique_visitor)) from LogLine where #{filter}"
       @total_size = db.execute "SELECT #{human_readable_size} from LogLine where #{filter}"
-      @total_days = (Date.parse(@last_day[0][0]) - Date.parse(@first_day[0][0])).to_i
 
-      @daily_distribution = db.execute "SELECT date(datetime), count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by date(datetime)"
+      @daily_distribution = db.execute "SELECT date(datetime), #{human_readable_day}, count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by date(datetime)"
       @time_distribution = db.execute "SELECT strftime('%H', datetime), count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by strftime('%H', datetime)"
       @most_requested_pages = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where extension == '.html' and #{filter} group by path order by count(path) desc limit #{options[:limit]}"
       @most_requested_resources = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by path order by count(path) desc limit #{options[:limit]}"
@@ -80,7 +115,20 @@ module ApacheLogReport
       end
       data
     end
-  end
 
+    private
+
+    def self.date_intersect date1, date2, method
+      if date1 and date2
+        [date1, date2].send(method)
+      elsif date1
+        date1
+      else
+        date2
+      end
+    end
+
+
+  end
 end
 

data/lib/apache_log_report/options_parser.rb

@@ -18,11 +18,11 @@ module ApacheLogReport
           args[:limit] = n
         end
 
-        opts.on("-bDATE", "--begin=DATE", DateTime, "Consider entries after or on DATE") do |n|
+        opts.on("-bDATE", "--begin=DATE", Date, "Consider entries after or on DATE") do |n|
           args[:from_date] = n
         end
 
-        opts.on("-eDATE", "--end=DATE", DateTime, "Consider entries before or on DATE") do |n|
+        opts.on("-eDATE", "--end=DATE", Date, "Consider entries before or on DATE") do |n|
           args[:to_date] = n
         end
 

data/lib/apache_log_report/templates/template.html.erb

@@ -11,208 +11,264 @@
   </head>
 
   <body>
-    <section class="container">
-      <h1>Apache Log Analysis: <%= data[:log_file] || "stdin" %></h1>
-
-      <div class="columns">
-        <article class="col-6 column">
-          <h2>Summary</h2>
-
-          <table class="table summary">
-            <tr>
-              <th class="hits">Hits</th>
-              <td class="hits"><%= data[:total_hits][0][0] %></td>
-            </tr>
-            <tr>
-              <th class="unique-visitors">Unique Visitors</th>
-              <td class="unique-visitors"><%= data[:total_unique_visitors][0][0] %></td>
-            </tr>
-            <tr>
-              <th class="tx">Tx</th>
-              <td class="tx"><%= data[:total_size][0][0] %></td>
-            </tr>
-            <tr>
-              <th class="period">Period</th>
-              <td class="period">
-                <%= data[:first_day][0][0] %>
-                --
-                <%= data[:last_day][0][0] %>
-              </td>
-            </tr>
-            <tr>
-              <th class="days">Days </th>
-              <td class="days"><%= data[:total_days] %></td>
-            </tr>
-          </table>
-        </article>
-        <article class="column col-6">
-          <h3> Log Structure</h3>
+    <div class="container">
+      <nav>
+        <ul class="nav">
+          <li class="nav-item active">
+            <a href="#">Navigation</a>
+            <ul class="nav">
+              <% [ "Summary",
+                "Log Structure",
+                "Daily Distribution",
+                "Time Distribution",
+                "Most Requested Pages",
+                "Most Requested Resources",
+                "404 on HTML Files",
+                "404 on other Resources",
+                "Attacks",
+                "Statuses",
+                "Daily Statuses",
+                "Browsers",
+                "Platforms",
+                "Referers",
+                "IPs",
+                "Command Invocation",
+                "Performance"
+              ].each do |item| %>
+                <li class="nav-item">
+                  <a href="#<%= item.downcase.gsub(' ', '-') %>"><%= item %></a>
+                </li>
+              <% end %>
+            </ul>
+          </li>
+        </ul>
+        <p>
+          Generated by<br />
+          <a href="https://www.ict4g.net/gitea/adolfo/apache_log_report">
+            Apache Log Report
+          </a> <br />
+          on <%= DateTime.now.strftime("%Y-%m-%d %H:%M") %>.<br />
+          The lean log analyzer.
+        </p>
+      </nav>
 
-          <table class="table log-structure">
-            <tbody>
+      <section>
+        <h1>Apache Log Analysis: <%= data[:log_file] || "stdin" %></h1>
+
+        <div class="columns">
+          <article class="col-6 column">
+            <h2 id="summary">Summary</h2>
+
+            <table class="table summary">
               <tr>
                 <th>Input file</th>
                 <td><b><%= (data[:log_file] || "stdin") %></b></td>
               </tr>
               <tr>
-                <th>Log size</th>
-                <td><%= data[:log_size][0][0] %></td>
+                <th class="period">Period Analyzed</th>
+                <td class="period">
+                  <%= data[:first_day_in_analysis] %>
+                  --
+                  <%= data[:last_day_in_analysis] %>
+                </td>
               </tr>
               <tr>
-                <th>Self poll entries</th>
-                <td><%= data[:selfpolls_size][0][0] %></td>
+                <th class="days">Days </th>
+                <td class="days"><%= data[:total_days_in_analysis] %></td>
               </tr>
               <tr>
-                <th>Crawlers</th>
-                <td><%= data[:crawlers_size][0][0] %></td>
+                <th class="hits">Hits</th>
+                <td class="hits"><%= data[:total_hits][0][0] %></td>
               </tr>
               <tr>
-                <th>Entries considered</th>
-                <td><%= data[:total_hits][0][0] %></td>
+                <th class="unique-visitors">Unique Visitors</th>
+                <td class="unique-visitors"><%= data[:total_unique_visitors][0][0] %></td>
               </tr>
-            </tbody>
-          </table>
-        </article>
-      </div>
-
-      <% @reports = [
-        { title: "Daily Distribution", header: ["Day", "Hits", "Visits", "Size"], rows: data[:daily_distribution] },
-        { title: "Time Distribution",  header: ["Hour", "Hits", "Visits", "Size"], rows: data[:time_distribution] },
-        { title: "Most Requested Pages", header: ["Path", "Hits", "Visits", "Size"], rows: data[:most_requested_pages] },
-        { title: "Most Requested Resources", header: ["Path", "Hits", "Visits", "Size"], rows: data[:most_requested_resources] },
-        { title: "404 on HTML Files", header: ["Path", "Hits", "Visitors"], rows: data[:missed_pages] },
-        { title: "404 on other Resources", header: ["Path", "Hits", "Visitors"], rows: data[:missed_resources] },
-        { title: "Attacks", header: ["Path", "Hits", "Visitors"], rows: data[:attacks] },
-        { },
-        { title: "Statuses", header: ["Status", "Count"], rows: data[:statuses] },
-        { title: "Daily Statuses", header: ["Status", "2xx", "3xx", "4xx"], rows: data[:statuses_by_day] },
-        { title: "Browsers", header: ["Browser", "Hits", "Visitors", "Size"], rows: data[:browsers] },
-        { title: "Platforms", header: ["Platform", "Hits", "Visitors", "Size"], rows: data[:platforms] },
-        { title: "Referers", header: ["Referers", "Hits", "Visitors", "Size"], rows: data[:referers], col: "col-12" },
-        { title: "IPs", header: ["IPs", "Hits", "Visitors", "Size"], rows: data[:ips] },
-        { },
-      ]
-      %>
-      <div class="columns">
-        <% @reports.each do |report| %>
-          <div class="column <%= report[:col] || "col-6" %>">
-            <article>
-              <% if report[:title] != nil %>
-                <h2><%= report[:title] %></h2>
-                <%= render "output_table", report %>
-              <% end %>
-            </article>
-          </div>
-        <% end %>
-      </div>
-
-      <article>
-        <h2>Streaks</h2>
-
-        <table class="table streaks">
-          <thead>
-            <tr>
-              <th>IP</th>
-              <th>Day and URL</th>
-            </tr>
-          </thead>
-          <tbody>
-            <% data[:streaks].group_by(&:first).each do |ip, date_urls| %>
               <tr>
-                <td class="ip"><%= ip %></td>
-                <td class="streaks">
-                  <% date_urls.group_by(&:first).each do |date, urls| %>
-                    <% urls.each do |url| %>
-                      <b><%= url[1] %>:</b> <%= url[2] %> <br />
-                    <% end %>
-                  <% end %>
-                </td>
+                <th class="tx">Tx</th>
+                <td class="tx"><%= data[:total_size][0][0] %></td>
               </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </article>
-
-      <div class="columns">
-        <div class="column col-6">
-          <article>
-            <h2>Command Invocation</h2>
+            </table>
+          </article>
+          <article class="column col-6">
+            <h2 id="log-structure">Log Structure</h2>
 
-            <table class="table command-invocation">
+            <table class="table log-structure">
               <tbody>
-                <tr>
-                  <th>CLI Command</th>
-                  <td><pre><%= data[:command] %></pre></td>
-                </tr>
                 <tr>
                   <th>Input file</th>
-                  <td><code><%= (data[:log_file] || "stdin") %></code></td>
+                  <td><b><%= (data[:log_file] || "stdin") %></b></td>
                 </tr>
                 <tr>
-                  <th>Ignore crawlers</th>
-                  <td><code><%= options[:ignore_crawlers] %></code></td></tr>
+                  <th>Period in Log</th>
+                  <td><%= data[:first_day] %> -- <%= data[:last_day] %></td>
+                </tr>
                 <tr>
-                  <th>Only crawlers</th>
-                  <td><code><%= options[:only_crawlers] %></code></td>
+                  <th>Total days</th>
+                  <td><%= data[:total_days] %></td>
                 </tr>
                 <tr>
-                  <th>No selfpoll</th>
-                  <td><code><%= options[:no_selfpoll] %></code></td>
+                  <th>Log size</th>
+                  <td><%= data[:log_size][0][0] %></td>
                 </tr>
                 <tr>
-                  <th>Filter by date</th>
-                  <td>
-                    <code><%= (options[:from_date] != nil or options[:to_date] != nil) %></code>
-                  </td>
+                  <th>Self poll entries</th>
+                  <td><%= data[:selfpolls_size][0][0] %></td>
                 </tr>
                 <tr>
-                  <th>Prefix</th>
-                  <td><code><%= @prefix %></code></td>
+                  <th>Crawlers</th>
+                  <td><%= data[:crawlers_size][0][0] %></td>
                 </tr>
                 <tr>
-                  <th>Suffix</th>
-                  <td><code><%= @suffix %></code></td>
+                  <th>Entries considered</th>
+                  <td><%= data[:total_hits][0][0] %></td>
                 </tr>
               </tbody>
             </table>
           </article>
         </div>
 
-        <div class="column col-6">
-          <article>
-            <h2> Performance</h2>
+        <% @reports = [
+          { title: "Daily Distribution", header: ["Day", "DOW", "Hits", "Visits", "Size"], rows: data[:daily_distribution] },
+          { title: "Time Distribution",  header: ["Hour", "Hits", "Visits", "Size"], rows: data[:time_distribution] },
+          { title: "Most Requested Pages", header: ["Path", "Hits", "Visits", "Size"], rows: data[:most_requested_pages] },
+          { title: "Most Requested Resources", header: ["Path", "Hits", "Visits", "Size"], rows: data[:most_requested_resources] },
+          { title: "404 on HTML Files", header: ["Path", "Hits", "Visitors"], rows: data[:missed_pages] },
+          { title: "404 on other Resources", header: ["Path", "Hits", "Visitors"], rows: data[:missed_resources] },
+          { title: "Attacks", header: ["Path", "Hits", "Visitors"], rows: data[:attacks] },
+          { },
+          { title: "Statuses", header: ["Status", "Count"], rows: data[:statuses] },
+          { title: "Daily Statuses", header: ["Status", "2xx", "3xx", "4xx"], rows: data[:statuses_by_day] },
+          { title: "Browsers", header: ["Browser", "Hits", "Visitors", "Size"], rows: data[:browsers] },
+          { title: "Platforms", header: ["Platform", "Hits", "Visitors", "Size"], rows: data[:platforms] },
+          { title: "Referers", header: ["Referers", "Hits", "Visitors", "Size"], rows: data[:referers], col: "col-12" },
+          { title: "IPs", header: ["IPs", "Hits", "Visitors", "Size"], rows: data[:ips] },
+          { },
+        ]
+        %>
+        <div class="columns">
+          <% @reports.each do |report| %>
+            <div class="column <%= report[:col] || "col-6" %>">
+              <article>
+                <% if report[:title] != nil %>
+                  <h2 id="<%= report[:title].downcase.gsub(/ +/, '-') %>">
+                    <%= report[:title] %>
+                  </h2>
+                  <%= render "output_table", report %>
+                <% end %>
+              </article>
+            </div>
+          <% end %>
+        </div>
 
-            <table class="table performance">
-              <tbody>
-                <tr>
-                  <th>Analysis started at</th>
-                  <td><%= data[:started_at].to_s %></td>
-                </tr>
-                <tr>
-                  <th>Analysis ended at</th>
-                  <td><%= data[:ended_at].to_s %></td>
-                </tr>
-                <tr>
-                  <th>Duration (sec)</th>
-                  <td><%= "%.1f" % data[:duration]  %></td>
-                </tr>
-                <tr>
-                  <th>Duration (min)</th>
-                  <td><%= "%d" % (data[:duration] / 60 ) %></td>
-                </tr>
+        <article>
+          <h2 id="streaks">Streaks</h2>
+
+          <table class="table streaks">
+            <thead>
+              <tr>
+                <th>IP</th>
+                <th>Day and URL</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% data[:streaks].group_by(&:first).each do |ip, date_urls| %>
                 <tr>
-                  <th>Log size</th>
-                  <td><%= data[:log_size][0][0] %></td>
+                  <td class="ip"><%= ip %></td>
+                  <td class="streaks">
+                    <% date_urls.group_by(&:first).each do |date, urls| %>
+                      <% urls.each do |url| %>
+                        <b><%= url[1] %>:</b> <%= url[2] %> <br />
+                      <% end %>
+                    <% end %>
+                  </td>
                 </tr>
-                <tr>
-                  <th>Lines/sec</th>
-                  <td><%= "%.2f" % (data[:log_size][0][0] / data[:duration]) %></td></tr>
-              </tbody>
-            </table>
-          </article>
+              <% end %>
+            </tbody>
+          </table>
+        </article>
+
+        <div class="columns">
+          <div class="column col-6">
+            <article>
+              <h2 id="command-invocation">Command Invocation</h2>
+
+              <table class="table command-invocation">
+                <tbody>
+                  <tr>
+                    <th>CLI Command</th>
+                    <td><code><%= data[:command] %></code></td>
+                  </tr>
+                  <tr>
+                    <th>Input file</th>
+                    <td><code><%= (data[:log_file] || "stdin") %></code></td>
+                  </tr>
+                  <tr>
+                    <th>Ignore crawlers</th>
+                    <td><code><%= options[:ignore_crawlers] %></code></td></tr>
+                  <tr>
+                    <th>Only crawlers</th>
+                    <td><code><%= options[:only_crawlers] %></code></td>
+                  </tr>
+                  <tr>
+                    <th>No selfpoll</th>
+                    <td><code><%= options[:no_selfpoll] %></code></td>
+                  </tr>
+                  <tr>
+                    <th>Filter by date</th>
+                    <td>
+                      <code><%= (options[:from_date] != nil or options[:to_date] != nil) %></code>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>Prefix</th>
+                    <td><code><%= @prefix %></code></td>
+                  </tr>
+                  <tr>
+                    <th>Suffix</th>
+                    <td><code><%= @suffix %></code></td>
+                  </tr>
+                </tbody>
+              </table>
+            </article>
+          </div>
+
+          <div class="column col-6">
+            <article>
+              <h2 id="performance"> Performance</h2>
+
+              <table class="table performance">
+                <tbody>
+                  <tr>
+                    <th>Analysis started at</th>
+                    <td><%= data[:started_at].to_s %></td>
+                  </tr>
+                  <tr>
+                    <th>Analysis ended at</th>
+                    <td><%= data[:ended_at].to_s %></td>
+                  </tr>
+                  <tr>
+                    <th>Duration (sec)</th>
+                    <td><%= "%.1f" % data[:duration]  %></td>
+                  </tr>
+                  <tr>
+                    <th>Duration (min)</th>
+                    <td><%= "%d" % (data[:duration] / 60 ) %></td>
+                  </tr>
+                  <tr>
+                    <th>Log size</th>
+                    <td><%= data[:log_size][0][0] %></td>
+                  </tr>
+                  <tr>
+                    <th>Lines/sec</th>
+                    <td><%= "%.2f" % (data[:log_size][0][0] / data[:duration]) %></td></tr>
+                </tbody>
+              </table>
+            </article>
+          </div>
         </div>
-      </div>
-    </section>
+      </section>
+    </div>
   </body>
 </html>
 

data/lib/apache_log_report/templates/template.org.erb

@@ -10,7 +10,11 @@
 | Hits                | <%= "%10d" % data[:total_hits][0][0] %> |
 | Unique Visitors     | <%= "%10d" % data[:total_unique_visitors][0][0]  %> |
 | Tx                  | <%= "%10s" % data[:total_size][0][0] %> |
-| Days                | <%= "%10d" % data[:total_days][0][0]  %> |
+| Logged Period       | <%= data[:first_day]  %> -- <%= data[:last_day] %> |
+| Days                | <%= "%10d" % data[:total_days]  %> |
+| Period Requested    | <%= data[:first_day_requested] %> -- <%= data[:last_day_requested] %> |
+| Period Analyzed     | <%= data[:first_day_in_analysis] %> -- <%= data[:last_day_in_analysis] %> |
+| Days in Analysis    | <%= data[:total_days_in_analysis] %> |
 
 * Daily Distribution
 

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "1.1.3"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.7
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apache_log-parser
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Generate analytics from an Apache log file.