mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
Add operation label to user metric and move from manager to api
This adds an "operation" label to the user metrics and moves incrementing from the manager to api, so that the user metrics show when resources are allocated, as well as destroyed. Previously, user metrics were only updated upon destroying a resource. I think its better suited to increment the metric as part of the api instead of the pool_manger, because it's expected to do so when a user successfully checks out or deletes a VM, but can be problematic when doing so in the provider since it can clone VMs before actually being checked out by a user.
This commit is contained in:
Jake Spain
parent
3b6073933e
commit
c06cfc28f7
6 changed files with 80 additions and 322 deletions
|
|
@ -1021,14 +1021,6 @@ EOT
|
|||
subject._destroy_vm(vm,pool,provider)
|
||||
end
|
||||
|
||||
it 'should check usage labels' do
|
||||
redis_connection_pool.with do |redis|
|
||||
expect(subject).to receive(:get_vm_usage_labels).with(vm, redis)
|
||||
end
|
||||
|
||||
subject._destroy_vm(vm,pool,provider)
|
||||
end
|
||||
|
||||
it 'should dereference the mutex' do
|
||||
expect(subject).to receive(:dereference_mutex)
|
||||
|
||||
|
|
@ -1070,244 +1062,6 @@ EOT
|
|||
end
|
||||
end
|
||||
|
||||
describe '#get_vm_usage_labels' do
|
||||
|
||||
let(:template) { 'pool1' }
|
||||
let(:user) { 'vmpuser' }
|
||||
let(:vm) { 'vm1' }
|
||||
|
||||
context 'when label evaluation is disabled' do
|
||||
it 'should do nothing' do
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when label evaluation is enabled' do
|
||||
|
||||
before(:each) do
|
||||
config[:config]['usage_stats'] = true
|
||||
end
|
||||
|
||||
context 'when a VM has not been checked out' do
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_ready_vm(template, vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should return' do
|
||||
expect(subject).to receive(:get_vm_usage_labels).and_return(nil)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when a VM has been checked out' do
|
||||
|
||||
context 'without auth' do
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_running_vm(template, vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit a metric' do
|
||||
redis_connection_pool.with do |redis|
|
||||
expect(metrics).to receive(:increment).with("user.unauthenticated.#{template}")
|
||||
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'with auth' do
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_running_vm(template, vm, redis, token, user)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit a metric' do
|
||||
expect(metrics).to receive(:increment).with("user.#{user}.#{template}")
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a user with period in name' do
|
||||
let(:user) { 'test.user'.gsub('.', '_') }
|
||||
let(:metric_string) { "user.#{user}.#{template}" }
|
||||
let(:metric_nodes) { metric_string.split('.') }
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_running_vm(template, vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit a metric with the character replaced' do
|
||||
expect(metrics).to receive(:increment).with(metric_string)
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should include three nodes' do
|
||||
expect(metric_nodes.count).to eq(3)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a jenkins_build_url label' do
|
||||
let(:jenkins_build_url) { 'https://jenkins.example.com/job/enterprise_pe-acceptance-tests_integration-system_pe_full-agent-upgrade_weekend_2018.1.x/LAYOUT=centos6-64mcd-ubuntu1404-32f-64f,LEGACY_AGENT_VERSION=NONE,PLATFORM=NOTUSED,SCM_BRANCH=2018.1.x,UPGRADE_FROM=2018.1.0,UPGRADE_TO_VERSION=NONE,label=beaker/222/' }
|
||||
let(:url_parts) { jenkins_build_url.split('/')[2..-1] }
|
||||
let(:instance) { url_parts[0] }
|
||||
let(:value_stream_parts) { url_parts[2].split('_') }
|
||||
let(:value_stream) { value_stream_parts.shift }
|
||||
let(:branch) { value_stream_parts.pop }
|
||||
let(:project) { value_stream_parts.shift }
|
||||
let(:job_name) { value_stream_parts.join('_') }
|
||||
|
||||
let(:metric_string_1) { "user.#{user}.#{template}" }
|
||||
let(:metric_string_2) { "usage_jenkins_instance.#{instance.gsub('.', '_')}.#{value_stream.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_3) { "usage_branch_project.#{branch.gsub('.', '_')}.#{project.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_4) { "usage_job_component.#{job_name.gsub('.', '_')}.none.#{template}" }
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_tag(vm, 'jenkins_build_url', jenkins_build_url, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit 4 metric withs information from the URL' do
|
||||
expect(metrics).to receive(:increment).with(metric_string_1)
|
||||
expect(metrics).to receive(:increment).with(metric_string_2)
|
||||
expect(metrics).to receive(:increment).with(metric_string_3)
|
||||
expect(metrics).to receive(:increment).with(metric_string_4)
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a jenkins_build_url that contains RMM_COMPONENT_TO_TEST_NAME' do
|
||||
let(:jenkins_build_url) { 'https://jenkins.example.com/job/platform_puppet-agent-extra_puppet-agent-integration-suite_pr/RMM_COMPONENT_TO_TEST_NAME=puppet,SLAVE_LABEL=beaker,TEST_TARGET=redhat7-64a/824/' }
|
||||
let(:url_parts) { jenkins_build_url.split('/')[2..-1] }
|
||||
let(:instance) { url_parts[0].gsub('.', '_') }
|
||||
let(:value_stream_parts) { url_parts[2].split('_') }
|
||||
let(:value_stream) { value_stream_parts.shift }
|
||||
let(:branch) { value_stream_parts.pop }
|
||||
let(:project) { value_stream_parts.shift }
|
||||
let(:job_name) { value_stream_parts.join('_') }
|
||||
let(:build_metadata) { url_parts[3] }
|
||||
let(:build_component) { subject.component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata) }
|
||||
let(:expected_string) { "usage.#{user}.#{instance}.#{value_stream}.#{branch}.#{project}.#{job_name}.#{build_component}.#{template}" }
|
||||
let(:metric_nodes) { expected_string.split('.') }
|
||||
|
||||
let(:metric_string_1) { "user.#{user}.#{template}" }
|
||||
let(:metric_string_2) { "usage_jenkins_instance.#{instance.gsub('.', '_')}.#{value_stream.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_3) { "usage_branch_project.#{branch.gsub('.', '_')}.#{project.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_4) { "usage_job_component.#{job_name.gsub('.', '_')}.#{build_component}.#{template}" }
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_tag(vm, 'jenkins_build_url', jenkins_build_url, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit 4 metrics with information from the URL' do
|
||||
expect(metrics).to receive(:increment).with(metric_string_1)
|
||||
expect(metrics).to receive(:increment).with(metric_string_2)
|
||||
expect(metrics).to receive(:increment).with(metric_string_3)
|
||||
expect(metrics).to receive(:increment).with(metric_string_4)
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should contain exactly nine nodes' do
|
||||
expect(metric_nodes.count).to eq(9)
|
||||
end
|
||||
|
||||
context 'when there is no matrix job information' do
|
||||
|
||||
let(:jenkins_build_url) { 'https://jenkins.example.com/job/platform_puppet-agent-extra_puppet-agent-integration-suite_pr/824/' }
|
||||
let(:url_parts) { jenkins_build_url.split('/')[2..-1] }
|
||||
let(:instance) { url_parts[0].gsub('.', '_') }
|
||||
let(:value_stream_parts) { url_parts[2].split('_') }
|
||||
let(:value_stream) { value_stream_parts.shift }
|
||||
let(:branch) { value_stream_parts.pop }
|
||||
let(:project) { value_stream_parts.shift }
|
||||
let(:job_name) { value_stream_parts.join('_') }
|
||||
|
||||
let(:metric_string_1) { "user.#{user}.#{template}" }
|
||||
let(:metric_string_2) { "usage_jenkins_instance.#{instance.gsub('.', '_')}.#{value_stream.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_3) { "usage_branch_project.#{branch.gsub('.', '_')}.#{project.gsub('.', '_')}.#{template}" }
|
||||
let(:metric_string_4) { "usage_job_component.#{job_name.gsub('.', '_')}.none.#{template}" }
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_tag(vm, 'jenkins_build_url', jenkins_build_url, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit 4 metrics with information from the URL without a build_component' do
|
||||
expect(metrics).to receive(:increment).with(metric_string_1)
|
||||
expect(metrics).to receive(:increment).with(metric_string_2)
|
||||
expect(metrics).to receive(:increment).with(metric_string_3)
|
||||
expect(metrics).to receive(:increment).with(metric_string_4)
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
context 'with a litmus job' do
|
||||
let(:jenkins_build_url) { 'https://litmus_manual' }
|
||||
|
||||
let(:metric_string_1) { "user.#{user}.#{template}" }
|
||||
let(:metric_string_2) { "usage_litmus.#{user}.#{template}" }
|
||||
|
||||
before(:each) do
|
||||
redis_connection_pool.with do |redis|
|
||||
create_tag(vm, 'jenkins_build_url', jenkins_build_url, redis)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should emit 2 metrics with the second indicating a litmus job' do
|
||||
expect(metrics).to receive(:increment).with(metric_string_1)
|
||||
expect(metrics).to receive(:increment).with(metric_string_2)
|
||||
expect(metrics).not_to receive(:increment)
|
||||
|
||||
redis_connection_pool.with do |redis|
|
||||
subject.get_vm_usage_labels(vm, redis)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#component_to_test' do
|
||||
let(:matching_key) { 'LABEL_ONE' }
|
||||
let(:matching_value) { 'test' }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue