puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #445 from puppetlabs/fix-metrics-path-rollups

Browse source 
(DIO-1503) Fix regex for ondemand instances
This commit is contained in:
Heath Seals 2021-02-02 10:17:44 -06:00 • committed by GitHub
commit 40bf2f50dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/vmpooler/metrics/promstats/collector_middleware.rb
View file

@ -113,7 +113,7 @@ module Vmpooler
# Similarly, request IDs are also stripped from the /ondemand path. # Similarly, request IDs are also stripped from the /ondemand path.
path path
.gsub(%r{/vm/.+$}, '/vm') .gsub(%r{/vm/.+$}, '/vm')
.gsub(%r{/ondemand/.+$}, '/ondemand') .gsub(%r{/ondemandvm/.+$}, '/ondemandvm')
.gsub(%r{/token/.+$}, '/token') .gsub(%r{/token/.+$}, '/token')
.gsub(%r{/lib/.+$}, '/lib') .gsub(%r{/lib/.+$}, '/lib')
.gsub(%r{/img/.+$}, '/img') .gsub(%r{/img/.+$}, '/img')

6
spec/unit/collector_middleware_spec.rb
View file

@ -72,14 +72,14 @@ describe Vmpooler::Metrics::Promstats::CollectorMiddleware do
it 'normalizes paths containing /ondemandvm by ' do it 'normalizes paths containing /ondemandvm by ' do
expect(Benchmark).to receive(:realtime).and_yield.and_return(0.3) expect(Benchmark).to receive(:realtime).and_yield.and_return(0.3)
get '/foo/ondemand/bar/fatman' get '/foo/ondemandvm/bar/fatman'
metric = :http_server_requests_total metric = :http_server_requests_total
labels = { method: 'get', path: '/foo/ondemand', code: '200' } labels = { method: 'get', path: '/foo/ondemandvm', code: '200' }
expect(registry.get(metric).get(labels: labels)).to eql(1.0) expect(registry.get(metric).get(labels: labels)).to eql(1.0)
metric = :http_server_request_duration_seconds metric = :http_server_request_duration_seconds
labels = { method: 'get', path: '/foo/ondemand' } labels = { method: 'get', path: '/foo/ondemandvm' }
expect(registry.get(metric).get(labels: labels)).to include("0.1" => 0, "0.5" => 1) expect(registry.get(metric).get(labels: labels)).to include("0.1" => 0, "0.5" => 1)
end end