From ca6833d156ceb57e74b348ad229428ca0337f084 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Tue, 10 Aug 2021 10:55:04 -0400 Subject: [PATCH] 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. --- lib/vmpooler/api/v1.rb | 43 ++++++ lib/vmpooler/metrics/promstats.rb | 30 ++-- lib/vmpooler/pool_manager.rb | 43 ------ spec/unit/pool_manager_spec.rb | 246 ------------------------------ spec/unit/promstats_spec.rb | 35 +++-- vmpooler.yaml.example | 6 +- 6 files changed, 81 insertions(+), 322 deletions(-) diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 3a3c177..69dc664 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -210,6 +210,7 @@ module Vmpooler account_for_starting_vm(vmpool, vmname) vms << [vmpool, vmname, vmtemplate] metrics.increment("checkout.success.#{vmpool}") + update_user_metrics('allocate', vmname) if Vmpooler::API.settings.config[:config]['usage_stats'] else failed = true metrics.increment("checkout.empty.#{requested}") @@ -235,6 +236,47 @@ module Vmpooler result end + def update_user_metrics(operation, vmname) + backend.multi + backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url') + backend.hget("vmpooler__vm__#{vmname}", 'token:user') + backend.hget("vmpooler__vm__#{vmname}", 'template') + jenkins_build_url, user, poolname = backend.exec + + if user + user = user.gsub('.', '_') + else + user = 'unauthenticated' + end + metrics.increment("user.#{user}.#{operation}.#{poolname}") + + if jenkins_build_url + if jenkins_build_url.include? 'litmus' + # Very simple filter for Litmus jobs - just count them coming through for the moment. + metrics.increment("usage_litmus.#{user}.#{operation}.#{poolname}") + return + end + + url_parts = jenkins_build_url.split('/')[2..-1] + jenkins_instance = url_parts[0].gsub('.', '_') + value_stream_parts = url_parts[2].split('_') + value_stream_parts = value_stream_parts.map { |s| s.gsub('.', '_') } + value_stream = value_stream_parts.shift + branch = value_stream_parts.pop + project = value_stream_parts.shift + job_name = value_stream_parts.join('_') + build_metadata_parts = url_parts[3] + component_to_test = component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata_parts) + + metrics.increment("usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{operation}.#{poolname}") + metrics.increment("usage_branch_project.#{branch}.#{project}.#{operation}.#{poolname}") + metrics.increment("usage_job_component.#{job_name}.#{component_to_test}.#{operation}.#{poolname}") + end + rescue StandardError => e + puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}" + raise + end + def update_pool_size(payload) result = { 'ok' => false } @@ -1169,6 +1211,7 @@ module Vmpooler status 200 result['ok'] = true metrics.increment('delete.success') + update_user_metrics('destroy', params[:hostname]) if Vmpooler::API.settings.config[:config]['usage_stats'] else metrics.increment('delete.failed') end diff --git a/lib/vmpooler/metrics/promstats.rb b/lib/vmpooler/metrics/promstats.rb index 253879c..c51d140 100644 --- a/lib/vmpooler/metrics/promstats.rb +++ b/lib/vmpooler/metrics/promstats.rb @@ -165,33 +165,33 @@ module Vmpooler }, user: { mtype: M_COUNTER, - torun: %i[manager], - docstring: 'Number of pool instances this user created created', - param_labels: %i[user poolname] + torun: %i[api], + docstring: 'Number of pool instances and the operation performed by a user', + param_labels: %i[user operation poolname] }, usage_litmus: { mtype: M_COUNTER, - torun: %i[manager], - docstring: 'Pools by Litmus job usage', - param_labels: %i[user poolname] + torun: %i[api], + docstring: 'Number of pool instances and the operation performed by Litmus jobs', + param_labels: %i[user operation poolname] }, usage_jenkins_instance: { mtype: M_COUNTER, - torun: %i[manager], - docstring: 'Pools by Jenkins instance usage', - param_labels: %i[jenkins_instance value_stream poolname] + torun: %i[api], + docstring: 'Number of pool instances and the operation performed by Jenkins instances', + param_labels: %i[jenkins_instance value_stream operation poolname] }, usage_branch_project: { mtype: M_COUNTER, - torun: %i[manager], - docstring: 'Pools by branch/project usage', - param_labels: %i[branch project poolname] + torun: %i[api], + docstring: 'Number of pool instances and the operation performed by Litmus jobs by Jenkins branch/project', + param_labels: %i[branch project operation poolname] }, usage_job_component: { mtype: M_COUNTER, - torun: %i[manager], - docstring: 'Pools by job/component usage', - param_labels: %i[job_name component_to_test poolname] + torun: %i[api], + docstring: 'Number of pool instances and the operation performed by Litmus jobs Jenkins by job/component', + param_labels: %i[job_name component_to_test operation poolname] }, checkout: { mtype: M_COUNTER, diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index e473364..8ad7902 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -473,54 +473,11 @@ module Vmpooler finish = format('%