Commits · a63f4a0838de6106cbf2ceaac5511d5a886ddfaa · Administrator / docs

30 Mar, 2016 2 commits

Merge pull request #366 from prometheus/beorn7/media · a63f4a08
Björn Rabenstein authored Mar 30, 2016
```
Update link to Michael Stapelberg's German introduction talk
```
a63f4a08

Update link to Michael Stapelberg's German introduction talk · d51e1552

beorn7 authored Mar 30, 2016

He gave a more up-to-date version of his previous talk at Easterhegg
2016. I think it makes more sense to link the newer talk here instead
of the old one.

d51e1552

29 Mar, 2016 3 commits
- Merge pull request #364 from brian-brazil/nervesd · 2efaf1a0
  Brian Brazil authored Mar 29, 2016
```
Add docs for Nerve SD.
```
  2efaf1a0
- Add docs for Nerve SD. · 43cce77c
  Brian Brazil authored Mar 26, 2016
```
Fixes #298
```
  43cce77c
- Merge pull request #362 from prometheus/stars · 4a1869ca
  Fabian Reinartz authored Mar 29, 2016
```
Add GitHub star button to header.
```
  4a1869ca
28 Mar, 2016 3 commits
- Add GitHub star button to header. · 3d2b2edb
  Julius Volz authored Mar 28, 2016
  
  3d2b2edb
- Merge pull request #360 from knyar/nginx · 705e72c9
  Brian Brazil authored Mar 28, 2016
```
Add a link to nginx-lua-prometheus
```
  705e72c9
- Add a link to nginx-lua-prometheus · 3718f4fd
  Anton Tolchanov authored Mar 28, 2016
  
  3718f4fd
24 Mar, 2016 1 commit
- Fix plural->singular in configuration section titles · 46f7d37f
  Julius Volz authored Mar 24, 2016
  
  46f7d37f
23 Mar, 2016 7 commits
- Merge pull request #357 from brian-brazil/life360 · 36a3af1d
  Brian Brazil authored Mar 23, 2016
```
Add life360 logo to blog post
```
  36a3af1d
- Add life360 logo to blog post · 55351530
  Brian Brazil authored Mar 23, 2016
  
  55351530
- Merge pull request #356 from brian-brazil/life360 · 728527a1
  Brian Brazil authored Mar 23, 2016
```
Add user interview with Life360
```
  728527a1
- Merge pull request #355 from prometheus/mention-cores · 17708cb5
  Tobias Schmidt authored Mar 23, 2016
```
Mention CPU cores in peak performance benchmark.
```
  17708cb5
- Add user interview with Life360 · 406a193b
  Brian Brazil authored Mar 23, 2016
  
  406a193b
- Mention CPU cores in peak performance benchmark. · 49ddea11
  Julius Volz authored Mar 23, 2016
  
  49ddea11
- Merge pull request #354 from prometheus/promcon-link · 5088d23f
  Tobias Schmidt authored Mar 23, 2016
```
Add PromCon link to landing page jumbotron.
```
  5088d23f
22 Mar, 2016 1 commit
- Add PromCon link to landing page jumbotron. · 1458dea8
  Julius Volz authored Mar 22, 2016
  
  1458dea8
18 Mar, 2016 2 commits
- Merge pull request #351 from mdlayher/master · 6e0640b0
  Julius Volz authored Mar 18, 2016
```
Add rTorrent third party exporter
```
  6e0640b0
- Add rTorrent third party exporter · b11c4206
  Matt Layher authored Mar 18, 2016
  
  b11c4206
17 Mar, 2016 2 commits
- Merge pull request #350 from prometheus/grobie-patch-1 · 7b5f2fe9
  Tobias Schmidt authored Mar 17, 2016
```
Fix wrong exposition format example
```
  7b5f2fe9
- Fix wrong exposition format example · 005490b8
  Tobias Schmidt authored Mar 17, 2016
```
And also use seconds instead of milliseconds.
```
  005490b8
13 Mar, 2016 2 commits
- Merge pull request #348 from brian-brazil/influx · d0fcc9a5
  Björn Rabenstein authored Mar 13, 2016
```
Add InfluxDB exporter
```
  d0fcc9a5
- Add InfluxDB exporter · b71dfdae
  Brian Brazil authored Mar 13, 2016
  
  b71dfdae
09 Mar, 2016 3 commits
- Merge pull request #347 from prometheus/fabxc-patch-2 · 8574f76e
  Brian Brazil authored Mar 09, 2016
```
Fix config key typo
```
  8574f76e
- Fix config key typo · dc615fd9
  Fabian Reinartz authored Mar 09, 2016
```
Fixes prometheus/alertmanager#274
```
  dc615fd9
- Merge pull request #346 from prometheus/add-ruby-push · c97ece6b
  Björn Rabenstein authored Mar 09, 2016
```
Add ruby link to pushgateway section
```
  c97ece6b
08 Mar, 2016 3 commits
- Add ruby link to pushgateway section · 07fb048b
  Tobias Schmidt authored Mar 08, 2016
  
  07fb048b
- Merge pull request #344 from prometheus/fabxc-patch-2 · 430d208e
  Tobias Schmidt authored Mar 08, 2016
```
Fix Slack send_resolved default
```
  430d208e
- Fix Slack send_resolved default · fced8f56
  Fabian Reinartz authored Mar 08, 2016
  
  fced8f56
06 Mar, 2016 2 commits
- Merge pull request #343 from mdlayher/master · a076a770
  Brian Brazil authored Mar 06, 2016
```
Add Ubiquiti UniFi third party exporter
```
  a076a770
- Add Ubiquiti UniFi third party exporter · 1c244c17
  Matt Layher authored Mar 06, 2016
  
  1c244c17
04 Mar, 2016 3 commits
- Merge pull request #342 from prometheus/am-client-typo · 05818b6d
  Julius Volz authored Mar 04, 2016
```
Fix typo in AM client docs
```
  05818b6d
- Fix typo in AM client docs · f9e84c54
  Brian Brazil authored Mar 04, 2016
  
  f9e84c54
- Fix template error · 90e653ee
  Fabian Reinartz authored Mar 04, 2016
  
  90e653ee
03 Mar, 2016 4 commits
- Make text match picture · ad6c09f1
  Fabian Reinartz authored Mar 03, 2016
  
  ad6c09f1
- Merge pull request #339 from prometheus/fabxc/alerttmpl · c202ec80
  Fabian Reinartz authored Mar 03, 2016
```
Add blog post about Alertmanager templating
```
  c202ec80
- Add blog post about Alertmanager templating · 05f23d57
  Fabian Reinartz authored Mar 03, 2016
  
  05f23d57
- Merge pull request #340 from prometheus/next-release · 191b7de7
  Fabian Reinartz authored Mar 03, 2016
```
Merge in changes for 0.17.0
```
  191b7de7
29 Feb, 2016 2 commits
- Merge pull request #336 from brian-brazil/simplejava · 3eb54103
  Brian Brazil authored Feb 29, 2016
```
Update docs for new java client, and other changes.
```
  3eb54103
- Update docs for new java client, and other changes. · ba0143d2
  Brian Brazil authored Feb 27, 2016
  
  ba0143d2