added bsc
removed merge notation in prometheus-lt-1.yml
This commit is contained in:
@@ -3,6 +3,10 @@
|
|||||||
"id": "0001",
|
"id": "0001",
|
||||||
"url": "http://haproxy/pokt"
|
"url": "http://haproxy/pokt"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "0004",
|
||||||
|
"url": "http://haproxy/bsc"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "0005",
|
"id": "0005",
|
||||||
"url": "http://haproxy/fuse"
|
"url": "http://haproxy/fuse"
|
||||||
|
|||||||
@@ -34,15 +34,12 @@ scrape_configs:
|
|||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['pushgateway:9091']
|
- targets: ['pushgateway:9091']
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- job_name: 'haproxy'
|
- job_name: 'haproxy'
|
||||||
scrape_interval: 10s
|
scrape_interval: 10s
|
||||||
honor_labels: true
|
honor_labels: true
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['haproxy:8404']
|
- targets: ['haproxy:8404']
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 1c81b55c1b3df1b60e7a85164abc3d78db0f7607
|
|
||||||
- job_name: 'pocket-lt-1'
|
- job_name: 'pocket-lt-1'
|
||||||
scrape_interval: 10s
|
scrape_interval: 10s
|
||||||
honor_labels: true
|
honor_labels: true
|
||||||
|
|||||||
Reference in New Issue
Block a user