Commit 6a32f236 authored by Tobias Schmidt's avatar Tobias Schmidt

Merge pull request #402 from prometheus/fix-links

Fix and improve some links.
parents af56b6af 6dc68abc
...@@ -123,4 +123,4 @@ Alertmanager's generic webhook support can trigger automatic remediations. ...@@ -123,4 +123,4 @@ Alertmanager's generic webhook support can trigger automatic remediations.
This all combines to enable oncall engineers to focus on problems where they can This all combines to enable oncall engineers to focus on problems where they can
have the most impact. have the most impact.
When defining alerts for your services, see also our [alerting best practices](http://prometheus.io/docs/practices/alerting/). When defining alerts for your services, see also our [alerting best practices](/docs/practices/alerting/).
...@@ -28,14 +28,14 @@ Everything changed for us a year ago, in January of 2015. After more than two ...@@ -28,14 +28,14 @@ Everything changed for us a year ago, in January of 2015. After more than two
years of development and internal usage, we felt that Prometheus was ready for years of development and internal usage, we felt that Prometheus was ready for
a wider audience and decided to go fully public with our official [announcement a wider audience and decided to go fully public with our official [announcement
blog post](https://developers.soundcloud.com/blog/prometheus-monitoring-at-soundcloud), blog post](https://developers.soundcloud.com/blog/prometheus-monitoring-at-soundcloud),
a [website](http://prometheus.io/), and a series of a [website](https://prometheus.io/), and a series of
[related](http://www.boxever.com/tags/monitoring) [related](http://www.boxever.com/tags/monitoring)
[posts](http://5pi.de/2015/01/26/monitor-docker-containers-with-prometheus/). [posts](http://5pi.de/2015/01/26/monitor-docker-containers-with-prometheus/).
We already received a good deal of attention during the first week after the We already received a good deal of attention during the first week after the
announcement, but nothing could prepare us for what happened a week later: announcement, but nothing could prepare us for what happened a week later:
someone unknown to us (hello there, someone unknown to us (hello there,
[jjwiseman](https://news.ycombinator.com/user?id=jjwiseman)!) had submitted [jjwiseman](https://news.ycombinator.com/user?id=jjwiseman)!) had submitted
[the Prometheus website](http://prometheus.io/) to Hacker News and somehow their [the Prometheus website](https://prometheus.io/) to Hacker News and somehow their
post had made it [all the way to the top](https://news.ycombinator.com/item?id=8995696). post had made it [all the way to the top](https://news.ycombinator.com/item?id=8995696).
This is when things started going slightly crazy in a good way. We saw a sharp This is when things started going slightly crazy in a good way. We saw a sharp
...@@ -105,10 +105,10 @@ or another has become too long to mention all of them: ...@@ -105,10 +105,10 @@ or another has become too long to mention all of them:
[CoreOS](https://coreos.com/), [Docker](https://docker.com), [CoreOS](https://coreos.com/), [Docker](https://docker.com),
[Boxever](http://www.boxever.com/), [Boxever](http://www.boxever.com/),
[DigitalOcean](https://www.digitalocean.com/), [Financial Times](http://www.ft.com/), [DigitalOcean](https://www.digitalocean.com/), [Financial Times](http://www.ft.com/),
[Improbable](http://improbable.io/), [KPMG](https://kpmg.com), and many more. [Improbable](http://improbable.io/), [KPMG](https://www.kpmg.com), and many more.
Even the world's largest digital festival, Even the world's largest digital festival,
[DreamHack](https://www.dreamhack.se), has [used [DreamHack](https://www.dreamhack.se), has [used
Prometheus](http://prometheus.io/blog/2015/06/24/monitoring-dreamhack/) to keep Prometheus](/blog/2015/06/24/monitoring-dreamhack/) to keep
tabs on their network infrastructure in 2015, and tabs on their network infrastructure in 2015, and
[FOSDEM](https://fosdem.org/2016/) will do so in 2016. [FOSDEM](https://fosdem.org/2016/) will do so in 2016.
......
<%= atom_feed :title => 'Prometheus Blog', :author_name => '© Prometheus Authors 2015', <%= atom_feed :title => 'Prometheus Blog', :author_name => '© Prometheus Authors 2015',
:author_uri => 'http://prometheus.io/blog/', :limit => 10, :author_uri => 'https://prometheus.io/blog/', :limit => 10,
:logo => 'http://prometheus.io/assets/prometheus_logo.png', :logo => 'https://prometheus.io/assets/prometheus_logo.png',
:icon => 'http://prometheus.io/assets/favicons/favicon.ico' %> :icon => 'https://prometheus.io/assets/favicons/favicon.ico' %>
...@@ -27,7 +27,7 @@ scraped time series which serve to identify the scraped target: ...@@ -27,7 +27,7 @@ scraped time series which serve to identify the scraped target:
If either of these labels are already present in the scraped data, the behavior If either of these labels are already present in the scraped data, the behavior
depends on the `honor_labels` configuration option. See the depends on the `honor_labels` configuration option. See the
[scrape configuration documentation](/docs/operating/configuration/#scrape-configurations-scrape_config) [scrape configuration documentation](/docs/operating/configuration/#%3Cscrape_config%3E)
for more information. for more information.
For each instance scrape, Prometheus stores a sample in the following For each instance scrape, Prometheus stores a sample in the following
......
...@@ -40,7 +40,7 @@ Prometheus). ...@@ -40,7 +40,7 @@ Prometheus).
| **Inception** | April 2014 | April 2014 | | **Inception** | April 2014 | April 2014 |
| **Supported in** | Prometheus version `>=0.4.0` | Prometheus version `>=0.4.0` | | **Supported in** | Prometheus version `>=0.4.0` | Prometheus version `>=0.4.0` |
| **Transmission** | HTTP | HTTP | | **Transmission** | HTTP | HTTP |
| **Encoding** | [32-bit varint-encoded record length-delimited](https://developers.google.com/protocol-buffers/docs/reference/java/com/google/protobuf/AbstractMessageLite#writeDelimitedTo(java. io.OutputStream)) Protocol Buffer messages of type [io.prometheus.client.MetricFamily](https://github.com/prometheus/client_model/blob/086fe7ca28bde6cec2acd5223423c1475a362858/metrics.proto#L76- L81) | UTF-8, `\n` line endings | | **Encoding** | [32-bit varint-encoded record length-delimited](https://developers.google.com/protocol-buffers/docs/reference/java/com/google/protobuf/AbstractMessageLite#writeDelimitedTo(java.io.OutputStream)) Protocol Buffer messages of type [io.prometheus.client.MetricFamily](https://github.com/prometheus/client_model/blob/086fe7ca28bde6cec2acd5223423c1475a362858/metrics.proto#L76- L81) | UTF-8, `\n` line endings |
| **HTTP `Content-Type`** | `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited` | `text/plain; version=0.0.4` (A missing `version` value will lead to a fall-back to the most recent text format version.) | | **HTTP `Content-Type`** | `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited` | `text/plain; version=0.0.4` (A missing `version` value will lead to a fall-back to the most recent text format version.) |
| **Optional HTTP `Content-Encoding`** | `gzip` | `gzip` | | **Optional HTTP `Content-Encoding`** | `gzip` | `gzip` |
| **Advantages** | <ul><li>Cross-platform</li><li>Size</li><li>Encoding and decoding costs</li><li>Strict schema</li><li>Supports concatenation and theoretically streaming (only server-side behavior would need to change)</li></ul> | <ul><li>Human-readable</li><li>Easy to assemble, especially for minimalistic cases (no nesting required)</li><li>Readable line by line (with the exception of type hints and docstrings)</li></ul> | | **Advantages** | <ul><li>Cross-platform</li><li>Size</li><li>Encoding and decoding costs</li><li>Strict schema</li><li>Supports concatenation and theoretically streaming (only server-side behavior would need to change)</li></ul> | <ul><li>Human-readable</li><li>Easy to assemble, especially for minimalistic cases (no nesting required)</li><li>Readable line by line (with the exception of type hints and docstrings)</li></ul> |
......
...@@ -17,7 +17,7 @@ makes it easy to instrument even shell scripts without a client library. ...@@ -17,7 +17,7 @@ makes it easy to instrument even shell scripts without a client library.
[README.md](https://github.com/prometheus/pushgateway/blob/master/README.md). [README.md](https://github.com/prometheus/pushgateway/blob/master/README.md).
* For use from Java see the * For use from Java see the
[PushGateway](http://prometheus.github.io/client_java/io/prometheus/client/exporter/PushGateway.html) [PushGateway](https://prometheus.io/client_java/io/prometheus/client/exporter/PushGateway.html)
class. class.
* For use from Go see the [Push](http://godoc.org/github.com/prometheus/client_golang/prometheus#Push) and [PushAdd](http://godoc.org/github.com/prometheus/client_golang/prometheus#PushAdd) functions. * For use from Go see the [Push](http://godoc.org/github.com/prometheus/client_golang/prometheus#Push) and [PushAdd](http://godoc.org/github.com/prometheus/client_golang/prometheus#PushAdd) functions.
......
...@@ -65,7 +65,7 @@ also works well for many short-lived, frequently changing sets of time series. ...@@ -65,7 +65,7 @@ also works well for many short-lived, frequently changing sets of time series.
## Prometheus vs. InfluxDB ## Prometheus vs. InfluxDB
[InfluxDB](http://influxdb.com/) is a very promising new open-source time [InfluxDB](https://influxdata.com/) is a very promising new open-source time
series database. It did not exist when Prometheus development began, so we were series database. It did not exist when Prometheus development began, so we were
unable to consider it as an alternative at the time. Still, there are unable to consider it as an alternative at the time. Still, there are
significant differences between Prometheus and InfluxDB, and both systems are significant differences between Prometheus and InfluxDB, and both systems are
......
...@@ -21,7 +21,7 @@ For building Prometheus from source, see the relevant [`README.md` ...@@ -21,7 +21,7 @@ For building Prometheus from source, see the relevant [`README.md`
section](https://github.com/prometheus/prometheus/blob/master/README.md#use-make). section](https://github.com/prometheus/prometheus/blob/master/README.md#use-make).
Note that this documentation (as published on Note that this documentation (as published on
[prometheus.io](http://prometheus.io)) refers to the latest production [prometheus.io](https://prometheus.io)) refers to the latest production
release. The head of the release. The head of the
[prometheus/docs](https://github.com/prometheus/docs) GitHub [prometheus/docs](https://github.com/prometheus/docs) GitHub
repository refers to the (possibly not yet released) head of the repository refers to the (possibly not yet released) head of the
...@@ -39,7 +39,7 @@ a sample configuration and exposes it on port 9090. ...@@ -39,7 +39,7 @@ a sample configuration and exposes it on port 9090.
The Prometheus image uses a volume to store the actual metrics. For The Prometheus image uses a volume to store the actual metrics. For
production deployments it is highly recommended to use the production deployments it is highly recommended to use the
[Data Volume Container](https://docs.docker.com/userguide/dockervolumes/#creating-and-mounting-a-data-volume-container) [Data Volume Container](https://docs.docker.com/engine/userguide/containers/dockervolumes/#creating-and-mounting-a-data-volume-container)
pattern to ease managing the data on Prometheus upgrades. pattern to ease managing the data on Prometheus upgrades.
To provide your own configuration, there are several options. Here are To provide your own configuration, there are several options. Here are
......
...@@ -13,7 +13,7 @@ with Prometheus. ...@@ -13,7 +13,7 @@ with Prometheus.
## Blogs ## Blogs
* This site has its own [blog](http://prometheus.io/blog/). * This site has its own [blog](/blog/).
* [SoundCloud's blog post announcing Prometheus](https://developers.soundcloud.com/blog/prometheus-monitoring-at-soundcloud) * [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. – a more elaborate overview than the one given on this site.
* Prometheus-related posts on the * Prometheus-related posts on the
......
...@@ -137,7 +137,7 @@ The label list provided with the group modifier contains additional labels from ...@@ -137,7 +137,7 @@ The label list provided with the group modifier contains additional labels from
to be included in the result metrics. A label can only appear in one of the lists. Every time to be included in the result metrics. A label can only appear in one of the lists. Every time
series of the result vector must be uniquely identifiable by the labels from both lists combined. series of the result vector must be uniquely identifiable by the labels from both lists combined.
_Grouping modifiers can only be used for [comparison/filtering](#comparison-/-filter-binary-operators) _Grouping modifiers can only be used for [comparison](#comparison-binary-operators)
and [arithmetic](#arithmetic-binary-operators) operations as `and` and `or` operations and [arithmetic](#arithmetic-binary-operators) operations as `and` and `or` operations
match with all possible entries in the right vector by default._ match with all possible entries in the right vector by default._
......
...@@ -77,4 +77,4 @@ checks: ...@@ -77,4 +77,4 @@ checks:
exclude: [] exclude: []
# The base url required by atom_feed # The base url required by atom_feed
base_url: "http://prometheus.io" base_url: "https://prometheus.io"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment