Commit bf36b8b0 authored by Tobias Schmidt's avatar Tobias Schmidt

Fix wrong scrape_timeout and evaluation_interval from example configs

Scrape timeout can't be higher than scrape interval, so this config is
just wrong. This change remove all mentions of the timeout, we chose a
reasonable default, if a user has different needs they can find it in
the configuration docs.
parent d13bbc97
...@@ -37,7 +37,6 @@ Prometheus configuration as a file named `prometheus.yml`: ...@@ -37,7 +37,6 @@ Prometheus configuration as a file named `prometheus.yml`:
``` ```
global: global:
scrape_interval: 15s # By default, scrape targets every 15 seconds. scrape_interval: 15s # By default, scrape targets every 15 seconds.
evaluation_interval: 15s # Evaluate rules every 15 seconds.
# Attach these labels to any time series or alerts when communicating with # Attach these labels to any time series or alerts when communicating with
# external systems (federation, remote storage, Alertmanager). # external systems (federation, remote storage, Alertmanager).
...@@ -52,7 +51,6 @@ scrape_configs: ...@@ -52,7 +51,6 @@ scrape_configs:
# Override the global default and scrape targets from this job every 5 seconds. # Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s scrape_interval: 5s
scrape_timeout: 10s
target_groups: target_groups:
- targets: ['localhost:9090'] - targets: ['localhost:9090']
...@@ -189,7 +187,6 @@ scrape_configs: ...@@ -189,7 +187,6 @@ scrape_configs:
# Override the global default and scrape targets from this job every 5 seconds. # Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s scrape_interval: 5s
scrape_timeout: 10s
target_groups: target_groups:
- targets: ['localhost:8080', 'localhost:8081'] - targets: ['localhost:8080', 'localhost:8081']
...@@ -237,8 +234,7 @@ look like this: ...@@ -237,8 +234,7 @@ look like this:
``` ```
global: global:
scrape_interval: 15s # By default, scrape targets every 15 seconds. scrape_interval: 15s # By default, scrape targets every 15 seconds.
evaluation_interval: 15s # By default, scrape targets every 15 seconds. evaluation_interval: 15s # Evaluate rules every 15 seconds.
# scrape_timeout is set to the global default (10s).
# Attach these extra labels to all timeseries collected by this Prometheus instance. # Attach these extra labels to all timeseries collected by this Prometheus instance.
external_labels: external_labels:
...@@ -252,7 +248,6 @@ scrape_configs: ...@@ -252,7 +248,6 @@ scrape_configs:
# Override the global default and scrape targets from this job every 5 seconds. # Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s scrape_interval: 5s
scrape_timeout: 10s
target_groups: target_groups:
- targets: ['localhost:9090'] - targets: ['localhost:9090']
...@@ -261,7 +256,6 @@ scrape_configs: ...@@ -261,7 +256,6 @@ scrape_configs:
# Override the global default and scrape targets from this job every 5 seconds. # Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s scrape_interval: 5s
scrape_timeout: 10s
target_groups: target_groups:
- targets: ['localhost:8080', 'localhost:8081'] - targets: ['localhost:8080', 'localhost:8081']
......
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