merge

2022-02-13 21:50:23 +00:00
parent 2c8788a373 1c81b55c1b
commit d6264c93bd
2 changed files with 4 additions and 1 deletions
--- a/prometheus/prometheus-lt-1.yml
+++ b/prometheus/prometheus-lt-1.yml
@@ -34,12 +34,15 @@ scrape_configs:
    static_configs:
      - targets: ['pushgateway:9091']

+<<<<<<< HEAD
  - job_name: 'haproxy'
    scrape_interval: 10s
    honor_labels: true
    static_configs:
      - targets: ['haproxy:8404']

+=======
+>>>>>>> 1c81b55c1b3df1b60e7a85164abc3d78db0f7607
  - job_name: 'pocket-lt-1'
    scrape_interval: 10s
    honor_labels: true