Commit 8380bfe7 authored by Julius Volz's avatar Julius Volz Committed by GitHub

Merge pull request #631 from prometheus/add-marathon-config

Add Marathon SD section to scrape and AM configs.
parents 4b3d73cd 5f8f8158
...@@ -192,6 +192,10 @@ gce_sd_configs: ...@@ -192,6 +192,10 @@ gce_sd_configs:
kubernetes_sd_configs: kubernetes_sd_configs:
[ - <kubernetes_sd_config> ... ] [ - <kubernetes_sd_config> ... ]
# List of Marathon service discovery configurations.
marathon_sd_configs:
[ - <marathon_sd_config> ... ]
# List of AirBnB's Nerve service discovery configurations. # List of AirBnB's Nerve service discovery configurations.
nerve_sd_configs: nerve_sd_configs:
[ - <nerve_sd_config> ... ] [ - <nerve_sd_config> ... ]
...@@ -892,6 +896,10 @@ gce_sd_configs: ...@@ -892,6 +896,10 @@ gce_sd_configs:
kubernetes_sd_configs: kubernetes_sd_configs:
[ - <kubernetes_sd_config> ... ] [ - <kubernetes_sd_config> ... ]
# List of Marathon service discovery configurations.
marathon_sd_configs:
[ - <marathon_sd_config> ... ]
# List of AirBnB's Nerve service discovery configurations. # List of AirBnB's Nerve service discovery configurations.
nerve_sd_configs: nerve_sd_configs:
[ - <nerve_sd_config> ... ] [ - <nerve_sd_config> ... ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment