Commit c5ecf106 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'an-stricter-prom-checks' into 'master'

Stricter validation of prometheus label values

See merge request gitlab-org/gitlab-ce!32460
parents c3c5d6fb 9e00bf47
...@@ -311,7 +311,7 @@ group :metrics do ...@@ -311,7 +311,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.9.8' gem 'prometheus-client-mmap', '~> 0.9.9'
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
......
...@@ -650,7 +650,7 @@ GEM ...@@ -650,7 +650,7 @@ GEM
parser parser
unparser unparser
procto (0.0.3) procto (0.0.3)
prometheus-client-mmap (0.9.8) prometheus-client-mmap (0.9.9)
pry (0.11.3) pry (0.11.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
...@@ -1170,7 +1170,7 @@ DEPENDENCIES ...@@ -1170,7 +1170,7 @@ DEPENDENCIES
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
pg (~> 1.1) pg (~> 1.1)
premailer-rails (~> 1.9.7) premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.8) prometheus-client-mmap (~> 0.9.9)
pry-byebug (~> 3.5.1) pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
puma (~> 3.12) puma (~> 3.12)
......
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