Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

be08202b

Commit be08202b authored 7 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch 'bjk/metric_names' into 'master'

Update metric names to match Prometheus guidelines.

Closes #35031

See merge request !12812

parents 0f393724 2d0741e5

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/sessions_controller.rb 1 addition, 1 deletion

app/controllers/sessions_controller.rb
config/initializers/8_metrics.rb 1 addition, 1 deletion

config/initializers/8_metrics.rb
doc/administration/monitoring/prometheus/gitlab_metrics.md 18 additions, 15 deletions

doc/administration/monitoring/prometheus/gitlab_metrics.md
lib/gitlab/health_checks/fs_shards_check.rb 3 additions, 3 deletions

lib/gitlab/health_checks/fs_shards_check.rb
lib/gitlab/health_checks/simple_abstract_check.rb 1 addition, 1 deletion

lib/gitlab/health_checks/simple_abstract_check.rb
lib/gitlab/metrics/requests_rack_middleware.rb 40 additions, 0 deletions

lib/gitlab/metrics/requests_rack_middleware.rb
spec/controllers/metrics_controller_spec.rb 8 additions, 8 deletions

spec/controllers/metrics_controller_spec.rb
spec/lib/gitlab/health_checks/fs_shards_check_spec.rb 9 additions, 9 deletions

spec/lib/gitlab/health_checks/fs_shards_check_spec.rb
spec/lib/gitlab/health_checks/simple_check_shared.rb 3 additions, 3 deletions

spec/lib/gitlab/health_checks/simple_check_shared.rb
spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb 9 additions, 26 deletions

spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb

with 93 additions and 67 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment