Commits · 383f12ee93631c2adf594aefe7e829f90ff07b77 · Administrator / docs

13 Aug, 2015 3 commits
- Document new dns_sd_config options · 383f12ee
  Fabian Reinartz authored Aug 13, 2015
  
  383f12ee
- Merge pull request #160 from brian-brazil/multi-name · 844ca270
  Fabian Reinartz authored Aug 13, 2015
```
Document multiple names for console template graphs.
```
  844ca270
- Document multiple names for console template graphs. · 79f01470
  Brian Brazil authored Aug 12, 2015
  
  79f01470
10 Aug, 2015 2 commits
- Merge pull request #159 from brian-brazil/capital · 0546a26a
  Fabian Reinartz authored Aug 10, 2015
```
Consistent capitalisation on LHS menu
```
  0546a26a
- Consistent capitalisation on LHS menu · 79941008
  Brian Brazil authored Aug 10, 2015
  
  79941008
08 Aug, 2015 3 commits
- Sort list of exporters again. · d2eadbc9
  Julius Volz authored Aug 08, 2015
  
  d2eadbc9
- Merge pull request #157 from prometheus/update-exporters · a6fc1df1
  Julius Volz authored Aug 08, 2015
```
Add two new third-party exporters to the list.
```
  a6fc1df1
- Add two new third-party exporters to the list. · c6fd3903
  Julius Volz authored Aug 08, 2015
  
  c6fd3903
07 Aug, 2015 3 commits
- Fix typo in rules comment. · 176de632
  Julius Volz authored Aug 07, 2015
  
  176de632
- Merge pull request #156 from brian-brazil/linear · 5ce2ae79
  Julius Volz authored Aug 07, 2015
```
Add docs for predict_linear
```
  5ce2ae79
- Add docs for predict_linear · d9a38c22
  Brian Brazil authored Aug 07, 2015
  
  d9a38c22
06 Aug, 2015 2 commits
- Merge pull request #154 from jimmidyson/scheme-relabel · f1b4127a
  Julius Volz authored Aug 06, 2015
```
Document __scheme__ & __metrics_path__ labels available in relabeling
```
  f1b4127a
- Document __scheme__ & __metrics_path__ labels available in relabeling. · 99b78d6c
  Jimmi Dyson authored Aug 06, 2015
```
Fixes #153
```
  99b78d6c
04 Aug, 2015 4 commits
- Merge pull request #151 from prometheus/federation · f0a41f3c
  Julius Volz authored Aug 04, 2015
```
Document federation use cases and configuration.
```
  f0a41f3c
- Document federation use cases and configuration. · c9391e61
  Julius Volz authored Aug 04, 2015
  
  c9391e61
- Merge pull request #150 from prometheus/honor · 0758d101
  Julius Volz authored Aug 04, 2015
```
Add/improve docs around honor_labels and conflict handling.
```
  0758d101
- Add/improve docs around honor_labels and conflict handling. · d3296a4a
  Julius Volz authored Aug 04, 2015
  
  d3296a4a
03 Aug, 2015 1 commit
- Merge pull request #147 from prometheus/clean-up-getting-started · 44f2a566
  Fabian Reinartz authored Aug 03, 2015
```
Clean up obsolete section from "Getting Started" guide.
```
  44f2a566
02 Aug, 2015 3 commits
- Clean up obsolete section from "Getting Started" guide. · bf3bf8ee
  Julius Volz authored Aug 02, 2015
  
  bf3bf8ee
- Merge pull request #146 from brian-brazil/add-snmp · e5cff2ea
  Julius Volz authored Aug 02, 2015
```
Add SNMP exporter
```
  e5cff2ea
- Add SNMP exporter · 0794ae15
  Brian Brazil authored Aug 02, 2015
  
  0794ae15
22 Jul, 2015 4 commits
- Merge pull request #144 from prometheus/next-release · 8bf820ff
  Björn Rabenstein authored Jul 22, 2015
```
Merge next-release into master.
```
  8bf820ff
- Merge pull request #143 from prometheus/beorn7/sd · 16139661
  Björn Rabenstein authored Jul 22, 2015
```
Update documentation for new Consul meta-labels.
```
  16139661
- Update documentation for new Consul meta-labels. · d313c6a4
  beorn7 authored Jul 22, 2015
  
  d313c6a4
- Merge branch 'master' into next-release · 8db8d49b
  beorn7 authored Jul 22, 2015
  
  8db8d49b
20 Jul, 2015 2 commits
- Merge pull request #141 from dato/patch-1 · f7f2bfe5
  Björn Rabenstein authored Jul 20, 2015
```
Fix broken link for alerting details.
```
  f7f2bfe5
- Fix broken link for alerting details. · fc3809ae
  Dato Simó authored Jul 20, 2015
  
  fc3809ae
14 Jul, 2015 2 commits
- Merge pull request #140 from brian-brazil/java-pgw · adfa65d5
  Brian Brazil authored Jul 14, 2015
```
Update for 0.0.10 of client_java
```
  adfa65d5
- Update for 0.0.10 of client_java · f525ccfb
  Brian Brazil authored Jul 14, 2015
  
  f525ccfb
11 Jul, 2015 1 commit
- Merge pull request #127 from prometheus/hashmod · 97c0bcec
  Julius Volz authored Jul 11, 2015
```
Document hashmod
```
  97c0bcec
08 Jul, 2015 4 commits
- Merge pull request #139 from taotetek/master · 06637d55
  Julius Volz authored Jul 08, 2015
```
Add rsyslog_exporter to exporter list
```
  06637d55
- move rsyslog exporter to correct spot on list · 9cdc484b
  Brian Knox authored Jul 08, 2015
  
  9cdc484b
- add rsyslog_exporter to exporter list · bb26aa7a
  Brian Knox authored Jul 08, 2015
  
  bb26aa7a
- Merge pull request #135 from prometheus/http-api-docs · e12b8c5a
  Julius Volz authored Jul 08, 2015
```
Document HTTP API v1.
```
  e12b8c5a
07 Jul, 2015 1 commit
- Document HTTP API v1. · 8ef1f118
  Julius Volz authored Jul 01, 2015
  
  8ef1f118
02 Jul, 2015 3 commits
- Merge pull request #136 from kbudde/patch-1 · 5b6f7342
  Julius Volz authored Jul 02, 2015
```
Update exporters.md
```
  5b6f7342
- reordered list · 3d94dfed
  Kris Budde authored Jul 02, 2015
  
  3d94dfed
- Update exporters.md · 18bc7a75
  Kris Budde authored Jul 02, 2015
```
Hi,

I've added a link to rabbitMQ exporter.

Kris
```
  18bc7a75
01 Jul, 2015 2 commits
- Merge pull request #134 from prometheus/fix-yaml-example · d95c6cb8
  Fabian Reinartz authored Jul 01, 2015
```
Add back Prometheus target to last config example.
```
  d95c6cb8
- Add back Prometheus target to last config example. · 2236375a
  Julius Volz authored Jul 01, 2015
  
  2236375a