added bsc

removed merge notation in prometheus-lt-1.yml
2022-03-31 13:09:45 +02:00
parent bfe6db1eda
commit 1f6e128144
2 changed files with 4 additions and 3 deletions
--- a/prometheus/prometheus-lt-1.yml
+++ b/prometheus/prometheus-lt-1.yml
@@ -34,15 +34,12 @@ 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