Merge pull request #118 from prometheus/beorn7/doc-improve

Add and fix a number of minor things.

content/docs/instrumenting/exporters.md

@@ -16,38 +16,40 @@ These exporters are maintained as part of the official
 [Prometheus GitHub organization](https://github.com/prometheus):
 
    * [Node/system metrics exporter](https://github.com/prometheus/node_exporter)
-   * [Graphite exporter](https://github.com/prometheus/graphite_exporter)
+   * [AWS CloudWatch exporter](https://github.com/prometheus/cloudwatch_exporter)
    * [Collectd exporter](https://github.com/prometheus/collectd_exporter)
-   * [JMX exporter](https://github.com/prometheus/jmx_exporter)
+   * [Consul exporter](https://github.com/prometheus/consul_exporter)
+   * [Graphite exporter](https://github.com/prometheus/graphite_exporter)
    * [HAProxy exporter](https://github.com/prometheus/haproxy_exporter)
-   * [StatsD bridge](https://github.com/prometheus/statsd_bridge)
-   * [AWS CloudWatch exporter](https://github.com/prometheus/cloudwatch_exporter)
    * [Hystrix metrics publisher](https://github.com/prometheus/hystrix)
+   * [JMX exporter](https://github.com/prometheus/jmx_exporter)
    * [Mesos task exporter](https://github.com/prometheus/mesos_exporter)
-   * [Consul exporter](https://github.com/prometheus/consul_exporter)
    * [MySQL server exporter](https://github.com/prometheus/mysqld_exporter)
+   * [StatsD bridge](https://github.com/prometheus/statsd_bridge)
 
 The [JMX exporter](https://github.com/prometheus/jmx_exporter) can export from a
 wide variety of JVM-based applications, for example [Kafka](http://kafka.apache.org/) and
 [Cassandra](http://cassandra.apache.org/).
 
-## Unofficial third-party exporters
+## Independently maintained third-party exporters
 
-There are also a number of exporters which are externally contributed and
-maintained. Note that these may have not been vetted for best practices by the
-Prometheus core team yet:
+There are also a number of exporters which are externally contributed
+and maintained. We encourage the creation of more exporters but cannot
+vet all of them for best practices. Commonly, those exporters are
+hosted outside of the Prometheus GitHub organization.
 
-   * [RethinkDB exporter](https://github.com/oliver006/rethinkdb_exporter)
-   * [Redis exporter](https://github.com/oliver006/redis_exporter)
-   * [scollector exporter](https://github.com/tgulacsi/prometheus_scollector)
-   * [MongoDB exporter](https://github.com/dcu/mongodb_exporter)
    * [CouchDB exporter](https://github.com/gesellix/couchdb-exporter)
    * [Django exporter](https://github.com/korfuri/django-prometheus)
    * [Google's mtail log data extractor](https://github.com/google/mtail)
-   * [Minecraft exporter module](https://github.com/Baughn/PrometheusIntegration)
-   * [Meteor JS web framework exporter](https://atmospherejs.com/sevki/prometheus-exporter)
    * [Memcached exporter](https://github.com/Snapbug/memcache_exporter)
+   * [Meteor JS web framework exporter](https://atmospherejs.com/sevki/prometheus-exporter)
+   * [Minecraft exporter module](https://github.com/Baughn/PrometheusIntegration)
+   * [MongoDB exporter](https://github.com/dcu/mongodb_exporter)
+   * [Munin exporter](https://github.com/pvdh/munin_exporter)
    * [New Relic exporter](https://github.com/jfindley/newrelic_exporter)
+   * [Redis exporter](https://github.com/oliver006/redis_exporter)
+   * [RethinkDB exporter](https://github.com/oliver006/rethinkdb_exporter)
+   * [scollector exporter](https://github.com/tgulacsi/prometheus_scollector)
 
 ## Directly instrumentated software
 
@@ -55,9 +57,9 @@ Some third-party software already exposes Prometheus metrics natively, so no
 separate exporters are needed:
 
    * [cAdvisor](https://github.com/google/cadvisor)
-   * [Kubernetes](https://github.com/GoogleCloudPlatform/kubernetes)
-   * [Kubernetes-Mesos](https://github.com/mesosphere/kubernetes-mesos)
    * [Etcd](https://github.com/coreos/etcd)
-   * [gokit](https://github.com/peterbourgon/gokit)
    * [go-metrics instrumentation library](https://github.com/armon/go-metrics)
+   * [gokit](https://github.com/peterbourgon/gokit)
+   * [Kubernetes-Mesos](https://github.com/mesosphere/kubernetes-mesos)
+   * [Kubernetes](https://github.com/GoogleCloudPlatform/kubernetes)
    * [RobustIRC](http://robustirc.net/)

content/docs/introduction/faq.md

@@ -211,12 +211,13 @@ second. The latter depends on the compressibility of the sample data
 and on the number of time series the samples belong to, but to give
 you an idea, here are some results from benchmarks:
 
-* On an older 8-core machine with Intel Core i7 CPUs and two spinning
-  disks (Samsung HD753LJ) in a RAID-1 setup, Prometheus sustained an
-  ingestion rate of 34k samples per second, belonging to 170k time
-  series, scraped from 600 targets.
-* On a modern server with SSD, Prometheus sustained an ingestion rate
-  of 340k samples per second, belonging to 2M time
+* On an older 8-core machine with Intel Core i7 CPUs, 8GiB RAM, and
+  two spinning disks (Samsung HD753LJ) in a RAID-1 setup, Prometheus
+  sustained an ingestion rate of 34k samples per second, belonging to
+  170k time series, scraped from 600 targets.
+
+* On a modern server with 64GiB RAM and SSD, Prometheus sustained an
+  ingestion rate of 340k samples per second, belonging to 2M time
   series, scraped from 1800 targets.
 
 In both cases, there were no obvious bottlenecks. Various stages of the

content/docs/introduction/media.md

+---
+title: Media
+sort_rank: 7
+---
+
+# Media
+
+Resources on the Internet helpful to get started with Prometheus.
+
+## Blogs
+
+* This site has its own [blog](http://prometheus.io/blog/).
+* [SoundCloud's blog post announcing Prometheus](https://developers.soundcloud.com/blog/prometheus-monitoring-at-soundcloud) – a more elaborate overview than the one given on this site.
+* The [monitoring series](http://www.boxever.com/tag/monitoring) on Boxever's tech blog.
+
+## Recorded talks
+
+* [Prometheus: A Next-Generation Monitoring System](https://www.usenix.org/conference/srecon15europe/program/presentation/rabenstein) – Julius Volz and Björn Rabenstein at SREcon15 Europe, Dublin.
+* [What is your application doing right now?](http://youtu.be/Z0LlilNpX1U) – Matthias Gruter, Transmode, at DevOps Stockholm Meetup.
+* In German: [Monitoring mit Prometheus](https://entropia.de/GPN15:Monitoring_mit_Prometheus) – Michael Stapelberg at Gulaschprogrammiernacht 15.

content/docs/introduction/overview.md

@@ -12,8 +12,8 @@ monitoring and alerting toolkit built at [SoundCloud](http://soundcloud.com).
 Since its inception in 2012, it has become the standard for instrumenting new
 services at SoundCloud and is seeing growing external usage and contributions.
 
-For a more elaborate overview, see also [SoundCloud's blog post which announces
-Prometheus](https://developers.soundcloud.com/blog/prometheus-monitoring-at-soundcloud).
+For a more elaborate overview, see the resources linked from the
+[media](/docs/introduction/media/) section.
 
 ### Features