Commit 1dbf7284 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'influxdb-without-sidekiq' into 'master'

See merge request !2238
parents 10491c38 620e7bb3
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
# lib/support/init.d, which call scripts in bin/ . # lib/support/init.d, which call scripts in bin/ .
# #
web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"} web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
worker: bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -q metrics worker: bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default
# mail_room: bundle exec mail_room -q -c config/mail_room.yml # mail_room: bundle exec mail_room -q -c config/mail_room.yml
...@@ -69,7 +69,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -69,7 +69,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:max_artifacts_size, :max_artifacts_size,
:metrics_enabled, :metrics_enabled,
:metrics_host, :metrics_host,
:metrics_database, :metrics_port,
:metrics_username, :metrics_username,
:metrics_password, :metrics_password,
:metrics_pool_size, :metrics_pool_size,
......
...@@ -171,12 +171,14 @@ ...@@ -171,12 +171,14 @@
.col-sm-10 .col-sm-10
= f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com' = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
.form-group .form-group
= f.label :metrics_database, 'InfluxDB database', class: 'control-label col-sm-2' = f.label :metrics_port, 'InfluxDB port', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
= f.text_field :metrics_database, class: 'form-control', placeholder: 'gitlab' = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
.help-block .help-block
The name of the InfluxDB database to store data in. Users will have to The UDP port to use for connecting to InfluxDB. InfluxDB requires that
create this database manually, GitLab does not do so automatically. your server configuration specifies a database to store data in when
sending messages to this port, without it metrics data will not be
saved.
.form-group .form-group
= f.label :metrics_username, 'InfluxDB username', class: 'control-label col-sm-2' = f.label :metrics_username, 'InfluxDB username', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
......
class MetricsWorker
include Sidekiq::Worker
sidekiq_options queue: :metrics
def perform(metrics)
prepared = prepare_metrics(metrics)
Gitlab::Metrics.pool.with do |connection|
connection.write_points(prepared)
end
end
def prepare_metrics(metrics)
metrics.map do |hash|
new_hash = hash.symbolize_keys
new_hash[:tags].each do |key, value|
if value.blank?
new_hash[:tags].delete(key)
else
new_hash[:tags][key] = escape_value(value)
end
end
new_hash
end
end
def escape_value(value)
value.to_s.gsub('=', '\\=')
end
end
class InfluxdbUdpPortSetting < ActiveRecord::Migration
def change
add_column :application_settings, :metrics_port, :integer, default: 8089
end
end
class InfluxdbRemoteDatabaseSetting < ActiveRecord::Migration
def change
remove_column :application_settings, :metrics_database
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20151228175719) do ActiveRecord::Schema.define(version: 20151229112614) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -54,7 +54,6 @@ ActiveRecord::Schema.define(version: 20151228175719) do ...@@ -54,7 +54,6 @@ ActiveRecord::Schema.define(version: 20151228175719) do
t.integer "two_factor_grace_period", default: 48 t.integer "two_factor_grace_period", default: 48
t.boolean "metrics_enabled", default: false t.boolean "metrics_enabled", default: false
t.string "metrics_host", default: "localhost" t.string "metrics_host", default: "localhost"
t.string "metrics_database", default: "gitlab"
t.string "metrics_username" t.string "metrics_username"
t.string "metrics_password" t.string "metrics_password"
t.integer "metrics_pool_size", default: 16 t.integer "metrics_pool_size", default: 16
...@@ -63,6 +62,7 @@ ActiveRecord::Schema.define(version: 20151228175719) do ...@@ -63,6 +62,7 @@ ActiveRecord::Schema.define(version: 20151228175719) do
t.boolean "recaptcha_enabled", default: false t.boolean "recaptcha_enabled", default: false
t.string "recaptcha_site_key" t.string "recaptcha_site_key"
t.string "recaptcha_private_key" t.string "recaptcha_private_key"
t.integer "metrics_port", default: 8089
end end
create_table "audit_events", force: :cascade do |t| create_table "audit_events", force: :cascade do |t|
......
...@@ -66,6 +66,39 @@ module Gitlab ...@@ -66,6 +66,39 @@ module Gitlab
end end
end end
def self.submit_metrics(metrics)
prepared = prepare_metrics(metrics)
pool.with do |connection|
prepared.each do |metric|
begin
connection.write_points([metric])
rescue StandardError
end
end
end
end
def self.prepare_metrics(metrics)
metrics.map do |hash|
new_hash = hash.symbolize_keys
new_hash[:tags].each do |key, value|
if value.blank?
new_hash[:tags].delete(key)
else
new_hash[:tags][key] = escape_value(value)
end
end
new_hash
end
end
def self.escape_value(value)
value.to_s.gsub('=', '\\=')
end
@hostname = Socket.gethostname @hostname = Socket.gethostname
# When enabled this should be set before being used as the usual pattern # When enabled this should be set before being used as the usual pattern
...@@ -73,11 +106,12 @@ module Gitlab ...@@ -73,11 +106,12 @@ module Gitlab
if enabled? if enabled?
@pool = ConnectionPool.new(size: pool_size, timeout: timeout) do @pool = ConnectionPool.new(size: pool_size, timeout: timeout) do
host = settings[:metrics_host] host = settings[:metrics_host]
db = settings[:metrics_database]
user = settings[:metrics_username] user = settings[:metrics_username]
pw = settings[:metrics_password] pw = settings[:metrics_password]
port = settings[:metrics_port]
InfluxDB::Client.new(db, host: host, username: user, password: pw) InfluxDB::Client.
new(udp: { host: host, port: port }, username: user, password: pw)
end end
end end
end end
......
...@@ -26,7 +26,7 @@ module Gitlab ...@@ -26,7 +26,7 @@ module Gitlab
process_type: Sidekiq.server? ? 'sidekiq' : 'rails' process_type: Sidekiq.server? ? 'sidekiq' : 'rails'
), ),
values: @values, values: @values,
timestamp: @created_at.to_i timestamp: @created_at.to_i * 1_000_000_000
} }
end end
end end
......
...@@ -40,7 +40,7 @@ module Gitlab ...@@ -40,7 +40,7 @@ module Gitlab
sql = sql.delete('"') sql = sql.delete('"')
end end
sql sql.tr("\n", ' ')
end end
end end
end end
......
...@@ -46,7 +46,7 @@ module Gitlab ...@@ -46,7 +46,7 @@ module Gitlab
end end
def flush def flush
MetricsWorker.perform_async(@metrics.map(&:to_hash)) Metrics.submit_metrics(@metrics.map(&:to_hash))
end end
def sample_memory_usage def sample_memory_usage
......
...@@ -5,13 +5,6 @@ module Gitlab ...@@ -5,13 +5,6 @@ module Gitlab
# This middleware is intended to be used as a server-side middleware. # This middleware is intended to be used as a server-side middleware.
class SidekiqMiddleware class SidekiqMiddleware
def call(worker, message, queue) def call(worker, message, queue)
# We don't want to track the MetricsWorker itself as otherwise we'll end
# up in an infinite loop.
if worker.class == MetricsWorker
yield
return
end
trans = Transaction.new trans = Transaction.new
begin begin
......
...@@ -59,7 +59,7 @@ module Gitlab ...@@ -59,7 +59,7 @@ module Gitlab
end end
def submit def submit
MetricsWorker.perform_async(@metrics.map(&:to_hash)) Metrics.submit_metrics(@metrics.map(&:to_hash))
end end
end end
end end
......
...@@ -2,6 +2,12 @@ require 'spec_helper' ...@@ -2,6 +2,12 @@ require 'spec_helper'
describe Gitlab::Metrics::ObfuscatedSQL do describe Gitlab::Metrics::ObfuscatedSQL do
describe '#to_s' do describe '#to_s' do
it 'replaces newlines with a space' do
sql = described_class.new("SELECT x\nFROM y")
expect(sql.to_s).to eq('SELECT x FROM y')
end
describe 'using single values' do describe 'using single values' do
it 'replaces a single integer' do it 'replaces a single integer' do
sql = described_class.new('SELECT x FROM y WHERE a = 10') sql = described_class.new('SELECT x FROM y WHERE a = 10')
......
...@@ -38,7 +38,7 @@ describe Gitlab::Metrics::Sampler do ...@@ -38,7 +38,7 @@ describe Gitlab::Metrics::Sampler do
describe '#flush' do describe '#flush' do
it 'schedules the metrics using Sidekiq' do it 'schedules the metrics using Sidekiq' do
expect(MetricsWorker).to receive(:perform_async). expect(Gitlab::Metrics).to receive(:submit_metrics).
with([an_instance_of(Hash)]) with([an_instance_of(Hash)])
sampler.sample_memory_usage sampler.sample_memory_usage
......
...@@ -11,14 +11,6 @@ describe Gitlab::Metrics::SidekiqMiddleware do ...@@ -11,14 +11,6 @@ describe Gitlab::Metrics::SidekiqMiddleware do
middleware.call(worker, 'test', :test) { nil } middleware.call(worker, 'test', :test) { nil }
end end
it 'does not track jobs of the MetricsWorker' do
worker = MetricsWorker.new
expect(Gitlab::Metrics::Transaction).to_not receive(:new)
middleware.call(worker, 'test', :test) { nil }
end
end end
describe '#tag_worker' do describe '#tag_worker' do
......
...@@ -68,7 +68,7 @@ describe Gitlab::Metrics::Transaction do ...@@ -68,7 +68,7 @@ describe Gitlab::Metrics::Transaction do
it 'submits the metrics to Sidekiq' do it 'submits the metrics to Sidekiq' do
transaction.track_self transaction.track_self
expect(MetricsWorker).to receive(:perform_async). expect(Gitlab::Metrics).to receive(:submit_metrics).
with([an_instance_of(Hash)]) with([an_instance_of(Hash)])
transaction.submit transaction.submit
......
...@@ -33,4 +33,52 @@ describe Gitlab::Metrics do ...@@ -33,4 +33,52 @@ describe Gitlab::Metrics do
expect(file).to eq('spec/lib/gitlab/metrics_spec.rb') expect(file).to eq('spec/lib/gitlab/metrics_spec.rb')
end end
end end
describe '#submit_metrics' do
it 'prepares and writes the metrics to InfluxDB' do
connection = double(:connection)
pool = double(:pool)
expect(pool).to receive(:with).and_yield(connection)
expect(connection).to receive(:write_points).with(an_instance_of(Array))
expect(Gitlab::Metrics).to receive(:pool).and_return(pool)
described_class.submit_metrics([{ 'series' => 'kittens', 'tags' => {} }])
end
end
describe '#prepare_metrics' do
it 'returns a Hash with the keys as Symbols' do
metrics = described_class.
prepare_metrics([{ 'values' => {}, 'tags' => {} }])
expect(metrics).to eq([{ values: {}, tags: {} }])
end
it 'escapes tag values' do
metrics = described_class.prepare_metrics([
{ 'values' => {}, 'tags' => { 'foo' => 'bar=' } }
])
expect(metrics).to eq([{ values: {}, tags: { 'foo' => 'bar\\=' } }])
end
it 'drops empty tags' do
metrics = described_class.prepare_metrics([
{ 'values' => {}, 'tags' => { 'cats' => '', 'dogs' => nil } }
])
expect(metrics).to eq([{ values: {}, tags: {} }])
end
end
describe '#escape_value' do
it 'escapes an equals sign' do
expect(described_class.escape_value('foo=')).to eq('foo\\=')
end
it 'casts values to Strings' do
expect(described_class.escape_value(10)).to eq('10')
end
end
end end
require 'spec_helper'
describe MetricsWorker do
let(:worker) { described_class.new }
describe '#perform' do
it 'prepares and writes the metrics to InfluxDB' do
connection = double(:connection)
pool = double(:pool)
expect(pool).to receive(:with).and_yield(connection)
expect(connection).to receive(:write_points).with(an_instance_of(Array))
expect(Gitlab::Metrics).to receive(:pool).and_return(pool)
worker.perform([{ 'series' => 'kittens', 'tags' => {} }])
end
end
describe '#prepare_metrics' do
it 'returns a Hash with the keys as Symbols' do
metrics = worker.prepare_metrics([{ 'values' => {}, 'tags' => {} }])
expect(metrics).to eq([{ values: {}, tags: {} }])
end
it 'escapes tag values' do
metrics = worker.prepare_metrics([
{ 'values' => {}, 'tags' => { 'foo' => 'bar=' } }
])
expect(metrics).to eq([{ values: {}, tags: { 'foo' => 'bar\\=' } }])
end
it 'drops empty tags' do
metrics = worker.prepare_metrics([
{ 'values' => {}, 'tags' => { 'cats' => '', 'dogs' => nil } }
])
expect(metrics).to eq([{ values: {}, tags: {} }])
end
end
describe '#escape_value' do
it 'escapes an equals sign' do
expect(worker.escape_value('foo=')).to eq('foo\\=')
end
it 'casts values to Strings' do
expect(worker.escape_value(10)).to eq('10')
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment