Commit cfb65969 authored by Richard Hartmann's avatar Richard Hartmann Committed by GitHub

Merge pull request #683 from prometheus/grobie/remove-promdash

Remove remaining references to PromDash
parents eb4748fc ae84791a
...@@ -118,7 +118,7 @@ Currently, the following external systems are supported: ...@@ -118,7 +118,7 @@ Currently, the following external systems are supported:
### Can I create dashboards? ### Can I create dashboards?
Yes, we recommend [Grafana](/docs/visualization/grafana/) for production usage. [PromDash](/docs/visualization/promdash/) and [Console templates](/docs/visualization/consoles/) also exist. Yes, we recommend [Grafana](/docs/visualization/grafana/) for production usage. There are also [Console templates](/docs/visualization/consoles/).
### Can I change the timezone? Why is everything in UTC? ### Can I change the timezone? Why is everything in UTC?
......
...@@ -52,8 +52,8 @@ to email, Pagerduty, Slack etc. ...@@ -52,8 +52,8 @@ to email, Pagerduty, Slack etc.
### Promdash ### Promdash
[Promdash](../../visualization/promdash/) is a Ruby-on-Rails dashboard builder for Prometheus. Promdash was a native dashboard builder for Prometheus. It has been replaced by
It is similar at a high-level to Grafana, but is specific to Prometheus. [Grafana](../../visualization/grafana/).
### Prometheus ### Prometheus
......
...@@ -41,10 +41,8 @@ optional: ...@@ -41,10 +41,8 @@ optional:
* the main [Prometheus server](https://github.com/prometheus/prometheus) which scrapes and stores time series data * the main [Prometheus server](https://github.com/prometheus/prometheus) which scrapes and stores time series data
* [client libraries](/docs/instrumenting/clientlibs/) for instrumenting application code * [client libraries](/docs/instrumenting/clientlibs/) for instrumenting application code
* a [push gateway](https://github.com/prometheus/pushgateway) for supporting short-lived jobs * a [push gateway](https://github.com/prometheus/pushgateway) for supporting short-lived jobs
* a [GUI-based dashboard builder](/docs/visualization/promdash/) based on Rails/SQL
* special-purpose [exporters](/docs/instrumenting/exporters/) (for HAProxy, StatsD, Graphite, etc.) * special-purpose [exporters](/docs/instrumenting/exporters/) (for HAProxy, StatsD, Graphite, etc.)
* an (experimental) [alertmanager](https://github.com/prometheus/alertmanager) * an [alertmanager](https://github.com/prometheus/alertmanager)
* a [command-line querying tool](https://github.com/prometheus/prometheus_cli)
* various support tools * various support tools
Most Prometheus components are written in [Go](https://golang.org/), making Most Prometheus components are written in [Go](https://golang.org/), making
...@@ -60,7 +58,7 @@ its ecosystem components: ...@@ -60,7 +58,7 @@ its ecosystem components:
Prometheus scrapes metrics from instrumented jobs, either directly or via an Prometheus scrapes metrics from instrumented jobs, either directly or via an
intermediary push gateway for short-lived jobs. It stores all scraped samples intermediary push gateway for short-lived jobs. It stores all scraped samples
locally and runs rules over this data to either record new time series from locally and runs rules over this data to either record new time series from
existing data or generate alerts. PromDash or other API consumers can be used existing data or generate alerts. Grafana or other API consumers can be used
to visualize the collected data. to visualize the collected data.
## When does it fit? ## When does it fit?
......
...@@ -8,5 +8,5 @@ sort_rank: 1 ...@@ -8,5 +8,5 @@ sort_rank: 1
The expression browser is available at `/graph` on the Prometheus server, allowing you The expression browser is available at `/graph` on the Prometheus server, allowing you
to enter any expression and see its result either in a table or graphed over time. to enter any expression and see its result either in a table or graphed over time.
This is primarily useful for ad-hoc queries and debugging. For consoles, use This is primarily useful for ad-hoc queries and debugging. For graphs, use
[PromDash](/docs/visualization/promdash/) or [Console templates](/docs/visualization/consoles/). [Grafana](/docs/visualization/grafana/) or [Console templates](/docs/visualization/consoles/).
...@@ -11,7 +11,8 @@ from the Prometheus server. ...@@ -11,7 +11,8 @@ from the Prometheus server.
Console templates are the most powerful way to create templates that can be Console templates are the most powerful way to create templates that can be
easily managed in source control. There is a learning curve though, so users new easily managed in source control. There is a learning curve though, so users new
to this style of monitoring should try out [PromDash](/docs/visualization/promdash/) first. to this style of monitoring should try out
[Grafana](/docs/visualization/grafana/) first.
## Getting started ## Getting started
......
...@@ -4,6 +4,7 @@ sort_rank: 2 ...@@ -4,6 +4,7 @@ sort_rank: 2
--- ---
# Grafana support for Prometheus # Grafana support for Prometheus
[Grafana](http://grafana.org/) supports querying Prometheus. [Grafana](http://grafana.org/) supports querying Prometheus.
The Grafana data source for Prometheus is included since Grafana 2.5.0 (2015-10-28). The Grafana data source for Prometheus is included since Grafana 2.5.0 (2015-10-28).
...@@ -12,6 +13,7 @@ The following shows an example Grafana dashboard which queries Prometheus for da ...@@ -12,6 +13,7 @@ The following shows an example Grafana dashboard which queries Prometheus for da
[![Grafana screenshot](/assets/grafana_prometheus.png)](/assets/grafana_prometheus.png) [![Grafana screenshot](/assets/grafana_prometheus.png)](/assets/grafana_prometheus.png)
## Installing ## Installing
For the full Grafana installation instructions, see the [official Grafana For the full Grafana installation instructions, see the [official Grafana
documentation](http://docs.grafana.org/installation/). documentation](http://docs.grafana.org/installation/).
...@@ -28,11 +30,13 @@ cd grafana-2.5.0/ ...@@ -28,11 +30,13 @@ cd grafana-2.5.0/
``` ```
## Using ## Using
By default, Grafana will be listening on By default, Grafana will be listening on
[http://localhost:3000](http://localhost:3000). The default login is "admin" / [http://localhost:3000](http://localhost:3000). The default login is "admin" /
"admin". "admin".
### Creating a Prometheus data source ### Creating a Prometheus data source
To create a Prometheus data source: To create a Prometheus data source:
1. Click on the Grafana logo to open the sidebar menu. 1. Click on the Grafana logo to open the sidebar menu.
...@@ -48,21 +52,24 @@ The following shows an example data source configuration: ...@@ -48,21 +52,24 @@ The following shows an example data source configuration:
[![Data source configuration](/assets/grafana_configuring_datasource.png)](/assets/grafana_configuring_datasource.png) [![Data source configuration](/assets/grafana_configuring_datasource.png)](/assets/grafana_configuring_datasource.png)
### Creating a Prometheus graph ### Creating a Prometheus graph
Follow the standard way of adding a new Grafana graph. Then: Follow the standard way of adding a new Grafana graph. Then:
1. Click the graph title, then click "Edit". 1. Click the graph title, then click "Edit".
2. Under the "Metrics" tab, select your Prometheus data source (bottom right). 2. Under the "Metrics" tab, select your Prometheus data source (bottom right).
3. Enter any Prometheus expression into the "Query" field, while using the "Metric" field to lookup metrics via autocompletion. 3. Enter any Prometheus expression into the "Query" field, while using the
4. To format the legend names of time series, use the "Legend format" input in a "Metric" field to lookup metrics via autocompletion.
similar way to PromDash. For example, to show only the `method` and `status` 4. To format the legend names of time series, use the "Legend format" input. For
labels of a returned query result, separated by a dash, you could use the example, to show only the `method` and `status` labels of a returned query
legend format string `{{method}} - {{status}}`. result, separated by a dash, you could use the legend format string
`{{method}} - {{status}}`.
5. Tune other graph settings until you have a working graph. 5. Tune other graph settings until you have a working graph.
The following shows an example Prometheus graph configuration: The following shows an example Prometheus graph configuration:
[![Prometheus graph creation](/assets/grafana_qps_graph.png)](/assets/grafana_qps_graph.png) [![Prometheus graph creation](/assets/grafana_qps_graph.png)](/assets/grafana_qps_graph.png)
### Importing pre-built dashboards from Grafana.net ### Importing pre-built dashboards from Grafana.net
Grafana.net maintains [a collection of shared dashboards](https://grafana.net/dashboards) Grafana.net maintains [a collection of shared dashboards](https://grafana.net/dashboards)
which can be downloaded and used with standalone instances of Grafana. Use which can be downloaded and used with standalone instances of Grafana. Use
the Grafana.net "Filter" option to browse dashboards for the "Prometheus" the Grafana.net "Filter" option to browse dashboards for the "Prometheus"
......
This diff is collapsed.
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