apache_log_report 0.9.4 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e24660fd5b97e6d07312173f1333c60be9191802d27ca114f7fd5ca8e615559
-  data.tar.gz: f141ec4f8e12eaaee87bdba74ec287d21b0e1266e7ac10364a7dda5f402a0b0b
+  metadata.gz: 0cfcc34ca8741250adff411009618f4a359c4c59606a911a924416650fa352e7
+  data.tar.gz: 4f366f09084266e0112f597aac8be998ff47df8ef50d8fd01b1c26361dc889b9
 SHA512:
-  metadata.gz: 793fbf6d497b55d77947034dcc80b4b62f9c83f181db23a7d34554d87becca1e726aed70957646b7da8ff6c22d6055e32df9b1fe18d4b3f74c4e9b56993de99e
-  data.tar.gz: 4fc2177c75b0a6ea25c6c0c6e7d1166fb28914c1de978d64afd2196e92cb47df65c4901e181f78a432c2786b85d7a6164b4771f40b0a000429d1ba29b938fa65
+  metadata.gz: ddee7b7b3fd56327c3409f0a6de2778b83a0e67d743d300f00259ba314159d1cb62315f388fc0136052895903c7e6df47e08ba59b036db23f0722fc99e5f7b6d
+  data.tar.gz: 0e857dbb34cd66057a401016afcd457c19c995c7aff66a87d4db230569b67a091c19d5f3446377f1a7ee8f8cda3b70ea0b8b4753bd7aea3beadc07810cf2d54b

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    apache_log_report (0.9.7)
+      apache_log-parser
+      browser
+      sqlite3
+      terminal-table
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    apache_log-parser (3.1.2)
+    browser (5.0.0)
+    rake (12.3.3)
+    sqlite3 (1.4.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  apache_log_report!
+  rake (~> 12.0)
+
+BUNDLED WITH
+   2.1.4

data/README.org

@@ -12,6 +12,13 @@
 
 See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
+* Todo
+
+** TODO Version information from command line and in reports
+** TODO Refactor code from one giant class to more manageable chunkes
+** TODO Move performance stats var to class (to isolate vars)
+** TODO Check total number of days (which is not working, now)
+
 * Compatibility
 
 

data/lib/apache_log_report.rb

@@ -5,52 +5,63 @@ module ApacheLogReport
   #
   require 'optparse'
   require 'optparse/date'
+  require 'apache_log_report/version'
 
   def self.options_parse options
     limit = 30
     args = {} 
 
     opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: log-analyzer.rb [options] logfile"
+      opts.banner = "Usage: apache_log_report [options] [logfile]"
 
       opts.on("-lN", "--limit=N", Integer, "Number of entries to show (defaults to #{limit})") do |n|
         args[:limit] = n
       end
 
-      opts.on("-bDATE", "--from-date=DATE", DateTime, "Consider entries after or on DATE") do |n|
+      opts.on("-bDATE", "--begin=DATE", DateTime, "Consider entries after or on DATE") do |n|
         args[:from_date] = n
       end
 
-      opts.on("-eDATE", "--to-date=DATE", DateTime, "Consider entries before or on DATE") do |n|
+      opts.on("-eDATE", "--end=DATE", DateTime, "Consider entries before or on DATE") do |n|
         args[:to_date] = n
       end
 
-      opts.on("-i", "--ignore-crawlers", "Ignore crawlers") do |n|
+      opts.on("-i", "--ignore-crawlers", "Ignore crawlers") do
         args[:ignore_crawlers] = true
       end
 
-      opts.on("-p", "--ignore-selfpoll", "Ignore apaches self poll entries (from ::1)") do |n|
+      opts.on("-p", "--ignore-selfpoll", "Ignore apaches self poll entries (from ::1)") do
         args[:no_selfpoll] = true
       end
 
-      opts.on("-c", "--only-crawlers", "Perform analysis on crawlers only") do |n|
+      opts.on("-c", "--only-crawlers", "Perform analysis on crawlers only") do
         args[:only_crawlers] = true
       end
 
-      opts.on("-u", "--prefix=PREFIX", String, "Prefix to add to all plots (used to run multiple analyses in the same dir)") do |n|
+      opts.on("-uPREFIX", "--prefix=PREFIX", String, "Prefix to add to all plots (used to run multiple analyses in the same dir)") do |n|
         args[:prefix] = n
       end
 
-      opts.on("-w", "--suffix=SUFFIX", String, "Suffix to add to all plots (used to run multiple analyses in the same dir)") do |n|
+      opts.on("-wSUFFIX", "--suffix=SUFFIX", String, "Suffix to add to all plots (used to run multiple analyses in the same dir)") do |n|
         args[:suffix] = n
       end
 
-      opts.on("-c", "--code-export=WHAT", String, "Control :export directive in code blocks (code, results, *both*, none)") do |n|
+      opts.on("-cWHAT", "--code-export=WHAT", String, "Control :export directive in code blocks (code, results, *both*, none)") do |n|
         args[:code_export] = n
       end
       
+      opts.on("-v", "--version", "Prints version information") do
+        puts "apache_log_report version #{ApacheLogReport::VERSION}"
+        puts "Copyright (C) 2020 Adolfo Villafiorita"
+        puts "Distributed under the terms of the MIT license"
+        puts ""
+        puts "Written by Adolfo Villafiorita"
+        exit
+      end
+
       opts.on("-h", "--help", "Prints this help") do
         puts opts
+        puts "This is version #{ApacheLogReport::VERSION}"
         exit
       end
     end
@@ -130,7 +141,7 @@ module ApacheLogReport
           hash[:datetime].iso8601,
           hash[:remote_host],
           hash[:user],
-          hash[:datetime].iso8601 + " " + hash[:remote_host] + " " + hash[:user_agent],
+          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]) : ""),
@@ -175,18 +186,29 @@ module ApacheLogReport
       "true"
     ].compact.join " and "
 
+    # in alternative to sum(size)
+    human_readable_size = <<-EOS
+    CASE 
+    WHEN sum(size) < 1024 THEN sum(size) || ' B' 
+    WHEN sum(size) >=  1024 AND sum(size) < (1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / 1024),2) || ' KB' 
+    WHEN sum(size) >= (1024 * 1024)  AND sum(size) < (1024 * 1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024)),2) || ' MB' 
+    WHEN sum(size) >= (1024 * 1024 * 1024) AND sum(size) < (1024 * 1024 * 1024 *1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024 * 1024)),2) || ' GB' 
+    WHEN sum(size) >= (1024 * 1024 * 1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024 * 1024 * 1024)),2) || ' TB' 
+END AS size
+    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 sum(size) 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)), sum(size) from LogLine  where #{@filter} group by date(datetime)"
+    @daily_distribution = db.execute "SELECT date(datetime), 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)), sum(size) from LogLine  where #{@filter} group by strftime('%H', 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)), sum(size) from LogLine where extension == '.html' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
+    @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)), sum(size) from LogLine  where #{@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]}"
 
     @missed_pages = db.execute "SELECT path, count(path), count(distinct(unique_visitor)) from LogLine where status == '404' and extension == '.html' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
 
@@ -208,13 +230,13 @@ module ApacheLogReport
       [x[0], x[1].map { |y| y[1] }].flatten
     }
 
-    @browsers = db.execute "SELECT browser, count(browser), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by browser order by count(browser) desc"
+    @browsers = db.execute "SELECT browser, count(browser), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by browser order by count(browser) desc"
 
-    @platforms = db.execute "SELECT platform, count(platform), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by platform order by count(platform) desc"
+    @platforms = db.execute "SELECT platform, count(platform), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by platform order by count(platform) desc"
 
-    @ips =  db.execute "SELECT ip, count(ip), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by ip order by count(ip) desc limit #{options[:limit]}"
+    @ips =  db.execute "SELECT ip, count(ip), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by ip order by count(ip) desc limit #{options[:limit]}"
 
-    @referers =  db.execute "SELECT referer, count(referer), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by referer order by count(referer) desc limit #{options[:limit]}"
+    @referers =  db.execute "SELECT referer, count(referer), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by referer order by count(referer) desc limit #{options[:limit]}"
   end
 
 
@@ -236,7 +258,7 @@ module ApacheLogReport
   end
   
   def self.emit options = {}, command, log_file, started_at, ended_at, duration
-    @prefx = options[:prefix]
+    @prefix = options[:prefix]
     @suffix = options[:suffix]
     @export = options[:code_export]
     
@@ -252,7 +274,7 @@ module ApacheLogReport
 
 | Hits                | #{"%10d" % @total_hits[0][0]} |
 | Unique Visitors     | #{"%10d" % @total_unique_visitors[0][0] } |
-| Tx                  | #{"%10d" % @total_size[0][0] } |
+| Tx                  | #{"%10s" % @total_size[0][0]} |
 | Days                | #{"%10d" % @total_days[0][0] } |
 
 * Daily Distribution
@@ -393,12 +415,12 @@ set boxwidth 0.6
 set style data histograms
 set style histogram clustered gap 1
 
-plot data using 2:xtic(1) lc rgb "#CC0000" title "4xx",     \\
+plot data using 2:xtic(1) lc rgb "#00AA00" title "2xx",     \\
 data using 3 lc rgb "#0000CC" title "3xx", \\
-data using 4 lc rgb "#00AA00" title "2xx", \\
-data using ($0 - 1. / 4):($2 + 0.5):2 with labels title "" textcolor rgb("#CC0000"), \\
+data using 4 lc rgb "#AA0000" title "4xx", \\
+data using ($0 - 1. / 4):($2 + 0.5):2 with labels title "" textcolor rgb("#00AA00"), \\
 data using ($0):($3 + 0.5):3 with labels title "" textcolor rgb("#0000CC"), \\
-data using ($0 + 1. / 4):($4 + 0.5):4 with labels title "" textcolor rgb("#00AA00")
+data using ($0 + 1. / 4):($4 + 0.5):4 with labels title "" textcolor rgb("#AA0000")
 #+END_SRC
 
 * Browsers

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "0.9.4"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.9
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apache_log-parser
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - CHANGELOG.org
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.org
 - Rakefile
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Generate a request report in OrgMode format from an Apache log file.