apache_log_report 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a790d10e531dbe48d5bff951de0e2a3bc47188dcffd03d952597019012e76bed
-  data.tar.gz: 22ff24d2b7a292bd8ef58d0ca49d0f55aa3a12d9400568ba46da5f0280fed3b2
+  metadata.gz: 1355b18ac3bb8e190bcc4e7a7fa5e655c465ffd45a7797895bd2be4d78f54cff
+  data.tar.gz: caa3b8c7795633901db1b5e24ddddd90c49bc47a00dcc0d0e8f2d46bdc4cf162
 SHA512:
-  metadata.gz: abe3454d3679848d92f375f73b18efee2c090d83ba6d069146e3773542dccaa2c924b9b9813bc1311ad71ad82acb970d570a3f08674b4ffca00f6efbc80fde1a
-  data.tar.gz: 60e70449964fb3460eec9a8c0ac6f155959ea697f694a65755e79beb13fe25a2199ebb8b17e01f941c022035791436f062fb909617c0eae785fd28f400a07fa0
+  metadata.gz: a811150ba66b92f6763b9e4657207a964b8873579a6ee08f6d58e011b09690f888f85b4543230291793d0c5ef1623547c4a02aa888c44bda20399c95701d32fa
+  data.tar.gz: b7559878a74638baff3c4281faae927e024f5c6e702f8128c986f3a659f81c8162b4e2ee934c47d3cd007874da0188f083c5b3739cad058a117985baecc403c0

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/exe/apache_log_report

@@ -16,13 +16,12 @@ if @log_file and not File.exist? @log_file
 end
 
 #
-# Parse Log
+# Parse Log and Track Statistics
 #
 
 @started_at = Time.now
 @db = ApacheLogReport.parse @log_file
 ApacheLogReport.analyze_data @db, @options
-
 @ended_at = Time.now
 @duration = @ended_at - @started_at
 

data/lib/apache_log_report.rb

@@ -45,6 +45,10 @@ module ApacheLogReport
         args[:suffix] = n
       end
 
+      opts.on("-c", "--code-export=WHAT", String, "Control :export directive in code blocks (code, results, *both*, none)") do |n|
+        args[:code_export] = n
+      end
+      
       opts.on("-h", "--help", "Prints this help") do
         puts opts
         exit
@@ -58,7 +62,8 @@ module ApacheLogReport
     args[:no_selfpoll] ||= false
     args[:only_crawlers] ||= false
     args[:prefix] ||= ""
-    args[:suffic] ||= ""
+    args[:suffix] ||= ""
+    args[:code_export] ||= "both"
 
     return args
   end
@@ -116,17 +121,16 @@ module ApacheLogReport
 
     parser = ApacheLog::Parser.new(options[:format] || 'combined')
     
-    content.collect { |line|
-      hash = parser.parse line
+    content.each do |line|
+      begin
+        hash = parser.parse line
 
-      if hash != {}
         ua = Browser.new(hash[:user_agent], accept_language: "en-us")
-
         ins.execute(
           hash[:datetime].iso8601,
           hash[:remote_host],
           hash[:user],
-          hash[:remote_host] + hash[:user_agent],
+          hash[:datetime].iso8601 + " " + hash[:remote_host] + " " + hash[:user_agent],
           hash[:request][:method],
           hash[:request][:path],
           (hash[:request][:path] ? File.extname(hash[:request][:path]) : ""),
@@ -140,17 +144,14 @@ module ApacheLogReport
           (ua.platform.name || ""),
           (ua.platform.version || "")
         )
+      rescue
+        STDERR.puts "Apache Log parser error: could not parse #{line}"
       end
-    }
-
+    end
+    
     db
   end
 
-
-def self.reasonable_response_type ext
-  
-end
-
   #
   # take a sqlite3 databae and analyze data
   #
@@ -192,8 +193,8 @@ end
     @missed_resources = db.execute "SELECT path, count(path), count(distinct(unique_visitor)) from LogLine where status == '404' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
 
     @reasonable_requests_exts = [ ".html", ".css", ".js", ".jpg", ".svg", ".png", ".woff", ".xml", ".ttf", ".ico", ".pdf", ".htm", ".txt", ".org" ].map {  |x|
-      "extension == '#{x}'"
-    }.join " or "
+      "extension != '#{x}'"
+    }.join " and "
 
     @attacks = db.execute "SELECT path, count(path), count(distinct(unique_visitor)) from LogLine where status == '404' and #{@filter} and (#{@reasonable_requests_exts}) group by path order by count(path) desc  limit #{options[:limit]}"
 
@@ -235,8 +236,9 @@ end
   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]
     
 <<EOS
 #+TITLE: Apache Log Analysis: #{log_file}
@@ -257,7 +259,7 @@ end
 
 #{ output_table "daily_distribution", ["Day", "Hits", "Visits", "Size"], @daily_distribution }
 
-#+BEGIN_SRC gnuplot :var data = daily_distribution :results output :exports both :file #{@prefix}daily#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = daily_distribution :results output :exports #{@export} :file #{@prefix}daily#{@suffix}.svg
 reset 
 set grid ytics linestyle 0
 set grid xtics linestyle 0
@@ -271,7 +273,8 @@ set xtics rotate by 60 right
 set title "Hits and Visitors"
 set xlabel "Date"
 set ylabel "Hits"
-set ylabel2 "Visits"
+set y2label "Visits"
+set y2tics
 
 set style fill transparent solid 0.2 noborder
 
@@ -289,7 +292,7 @@ data using 1:($2+100):2 with labels notitle textcolor rgb "#0000AA" axes x1y2
 #{ output_table "time_distribution", ["Hour", "Hits", "Visits", "Size"], @time_distribution }
 
 
-#+BEGIN_SRC gnuplot :var data = time_distribution :results output :exports both :file #{@prefix}time#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = time_distribution :results output :exports #{@export} :file #{@prefix}time#{@suffix}.svg
 reset 
 set terminal svg size 1200,800 fname 'Arial' fsize 10
 
@@ -297,7 +300,9 @@ set grid ytics linestyle 0
 
 set title "Hits and Visitors"
 set xlabel "Date"
-set ylabel "Hits and Visits"
+set ylabel "Hits"
+set y2label "Visitors"
+set y2tics
 
 set style fill solid 0.25
 set boxwidth 0.6
@@ -311,7 +316,7 @@ data using ($0 - 0.2):($2 + 10):2 with labels title "" textcolor rgb("#0000AA"),
 data using ($0 + 0.2):($3 + 10):3 with labels title "" textcolor rgb("#AA0000") axes x1y2
 #+END_SRC
 
-#+BEGIN_SRC gnuplot :var data = time_distribution :results output :exports both :file #{@prefix}time-traffic#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = time_distribution :results output :exports #{@export} :file #{@prefix}time-traffic#{@suffix}.svg
 reset 
 set terminal svg size 1200,800 fname 'Arial' fsize 10
 
@@ -349,13 +354,13 @@ data using ($0):($2 + 10):2 with labels title "" textcolor rgb("#00AA00")
 
 * Possible Attacks
 
-#{ output_table "Attacks", ["Path", "Hits", "Visitors"], @attacks }
+#{ output_table "attacks", ["Path", "Hits", "Visitors"], @attacks }
 
 * Statuses
 
 #{ output_table "statuses", ["Status", "Count"], @statuses }
 
-#+BEGIN_SRC gnuplot :var data = statuses :results output :exports both :file #{@prefix}statuses#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = statuses :results output :exports #{@export} :file #{@prefix}statuses#{@suffix}.svg
 reset 
 set grid ytics linestyle 0
 set terminal svg size 1200,800 fname 'Arial' fsize 10
@@ -371,7 +376,7 @@ data using ($0):($2+100):2 with labels textcolor rgb "#0000AA"
 
 #{ output_table "daily_statuses", ["Status", "2xx", "3xx", "4xx"], @statuses_by_day }
 
-#+BEGIN_SRC gnuplot :var data = daily_statuses :results output :exports both :file #{@prefix}daily-statuses#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = daily_statuses :results output :exports #{@export} :file #{@prefix}daily-statuses#{@suffix}.svg
 reset 
 set terminal svg size 1200,800 fname 'Arial' fsize 10
 
@@ -388,19 +393,19 @@ 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
 
 #{ output_table "browsers", ["Browser", "Hits", "Visitors", "Size"], @browsers }
 
-#+BEGIN_SRC gnuplot :var data = browsers :results output :exports both :file #{@prefix}browser#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = browsers :results output :exports #{@export} :file #{@prefix}browser#{@suffix}.svg
 reset 
 set grid ytics linestyle 0
 set terminal svg size 1200,800 fname 'Arial' fsize 10
@@ -416,7 +421,7 @@ data using ($0):($2+100):2 with labels textcolor rgb "#0000AA"
 
 #{ output_table "platforms", ["Platform", "Hits", "Visitors", "Size"], @platforms }
 
-#+BEGIN_SRC gnuplot :var data = platforms :results output :exports both :file #{@prefix}platforms#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = platforms :results output :exports #{@export} :file #{@prefix}platforms#{@suffix}.svg
 reset 
 set grid ytics linestyle 0
 set terminal svg size 1200,800 fname 'Arial' fsize 10
@@ -437,7 +442,7 @@ data using ($0):($2+100):2 with labels textcolor rgb "#0000AA"
 
 #{ output_table "referers", ["Referers", "Hits", "Visitors", "Size"], @referers }
 
-#+BEGIN_SRC gnuplot :var data = referers :results output :exports both :file #{@prefix}referers#{@suffix}.svg
+#+BEGIN_SRC gnuplot :var data = referers :results output :exports #{@export} :file #{@prefix}referers#{@suffix}.svg
 reset 
 set terminal svg size 1200,800 fname 'Arial' fsize 10
 

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "0.9.1"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.6
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apache_log-parser