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

Add a few helpful links to the media section

content/docs/introduction/comparison.md

@@ -104,12 +104,15 @@ https://github.com/influxdb/influxdb/issues/582).
 
 Still, InfluxDB is better geared towards the following use cases:
 
-   * storing all **individual** events, not just time series of values
-      * e.g. storing every HTTP request with full metadata *vs.* storing the cumulative count of HTTP requests for certain dimensions
-   * storing time series with completely unbounded dimensionality
-      * e.g. storing user IDs or email addresses in the key-value metadata *vs.*
-        storing bounded dimensionality like the HTTP method, HTTP handler and
-        instance ID
+   * Storing all **individual** events, not just time series of values.
+      * E.g. storing every HTTP request with full metadata *vs.* storing the
+        cumulative count of HTTP requests for certain dimensions.
+	  * [Logs and Metrics and Graphs, Oh My!](https://blog.raintank.io/logs-and-metrics-and-graphs-oh-my/)
+        describes the difference between event logging and metrics recording.
+   * Storing time series with completely unbounded dimensionality.
+      * E.g. storing user IDs or email addresses in the key-value metadata
+        *vs.* storing bounded dimensionality like the HTTP method, HTTP handler
+        and instance ID.
 
 There are other storage features, such as downsampling, which InfluxDB supports
 and Prometheus does not yet.

content/docs/introduction/faq.md

@@ -26,6 +26,12 @@ Identical alerts will be deduplicated by the [Alertmanager](https://github.com/p
 
 The Alertmanager cannot currently be made highly available, but this is a goal.
 
+### I was told Prometheus “doesn't scale”.
+
+There are in fact various ways to scale and federate
+Prometheus. Read [Scaling and Federating Prometheus](http://www.robustperception.io/scaling-and-federating-prometheus/)
+on the Robust Perception blog to get started.
+
 ### What language is Prometheus written in?
 
 Most Prometheus components are written in Go. Some are also written in Java and Ruby.
@@ -57,6 +63,18 @@ blog post by Brian Brazil goes into more detail.
 
 For cases where you must push, we offer the [Pushgateway](/docs/instrumenting/pushing/).
 
+### How to feed logs into Prometheus?
+
+Short answer: Don't! Use something like the ELK stack instead.
+
+Longer answer: Prometheus is system to collect and process metrics, not an
+event logging system. The Raintank blog post
+[Logs and Metrics and Graphs, Oh My!](https://blog.raintank.io/logs-and-metrics-and-graphs-oh-my/)
+provides more details about the differences between logs and metrics.
+
+If you want to extract Prometheus metrics from application logs, Google's
+[mtail](https://github.com/google/mtail) might be helpful.
+
 ### Who wrote Prometheus?
 
 Prometheus was initially started privately by

content/docs/introduction/media.md

@@ -5,25 +5,53 @@ sort_rank: 7
 
 # Media
 
-Resources on the Internet helpful to get started with Prometheus.
+There is a [subreddit](https://www.reddit.com/r/prometheusmonitoring)
+collecting all Prometheus-related resources on the internet.
+
+The following selection of resources are particularly useful 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.
+* [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.
+* Prometheus-related posts on the
+  [Robust Perception blog](http://www.robustperception.io/tag/prometheus/).
+* The [monitoring series](http://www.boxever.com/tag/monitoring) on Boxever's
+  tech blog.
+
+## Tutorials
+
+* [Instructions and example code for a Prometheus workshop](https://github.com/juliusv/prometheus_workshop).
+* [How To Install Prometheus using Docker on Ubuntu 14.04](https://www.digitalocean.com/community/tutorials/how-to-install-prometheus-using-docker-on-ubuntu-14-04).
+
+## Podcasts and interviews
+
+* [Prometheus on FLOSS Weekly 357](https://twit.tv/shows/floss-weekly/episodes/357) - Julius Volz on the [FLOSS Weekly TWiT.tv](https://twit.tv/shows/floss-weekly/) show.
+* [Prometheus and Service Monitoring](https://changelog.com/168/) - Julius Volz on the [Changelog](https://changelog.com/) podcast.
 
-## Recorded talks and interviews
+## 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.
+* [Prometheus workshop](https://vimeo.com/131581353) – Jamie Wilkinson at Monitorama PDX 2015 ([slides](https://docs.google.com/presentation/d/1X1rKozAUuF2MVc1YXElFWq9wkcWv3Axdldl8LOH9Vik/edit)).
+* [Monitoring Hadoop with Prometheus](https://www.youtube.com/watch?v=qs2sqOLNGtw) – Brian Brazil at the Hadoop User Group Ireland ([slides](http://www.slideshare.net/brianbrazil/monitoring-hadoop-with-prometheus-hadoop-user-group-ireland-december-2015)).
 * In German: [Monitoring mit Prometheus](https://entropia.de/GPN15:Monitoring_mit_Prometheus) – Michael Stapelberg at Gulaschprogrammiernacht 15.
-* [Prometheus workshop](https://vimeo.com/131581353) - Jamie Wilkinson at Monitorama PDX 2015 ([Slides](https://docs.google.com/presentation/d/1X1rKozAUuF2MVc1YXElFWq9wkcWv3Axdldl8LOH9Vik/edit)).
-* [Prometheus on FLOSS Weekly 357](https://twit.tv/shows/floss-weekly/episodes/357) - Julius Volz on the [FLOSS Weekly TWiT.tv](https://twit.tv/shows/floss-weekly/) show.
-* [Prometheus and Service Monitoring](https://changelog.com/168/) - Julius Volz on the [Changelog](https://changelog.com/) podcast.
 
 ## Presentation slides
 
+### General
+
+* [Prometheus Overview](http://www.slideshare.net/brianbrazil/prometheus-overview) – by Brian Brazil.
 * [Systems Monitoring with Prometheus](http://www.slideshare.net/brianbrazil/devops-ireland-systems-monitoring-with-prometheus) – Brian Brazil at Devops Ireland Meetup, Dublin.
+* [OMG! Prometheus](https://www.dropbox.com/s/0l7kxhjqjbabtb0/prometheus%20site-ops%20preso.pdf?dl=0) – Benjamin Staffin, Fitbit Site Operations, explains the case for Prometheus to his team.
+
+### Docker
+
+* [Prometheus and Docker](http://www.slideshare.net/brianbrazil/prometheus-and-docker-docker-galway-november-2015) – Brian Brazil at Docker Galway.
+
+### Python
+
+* [Better Monitoring for Python](http://www.slideshare.net/brianbrazil/better-monitoring-for-python-inclusive-monitoring-with-prometheus-pycon-ireland-lightning-talk) – Brian Brazil at Pycon Ireland.
 * [Monitoring your Python with Prometheus](http://www.slideshare.net/brianbrazil/python-ireland-monitoring-your-python-with-prometheus) – Brian Brazil at Python Ireland Meetup, Dublin.
-* [OMG! Prometheus](https://www.dropbox.com/s/0l7kxhjqjbabtb0/prometheus%20site-ops%20preso.pdf?dl=0) – Benjamin Staffin, Fitbit Site Operations, explains the case for Prometheus to his team.
\ No newline at end of file