From b9f9f8c373873c0629c9acdfd08aa9e8ebb20b6e Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Apr 2015 00:21:57 +0100
Subject: [PATCH] Rework api_calls_num using API statistics and enable it again

---
 .../munin/files/default/plugins/api_calls_num | 66 +++----------------
 cookbooks/web/recipes/frontend.rb             |  8 +--
 2 files changed, 11 insertions(+), 63 deletions(-)

diff --git a/cookbooks/munin/files/default/plugins/api_calls_num b/cookbooks/munin/files/default/plugins/api_calls_num
index c86275e69..7c8ccabcc 100755
--- a/cookbooks/munin/files/default/plugins/api_calls_num
+++ b/cookbooks/munin/files/default/plugins/api_calls_num
@@ -1,31 +1,6 @@
 #!/usr/bin/ruby
 
-require "rubygems"
-require "date"
-gem "home_run", ">= 0"
-require "apache_log_regex"
-
-NUM_LINES = 10000
-
-def uris_from_logs
-  lines = []
-  max_time = nil
-  min_time = nil
-  parser = ApacheLogRegex.new('%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %x')
-  IO.popen("tail -n #{NUM_LINES} /var/log/apache2/access.log").each_line do |line|
-    begin
-      hash = parser.parse(line)
-      uri = hash["%r"]
-      t = DateTime.strptime(hash["%t"], "[%d/%b/%Y:%H:%M:%S %z]")
-      min_time = [min_time, t].compact.min
-      max_time = [max_time, t].compact.max
-      lines << uri
-    rescue ApacheLogRegex::ParseError
-      # nil
-    end
-  end
-  [min_time, max_time, lines]
-end
+require "json"
 
 CALL_TYPES = {
   :map => "Map API calls",
@@ -38,42 +13,21 @@ CALL_TYPES = {
   :other => "Other API calls"
 }
 
-def categorise_uri(line)
-  uri = line.split(" ")[1]
-
-  case uri
-  when %r{api/0\.6/map} then :map
-  when %r{api/0\.6/changeset/[0-9]*/upload} then :upload
-  when %r{api/0\.6/amf} then :amf
-  when %r{api/0\.6/(node|way|relation)/[0-9]*/history} then :history
-  when %r{api/0\.6/(node|way|relation)/[0-9]*/full} then :full
-  when %r{api/0\.6/trackpoints} then :trkpts
-  when %r{api/0\.6/} then :other
-  else :web
-  end
-end
-
 if ARGV[0] == "config"
   puts "graph_title Requests processed"
-  puts "graph_vlabel Number of requests per minute"
+  puts "graph_args --base 1000"
+  puts "graph_vlabel Number of requests per ${graph_period}"
   puts "graph_category api"
-  CALL_TYPES.each { |k, v| puts "#{k}.label #{v}" }
 
-else
-  min_time, max_time, lines = uris_from_logs
-  delta_t = (max_time - min_time).to_f * 24 * 60
-  counts = lines
-           .collect { |x| categorise_uri(x) }
-           .each_with_object({}) do |e, h|
-    if h.key? e
-      h[e] += 1
-    else
-      h[e] = 1
-    end
+  CALL_TYPES.each do |type, label|
+    puts "#{type}.label #{label}"
+    puts "#{type}.type DERIVE"
   end
+else
+  statistics = JSON.parse(File.read("/srv/www.openstreetmap.org/rails/tmp/statistics.json"))
 
   CALL_TYPES.keys.each do |type|
-    count = counts[type] || 0
-    puts "#{type}.value #{count / delta_t}"
+    count = statistics["uri"][type.to_s] || 0
+    puts "#{type}.value #{count}"
   end
 end
diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index f0508f8e8..0a1a73284 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -41,10 +41,6 @@ apache_site "www.openstreetmap.org" do
   variables :secret_key_base => web_passwords["secret_key_base"]
 end
 
-gem_package "hpricot"
-gem_package "home_run"
-gem_package "apachelogregex"
-
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
@@ -52,9 +48,7 @@ template "/etc/logrotate.d/apache2" do
   mode 0644
 end
 
-munin_plugin "api_calls_num" do
-  action :delete
-end
+munin_plugin "api_calls_num"
 
 munin_plugin "api_calls_#{node[:hostname]}" do
   target "api_calls_"
-- 
2.43.2