X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..f9a223297545b98090c533f10991d60334087fcb:/cookbooks/munin/files/default/plugins/api_calls_ diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_ index f56fa4831..689f5120c 100755 --- a/cookbooks/munin/files/default/plugins/api_calls_ +++ b/cookbooks/munin/files/default/plugins/api_calls_ @@ -32,13 +32,13 @@ def categorise_uri(line) uri = line.split(" ")[1] case uri - when /api\/0\.6\/map/ then :map - when /api\/0\.6\/changeset\/[0-9]*\/upload/ then :upload - when /api\/0\.6\/amf/ then :amf - when /api\/0\.6\/(node|way|relation)\/[0-9]*\/history/ then :history - when /api\/0\.6\/(node|way|relation)\/[0-9]*\/full/ then :full - when /api\/0\.6\/trackpoints/ then :trkpts - when /api\/0\.6\// then :other + 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 @@ -54,7 +54,7 @@ if ARGV[0] == 'config' else counts = uris_from_status(server) .collect { |x| categorise_uri(x) } - .each_with_object(Hash.new) do |h, e| + .each_with_object({}) do |h, e| if h.key? e h[e] += 1 else