apache_log_report 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a554ad8352b97f32dd81c004d6b78f1e7d8e2ea284bb7dc7ef18eb3fee7687a
-  data.tar.gz: 0d6e6243eabf89425e174a7ce76948cfd9517fbf3c226a2e77bb746bb43e8223
+  metadata.gz: ca301cb770ac157383315a770b619d746c5381568bfb2b091942a965a702496f
+  data.tar.gz: 7fa3da83dcc3a9baab9c98ac180adadb7dab256ca7800f882f8f33f1457c3071
 SHA512:
-  metadata.gz: 75a8de1b3375eec45a4ffb41cfa37d834c89ec07e92155d31b2e872e5040fb22709f759bd5aa6bbfc5ed5c84852a9b26c6f603019cb2fb43d21a56a0d33f8eaf
-  data.tar.gz: baa9f268e1e7dcdb72463bf4b4aac1d585524b3ba7db2da1408259f8d54f59424003094372b491791b2788f9f7b3de68a8d1cec8919cd1991ccb5c856677b94c
+  metadata.gz: be85ba24ecf36635f055465c5f131054d29032e47b9780031973274a1ebdf579ea30c816eac16f697f83c7a523bd3fe568e653167b8c1420018c160d37f789df
+  data.tar.gz: ba0aa6fbf8112bca663fa2b8df6563d87b02be35034a00c42c887a2b3a5556abdfd56a54560e79e65748c37b5319f23887fa167793dd7b30ce13d0b7fbb1a742

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
@@ -125,7 +130,7 @@ module ApacheLogReport
           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]) : ""),
@@ -188,8 +193,8 @@ module ApacheLogReport
     @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]}"
 
@@ -233,6 +238,7 @@ module ApacheLogReport
   def self.emit options = {}, command, log_file, started_at, ended_at, duration
     @prefx = options[:prefix]
     @suffix = options[:suffix]
+    @export = option[:code_export]
     
 <<EOS
 #+TITLE: Apache Log Analysis: #{log_file}
@@ -253,7 +259,7 @@ module ApacheLogReport
 
 #{ 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
@@ -267,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
 
@@ -285,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
 
@@ -293,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
@@ -307,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
 
@@ -345,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
@@ -367,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
 
@@ -396,7 +405,7 @@ data using ($0 + 1. / 4):($4 + 0.5):4 with labels title "" textcolor rgb("#00AA0
 
 #{ 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
@@ -412,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
@@ -433,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.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 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