From 4a8c6f60c98d232cde625bd35a115886d0701149 Mon Sep 17 00:00:00 2001
From: leowu <leoowu@Gmail.com>
Date: Tue, 30 Oct 2018 14:44:02 +0800
Subject: [PATCH] Update 10config.yaml

fix prometheus boot error
 err="error loading config from \"/etc/prometheus/prometheus.yaml\": couldn't load configuration (--config.file=\"/etc/prometheus/prometheus.yaml\"): parsing YAML file /etc/prometheus/prometheus.yaml: global scrape timeout greater than scrape interval"
---
 prometheus/10config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prometheus/10config.yaml b/prometheus/10config.yaml
index 45819b3..95550a8 100644
--- a/prometheus/10config.yaml
+++ b/prometheus/10config.yaml
@@ -10,7 +10,7 @@ data:
     global:
       scrape_interval:     15s
       evaluation_interval: 15s
-      scrape_timeout:      20s
+      scrape_timeout:      15s
 
     rule_files:
       - '/prometheus/rules/*.rules'