Skip to content

GitLab Next

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

37056673

Commit 37056673 authored 7 years ago by Tim Zallmann

Downloads
- Plain Diff

Merge branch '35330-fix-nginx-add-haproxy' into 'master'

Fix NGINX Error Rate query, include HA Proxy

See merge request !13005

parents b92d5135 08346768

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

config/prometheus/additional_metrics.yml 22 additions, 1 deletion

config/prometheus/additional_metrics.yml
doc/user/project/integrations/prometheus_library/haproxy.md 20 additions, 0 deletions

doc/user/project/integrations/prometheus_library/haproxy.md
doc/user/project/integrations/prometheus_library/metrics.md 1 addition, 0 deletions

doc/user/project/integrations/prometheus_library/metrics.md
doc/user/project/integrations/prometheus_library/nginx.md 1 addition, 1 deletion

doc/user/project/integrations/prometheus_library/nginx.md

with 44 additions and 2 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