HAYASHI Kentaro
null+****@clear*****
Tue Dec 24 23:26:16 JST 2013
HAYASHI Kentaro 2013-12-24 23:26:16 +0900 (Tue, 24 Dec 2013) New Revision: 8df51f8f3941628609f4b0dfc7abcb1e528844e2 https://github.com/groonga/groonga/commit/8df51f8f3941628609f4b0dfc7abcb1e528844e2 Message: munin: support not only GQTP but also HTTP Copied files: data/munin/groonga_gqtp_cpu_load (from data/munin/groonga_cpu_load) data/munin/groonga_gqtp_cpu_time (from data/munin/groonga_cpu_time) data/munin/groonga_gqtp_disk (from data/munin/groonga_disk) data/munin/groonga_gqtp_memory (from data/munin/groonga_memory) data/munin/groonga_gqtp_n_records (from data/munin/groonga_n_records) data/munin/groonga_gqtp_query_performance (from data/munin/groonga_query_performance) data/munin/groonga_gqtp_status (from data/munin/groonga_status) data/munin/groonga_gqtp_throughput (from data/munin/groonga_throughput) Modified files: data/munin/Makefile.am packages/debian/groonga-munin-plugin.conf Renamed files: data/munin/groonga_http_cpu_load (from data/munin/groonga_cpu_load) data/munin/groonga_http_cpu_time (from data/munin/groonga_cpu_time) data/munin/groonga_http_disk (from data/munin/groonga_disk) data/munin/groonga_http_memory (from data/munin/groonga_memory) data/munin/groonga_http_n_records (from data/munin/groonga_n_records) data/munin/groonga_http_query_performance (from data/munin/groonga_query_performance) data/munin/groonga_http_status (from data/munin/groonga_status) data/munin/groonga_http_throughput (from data/munin/groonga_throughput) Modified: data/munin/Makefile.am (+16 -8) =================================================================== --- data/munin/Makefile.am 2013-12-24 22:23:42 +0900 (8fb5382) +++ data/munin/Makefile.am 2013-12-24 23:26:16 +0900 (3ca9c3f) @@ -1,12 +1,20 @@ if INSTALL_MUNIN_PLUGINS munin_pluginsdir = $(datarootdir)/$(PACKAGE)/munin/plugins dist_munin_plugins_SCRIPTS = \ - groonga_cpu_load \ - groonga_cpu_time \ - groonga_status \ - groonga_memory \ - groonga_n_records \ - groonga_query_performance \ - groonga_disk \ - groonga_throughput + groonga_gqtp_cpu_load \ + groonga_gqtp_cpu_time \ + groonga_gqtp_status \ + groonga_gqtp_memory \ + groonga_gqtp_n_records \ + groonga_gqtp_query_performance \ + groonga_gqtp_disk \ + groonga_gqtp_throughput \ + groonga_http_cpu_load \ + groonga_http_cpu_time \ + groonga_http_status \ + groonga_http_memory \ + groonga_http_n_records \ + groonga_http_query_performance \ + groonga_http_disk \ + groonga_http_throughput endif Copied: data/munin/groonga_gqtp_cpu_load (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_cpu_time (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_disk (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_memory (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_n_records (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_query_performance (+0 -0) 100% =================================================================== Copied: data/munin/groonga_gqtp_status (+1 -1) 98% =================================================================== --- data/munin/groonga_status 2013-12-24 22:23:42 +0900 (1a7bb11) +++ data/munin/groonga_gqtp_status 2013-12-24 23:26:16 +0900 (c520822) @@ -13,7 +13,7 @@ end label = ENV["label"] @groonga = ENV["groonga"] || "groonga" @host = ENV["host"] || "localhost" - �� port = ENV["port"] || 10041 + �� port = ENV["port"] || 10043 command = ARGV.shift Copied: data/munin/groonga_gqtp_throughput (+0 -0) 100% =================================================================== Renamed: data/munin/groonga_http_cpu_load (+1 -1) 93% =================================================================== --- data/munin/groonga_cpu_load 2013-12-24 22:23:42 +0900 (49485ec) +++ data/munin/groonga_http_cpu_load 2013-12-24 23:26:16 +0900 (7e8a017) @@ -42,6 +42,6 @@ if [ -z "${pid_file}" ]; then fi groonga_pid=$(cat ${pid_file}) -top_for_groonga=$(top -b -n 1 -p ${groonga_pid} | tail -2 | head -1) +top_for_groonga=$(top -b -n 1 -p ${groonga_pid} | grep ${groonga_pid}) load_in_percent=$(echo ${top_for_groonga} | sed -r -e 's/ +/ /g' | cut -d' ' -f 9) echo "cpu_load.value ${load_in_percent}" Renamed: data/munin/groonga_http_cpu_time (+0 -0) 100% =================================================================== Renamed: data/munin/groonga_http_disk (+0 -0) 100% =================================================================== Renamed: data/munin/groonga_http_memory (+0 -0) 100% =================================================================== Renamed: data/munin/groonga_http_n_records (+2 -8) 87% =================================================================== --- data/munin/groonga_n_records 2013-12-24 22:23:42 +0900 (eb64f54) +++ data/munin/groonga_http_n_records 2013-12-24 23:26:16 +0900 (d4a6aea) @@ -39,13 +39,7 @@ def parse(success, result) end def run(command, *args) - if @path - path = Shellwords.shellescape(@path) - result = `#{@groonga} #{path} #{command} #{args.join(' ')} 2>&1` - else - groonga = "#{@groonga} -p #{@port} -c #{@host}" - result = `#{groonga} #{command} #{args.join(' ')} 2>&1` - end + result = `curl -s "http://#{@host}:#{@port}/d/#{command}?#{args.join('&')}" 2>&1` parse($?.success?, result) end @@ -107,7 +101,7 @@ end table_list.each do |table| name = table["name"] - success, body = run("select", "#{name} --limit 0") + success, body = run("select", "table=#{name}", "limit=0") unless success puts("error: #{body}") exit(false) Renamed: data/munin/groonga_http_query_performance (+0 -0) 100% =================================================================== Renamed: data/munin/groonga_http_status (+1 -2) 93% =================================================================== --- data/munin/groonga_status 2013-12-24 22:23:42 +0900 (1a7bb11) +++ data/munin/groonga_http_status 2013-12-24 23:26:16 +0900 (7c0eee4) @@ -36,8 +36,7 @@ def parse(success, result) end def run(command, *args) - groonga = "#{@groonga} -p #{@port} -c #{@host}" - result = `#{groonga} #{command} #{args.join(' ')} 2>&1` + result = `curl -s "http://#{@host}:#{@port}/d/#{command}" 2>&1` parse($?.success?, result) end Renamed: data/munin/groonga_http_throughput (+2 -2) 96% =================================================================== --- data/munin/groonga_throughput 2013-12-24 22:23:42 +0900 (5efb8ad) +++ data/munin/groonga_http_throughput 2013-12-24 23:26:16 +0900 (46e6d3d) @@ -13,8 +13,8 @@ end label = ENV["label"] @groonga = ENV["groonga"] || "groonga" @host = ENV["host"] || "localhost" - �� port = ENV["port"] || 10041 - �� protocol = ENV["protocol"] || "gqtp" + �� port = ENV["port"] || 10043 + �� protocol = ENV["protocol"] || "http" command = ARGV.shift Modified: packages/debian/groonga-munin-plugin.conf (+10 -2) =================================================================== --- packages/debian/groonga-munin-plugin.conf 2013-12-24 22:23:42 +0900 (f71b8a1) +++ packages/debian/groonga-munin-plugin.conf 2013-12-24 23:26:16 +0900 (a477f81) @@ -2,8 +2,16 @@ user groonga group groonga env.PATH /usr/bin:/bin:/usr/local/bin - env.pid_file /var/run/groonga/groonga.pid env.path /var/lib/groonga/db/db env.host 127.0.0.1 + +[groonga_http_*] + env.port 10041 + env.pid_file /var/run/groonga/groonga-http.pid + env.log_path /var/log/groonga/query-http.log + +[groonga_gqtp_*] env.port 10043 - env.log_path /var/log/groonga/query.log + env.pid_file /var/run/groonga/groonga-gqtp.pid + env.log_path /var/log/groonga/query-gqtp.log + -------------- next part -------------- HTML����������������������������...Download