Commits · bf36b8b0f1a22f64f5ff17d2a5d60993c4c850cd · Administrator / docs

26 Feb, 2016 1 commit

Fix wrong scrape_timeout and evaluation_interval from example configs · bf36b8b0

Tobias Schmidt authored Feb 26, 2016

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.

bf36b8b0

25 Feb, 2016 2 commits
- Merge pull request #333 from prometheus/evaluation-interval-clarification · d13bbc97
  Tobias Schmidt authored Feb 25, 2016
```
Remove misleading hints about multiple evaluation_interval
```
  d13bbc97
- Remove misleading hints about multiple evaluation_interval · 1797268a
  Tobias Schmidt authored Feb 25, 2016
```
There is only one global evaluation_interval at this time, so a "by
default" is misleading as it can't be overwritten anywhere.
```
  1797268a
24 Feb, 2016 3 commits
- Merge pull request #332 from jonnenauha/patch-1 · 51e1564c
  Julius Volz authored Feb 24, 2016
```
Add Varnish exporter to 3rd party section
```
  51e1564c
- Add my Varnish exporter to 3rd party section · e84daf29
  Jonne Nauha authored Feb 24, 2016
  
  e84daf29
- Merge pull request #329 from brian-brazil/newamblog · 7b567509
  Brian Brazil authored Feb 24, 2016
```
Update anomaly blog post for new AM and alert syntax
```
  7b567509
23 Feb, 2016 1 commit
- Update anomaly blog post for new AM and alert syntax · bcb1345a
  Brian Brazil authored Feb 23, 2016
  
  bcb1345a
14 Feb, 2016 2 commits
- Merge pull request #325 from commarla/master · f3a6734b
  Julius Volz authored Feb 14, 2016
```
small typo on configuration page
```
  f3a6734b
- small typo on configuration page · cd273203
  commarla authored Feb 14, 2016
  
  cd273203
11 Feb, 2016 2 commits
- Merge pull request #324 from brian-brazil/fosdem · a19524ff
  Brian Brazil authored Feb 11, 2016
```
Add video from my FOSDEM talk to the media page
```
  a19524ff
- Add video from my FOSDEM talk to the media page · ac8e302f
  Brian Brazil authored Feb 11, 2016
  
  ac8e302f
09 Feb, 2016 4 commits
- Merge pull request #323 from prometheus/host-dh-images · 922f87cd
  Brian Brazil authored Feb 09, 2016
```
Host DreamHack blog post images from repo.
```
  922f87cd
- Host DreamHack blog post images from repo. · 03dc2093
  Julius Volz authored Feb 09, 2016
  
  03dc2093
- Merge pull request #321 from roman-vynar/master · ab27f68a
  Fabian Reinartz authored Feb 09, 2016
```
Added IoT Edison exporter
```
  ab27f68a
- Merge pull request #322 from RichiH/patch-6 · e9ec7063
  Fabian Reinartz authored Feb 09, 2016
```
exporters.md: Add openweathermap_exporter
```
  e9ec7063
08 Feb, 2016 4 commits
- Added IoT Edison exporter · 036430ee
  Roman Vynar authored Feb 08, 2016
  
  036430ee
- exporters.md: Add openweathermap_exporter · b10b32ab
  Richard Hartmann authored Feb 08, 2016
  
  b10b32ab
- Merge pull request #319 from prometheus/recommend-grafana · 27c2bc12
  Julius Volz authored Feb 08, 2016
```
Recommend Grafana over PromDash.
```
  27c2bc12
- Recommend Grafana over PromDash. · bffc1d98
  Julius Volz authored Feb 08, 2016
  
  bffc1d98
04 Feb, 2016 5 commits
- Merge pull request #317 from RichiH/patch-5 · 5a800590
  Julius Volz authored Feb 04, 2016
```
exporters.md: Add speedtest_exporter
```
  5a800590
- exporters.md: Improve wording · 2605e5af
  Richard Hartmann authored Feb 04, 2016
  
  2605e5af
- exporters.md: Add speedtest_exporter · 346152df
  Richard Hartmann authored Feb 04, 2016
  
  346152df
- Merge pull request #305 from prometheus/fish/more-company-logos · e112d827
  Johannes 'fish' Ziemke authored Feb 04, 2016
```
Add more company logos
```
  e112d827
- Add more companies to "Trusted by" section · 72cf622b
  Johannes 'fish' Ziemke authored Jan 27, 2016
```
- DigitalOcean
- Docker
- GiantSwarm
- Jodel
- Quobyte
- Weave
```
  72cf622b
03 Feb, 2016 1 commit
- Merge pull request #315 from prometheus/fix-broken-link · 1f25f201
  Fabian Reinartz authored Feb 03, 2016
```
Fix broken console link in alert rules
```
  1f25f201
02 Feb, 2016 1 commit
- Fix broken console link in alert rules · 447e2aa1
  Tobias Schmidt authored Feb 02, 2016
  
  447e2aa1
29 Jan, 2016 4 commits
- Merge pull request #314 from prometheus/beorn7/integrations · 662e8300
  Björn Rabenstein authored Jan 29, 2016
```
Add Weave Flux to list of directly instrumented software
```
  662e8300
- Merge pull request #313 from prometheus/beorn7/benchmark · 57656eb3
  Björn Rabenstein authored Jan 29, 2016
```
Updated the benchmark results
```
  57656eb3
- Add Weave Flux to list of directly instrumented software · 53eb3563
  beorn7 authored Jan 29, 2016
  
  53eb3563
- Updated the benchmark results · 8eb30a09
  beorn7 authored Jan 29, 2016
  
  8eb30a09
28 Jan, 2016 6 commits
- Add clients.md file · 2e3299c4
  Fabian Reinartz authored Jan 26, 2016
  
  2e3299c4
- Add cross-links · 26665917
  Fabian Reinartz authored Jan 26, 2016
  
  26665917
- Add documentation for receiver configuration · de1643d0
  Fabian Reinartz authored Dec 31, 2015
  
  de1643d0
- Document config format for the new AM · 2a82c8f7
  Fabian Reinartz authored Dec 23, 2015
  
  2a82c8f7
- Document and overview for the new AM · cb0080d4
  Fabian Reinartz authored Dec 23, 2015
  
  cb0080d4
- Document new alerting rule syntax · a3986a81
  Fabian Reinartz authored Dec 23, 2015
  
  a3986a81
27 Jan, 2016 4 commits
- Merge pull request #311 from RichiH/patch-4 · 82c10c74
  Brian Brazil authored Jan 27, 2016
```
exporters.md: Add knxd_exporter
```
  82c10c74
- exporters.md: Add knxd_exporter · 4074ab83
  Richard Hartmann authored Jan 27, 2016
  
  4074ab83
- Merge pull request #309 from prometheus/next-release · 58bf5a09
  Fabian Reinartz authored Jan 27, 2016
```
Next release
```
  58bf5a09
- Add documentation for clamp_max() and clamp_min() · a2989085
  James Sanford authored Nov 26, 2015
```
This closes #267
```
  a2989085