Skip to content

N
nexpie-grafana-theme
Commit 618652d1 by brew-install-buzzwords Committed by Marcus Olsson
Options

Docs: Replace ampersands with and (#19609)

parent 4b042c89
Showing with 157 additions and 157 deletions
docs/README.md
......@@ -59,7 +59,7 @@ we created in the previous step.
Open [localhost:3004](http://localhost:3004) to view the docs.
### Images & Content
### Images and Content
All markdown files are part of [this repository](https://github.com/grafana/grafana). However, all images are added to the [website repository](https://github.com/grafana/website). Therefore, the process of adding images is not as straightforward. These are the steps:
......
docs/sources/_index.md
+++
title = "Grafana documentation"
description = "Guides, Installation & Feature Documentation"
description = "Guides, Installation and Feature Documentation"
keywords = ["grafana", "installation", "documentation"]
type = "docs"
aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
......
docs/sources/administration/provisioning.md
......@@ -147,7 +147,7 @@ Since not all datasources have the same configuration settings we only have the
| tlsAuthWithCACert | boolean | *All* | Enable TLS authentication using CA cert |
| tlsSkipVerify | boolean | *All* | Controls whether a client verifies the server's certificate chain and host name. |
| graphiteVersion | string | Graphite | Graphite version |
| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL & MSSQL | Lowest interval/step value that should be used for this data source |
| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source |
| esVersion | number | Elasticsearch | Elasticsearch version as a number (2/5/56/60/70) |
| timeField | string | Elasticsearch | Which field that should be used as timestamp |
| interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' |
......@@ -163,9 +163,9 @@ Since not all datasources have the same configuration settings we only have the
| encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' |
| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
| maxOpenConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of open connections to the database (Grafana v5.4+) |
| maxIdleConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) |
| connMaxLifetime | number | MySQL, PostgreSQL & MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) |
| maxOpenConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of open connections to the database (Grafana v5.4+) |
| maxIdleConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) |
| connMaxLifetime | number | MySQL, PostgreSQL and MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) |
#### Secure Json Data
......
docs/sources/alerting/rules.md
+++
title = "Alerting Engine & Rules Guide"
title = "Alerting Engine and Rules Guide"
description = "Configuring Alert Rules"
keywords = ["grafana", "alerting", "guide", "rules"]
type = "docs"
[menu.docs]
name = "Engine & Rules"
name = "Engine and Rules"
parent = "alerting"
weight = 1
+++
# Alerting Engine & Rules Guide
# Alerting Engine and Rules Guide
> Alerting is only available in Grafana v4.0 and above.
......@@ -45,7 +45,7 @@ Currently alerting supports a limited form of high availability. Since v4.2.0 of
Currently only the graph panel supports alert rules but this will be added to the **Singlestat** and **Table**
panels as well in a future release.
### Name & Evaluation interval
### Name and Evaluation interval
Here you can specify the name of the alert rule and how often the scheduler should evaluate the alert rule.
......@@ -139,11 +139,11 @@ The message can contain anything, information about how you might solve the issu
The actual notifications are configured and shared between multiple alerts. Read the
[notifications]({{< relref "notifications.md" >}}) guide for how to configure and setup notifications.
## Alert State History & Annotations
## Alert State History and Annotations
Alert state changes are recorded in the internal annotation table in Grafana's database. The state changes
are visualized as annotations in the alert rule's graph panel. You can also go into the `State history`
submenu in the alert tab to view & clear state history.
submenu in the alert tab to view and clear state history.
## Troubleshooting
......
docs/sources/auth/ldap.md
......@@ -111,10 +111,10 @@ To use the debug view:
### Bind
#### Bind & Bind Password
#### Bind and Bind Password
By default the configuration expects you to specify a bind DN and bind password. This should be a read only user that can perform LDAP searches.
When the user DN is found a second bind is performed with the user provided username & password (in the normal Grafana login form).
When the user DN is found a second bind is performed with the user provided username and password (in the normal Grafana login form).
```bash
bind_dn = "cn=admin,dc=grafana,dc=org"
......
docs/sources/features/datasources/cloudwatch.md
......@@ -27,7 +27,7 @@ forget to check your log file (try looking in /var/log/grafana/grafana.log).
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Default Region* | Used in query editor to set region (can be changed on per query basis)
*Custom Metrics namespace* | Specify the CloudWatch namespace of Custom metrics
......
docs/sources/features/datasources/elasticsearch.md
......@@ -26,7 +26,7 @@ visualize logs or metrics stored in Elasticsearch. You can also annotate your gr
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Url* | The HTTP protocol, IP, and port of your Elasticsearch server.
*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
......@@ -98,7 +98,7 @@ For example, if you're using a default setup of Filebeat for shipping logs to El
The Elasticsearch query editor allows you to select multiple metrics and group by multiple terms or filters. Use the plus and minus icons to the right to add/remove
metrics or group by clauses. Some metrics and group by clauses haves options, click the option text to expand the row to view and edit metric or group by options.
## Series naming & alias patterns
## Series naming and alias patterns
You can control the name for time series via the `Alias` input field.
......@@ -131,7 +131,7 @@ Query | Description
------------ | -------------
*{"find": "fields", "type": "keyword"}* | Returns a list of field names with the index type `keyword`.
*{"find": "terms", "field": "@hostname", "size": 1000}* | Returns a list of values for a field using term aggregation. Query will use current dashboard time range as time range for query.
*{"find": "terms", "field": "@hostname", "query": '<lucene query>'}* | Returns a list of values for a field using term aggregation & and a specified lucene query filter. Query will use current dashboard time range as time range for query.
*{"find": "terms", "field": "@hostname", "query": '<lucene query>'}* | Returns a list of values for a field using term aggregation and a specified lucene query filter. Query will use current dashboard time range as time range for query.
There is a default size limit of 500 on terms queries. Set the size property in your query to set a custom limit.
You can use other variables inside the query. Example query definition for a variable named `$host`.
......
docs/sources/features/datasources/graphite.md
......@@ -28,7 +28,7 @@ queries through the use of query references.
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Url* | The HTTP protocol, IP, and port of your graphite-web or graphite-api install.
*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
......
docs/sources/features/datasources/influxdb.md
......@@ -25,7 +25,7 @@ Grafana ships with very feature rich data source plugin for InfluxDB. Supporting
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Url* | The HTTP protocol, ip and port of you influxdb api (influxdb api port is by default 8086)
*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
......@@ -76,7 +76,7 @@ the tag key and select `--remove tag filter--`.
You can type in regex patterns for metric names or tag filter values, be sure to wrap the regex pattern in forward slashes (`/`). Grafana
will automatically adjust the filter tag condition to use the InfluxDB regex match condition operator (`=~`).
### Field & Aggregation functions
### Field and Aggregation functions
In the `SELECT` row you can specify what fields and functions you want to use. If you have a
group by time you need an aggregation function. Some functions like derivative require an aggregation function. The editor tries simplify and unify this part of the query. For example:<br>
![](/img/docs/influxdb/select_editor.png)<br>
......
docs/sources/features/datasources/mssql.md
......@@ -26,7 +26,7 @@ Grafana ships with a built-in Microsoft SQL Server (MSSQL) data source plugin th
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Host* | The IP address/hostname and optional port of your MSSQL instance. If port is omitted, default 1433 will be used.
*Database* | Name of your MSSQL database.
......@@ -58,7 +58,7 @@ Identifier | Description
### Database User Permissions (Important!)
The database user you specify when you add the data source should only be granted SELECT permissions on
the specified database & tables you want to query. Grafana does not validate that the query is safe. The query
the specified database and tables you want to query. Grafana does not validate that the query is safe. The query
could include any SQL statement. For example, statements like `DELETE FROM user;` and `DROP TABLE user;` would be
executed. To protect against this we **Highly** recommend you create a specific MSSQL user with restricted permissions.
......@@ -122,7 +122,7 @@ The query editor has a link named `Generated SQL` that shows up after a query ha
## Table queries
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns & rows your query returns.
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns and rows your query returns.
**Example database table:**
......
docs/sources/features/datasources/mysql.md
......@@ -29,7 +29,7 @@ data from a MySQL compatible database.
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Host* | The IP address/hostname and optional port of your MySQL instance.
*Database* | Name of your MySQL database.
......@@ -60,7 +60,7 @@ Identifier | Description
### Database User Permissions (Important!)
The database user you specify when you add the data source should only be granted SELECT permissions on
the specified database & tables you want to query. Grafana does not validate that the query is safe. The query
the specified database and tables you want to query. Grafana does not validate that the query is safe. The query
could include any SQL statement. For example, statements like `USE otherdb;` and `DROP TABLE user;` would be
executed. To protect against this we **Highly** recommend you create a specific mysql user with restricted permissions.
......@@ -156,7 +156,7 @@ The query editor has a link named `Generated SQL` that show up after a query as
## Table queries
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns & rows your query returns.
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns and rows your query returns.
Query editor with example query:
......@@ -229,7 +229,7 @@ GROUP BY time
ORDER BY time
```
Currently, there is no support for a dynamic group by time based on time range & panel width.
Currently, there is no support for a dynamic group by time based on time range and panel width.
This is something we plan to add.
## Templating
......
docs/sources/features/datasources/opentsdb.md
......@@ -25,7 +25,7 @@ Grafana ships with advanced support for OpenTSDB.
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Url* | The HTTP protocol, ip and port of you opentsdb server (default port is usually 4242)
*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
......
docs/sources/features/datasources/postgres.md
......@@ -26,7 +26,7 @@ Grafana ships with a built-in PostgreSQL data source plugin that allows you to q
Name | Description
------------ | -------------
*Name* | The data source name. This is how you refer to the data source in panels & queries.
*Name* | The data source name. This is how you refer to the data source in panels and queries.
*Default* | Default data source means that it will be pre-selected for new panels.
*Host* | The IP address/hostname and optional port of your PostgreSQL instance.
*Database* | Name of your PostgreSQL database.
......@@ -60,7 +60,7 @@ Identifier | Description
### Database User Permissions (Important!)
The database user you specify when you add the data source should only be granted SELECT permissions on
the specified database & tables you want to query. Grafana does not validate that the query is safe. The query
the specified database and tables you want to query. Grafana does not validate that the query is safe. The query
could include any SQL statement. For example, statements like `DELETE FROM user;` and `DROP TABLE user;` would be
executed. To protect against this we **highly** recommend you create a specific PostgreSQL user with restricted permissions.
......@@ -166,7 +166,7 @@ We plan to add many more macros. If you have suggestions for what macros you wou
## Table queries
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns & rows your query returns.
If the `Format as` query option is set to `Table` then you can basically do any type of SQL query. The table panel will automatically show the results of whatever columns and rows your query returns.
Query editor with example query:
......
docs/sources/features/datasources/prometheus.md
......@@ -27,7 +27,7 @@ Grafana includes built-in support for Prometheus.
| Name | Description |
| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
| _Name_ | The data source name. This is how you refer to the data source in panels & queries. |
| _Name_ | The data source name. This is how you refer to the data source in panels and queries. |
| _Default_ | Default data source means that it will be pre-selected for new panels. |
| _Url_ | The HTTP protocol, ip and port of you Prometheus server (default port is usually 9090) |
| _Access_ | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser. |
......
docs/sources/features/datasources/stackdriver.md
......@@ -29,7 +29,7 @@ Grafana ships with built-in support for Google Stackdriver. Just add it as a dat
| Name | Description |
| --------------------- | ----------------------------------------------------------------------------------- |
| _Name_ | The data source name. This is how you refer to the data source in panels & queries. |
| _Name_ | The data source name. This is how you refer to the data source in panels and queries. |
| _Default_ | Default data source means that it will be pre-selected for new panels. |
| _Service Account Key_ | Service Account Key File for a GCP Project. Instructions below on how to create it. |
......@@ -54,7 +54,7 @@ Click on the links above and click the `Enable` button:
#### Create a GCP Service Account for a Project
1. Navigate to the [APIs & Services Credentials page](https://console.cloud.google.com/apis/credentials).
1. Navigate to the [APIs and Services Credentials page](https://console.cloud.google.com/apis/credentials).
2. Click on the `Create credentials` dropdown/button and choose the `Service account key` option.
{{< docs-imagebox img="/img/docs/v53/stackdriver_create_service_account_button.png" class="docs-image--no-shadow" caption="Create service account button" >}}
......
docs/sources/features/panels/graph.md
......@@ -17,7 +17,7 @@ The main panel in Grafana is simply named Graph. It provides a very rich set of
1. Clicking the title for a panel exposes a menu. The `edit` option opens additional configuration
options for the panel.
2. Click to open color & axis selection.
2. Click to open color and axis selection.
3. Click to only show this series. Shift/Ctrl + click to hide series.
## General
......@@ -146,7 +146,7 @@ Display styles control visual properties of the graph.
- Individual: the value for the series you hover over
- Cumulative - sum of series below plus the series you hover over
#### Stacking & Null value
#### Stacking and Null value
If there are multiple series, they can be displayed as a group.
......@@ -186,7 +186,7 @@ Time regions allow you to highlight certain time regions of the graph to make it
The time range tab allows you to override the dashboard time range and specify a panel specific time.
Either through a relative from now time option or through a timeshift.
Panel time overrides & timeshift are described in more detail [here]({{< relref "reference/timerange.md#panel-time-overrides-timeshift" >}}).
Panel time overrides and timeshift are described in more detail [here]({{< relref "reference/timerange.md#panel-time-overrides-timeshift" >}}).
### Data link
......
docs/sources/features/panels/heatmap.md
......@@ -55,7 +55,7 @@ Data and bucket options can be found in the `Axes` tab.
Data format | Description
------------ | -------------
*Time series* | Grafana does the bucketing by going through all time series values. The bucket sizes & intervals will be determined using the Buckets options.
*Time series* | Grafana does the bucketing by going through all time series values. The bucket sizes and intervals will be determined using the Buckets options.
*Time series buckets* | Each time series already represents a Y-Axis bucket. The time series name (alias) needs to be a numeric value representing the upper or lower interval for the bucket. Grafana does no bucketing so the bucket size options are hidden.
### Bucket bound
......@@ -66,7 +66,7 @@ option will be chosen based on panels' data source type.
### Bucket Size
The Bucket count & size options are used by Grafana to calculate how big each cell in the heatmap is. You can
The Bucket count and size options are used by Grafana to calculate how big each cell in the heatmap is. You can
define the bucket size either by count (the first input box) or by specifying a size interval. For the Y-Axis
the size interval is just a value but for the X-bucket you can specify a time range in the *Size* input, for example,
the time range `1h`. This will make the cells 1h wide on the X-axis.
......@@ -94,7 +94,7 @@ With Prometheus you can only control X-axis by adjusting *Min step* and *Resolut
In the heatmap *Display* tab you define how the cells are rendered and what color they are assigned.
### Color Mode & Spectrum
### Color Mode and Spectrum
{{< imgbox max-width="40%" img="/img/docs/v43/heatmap_scheme.png" caption="Color spectrum" >}}
......@@ -117,5 +117,5 @@ to do the bucketing during metric collection or store the data in Elasticsearch,
supports doing Histogram bucketing on the raw data.
If you remove or lower the group by time (or raise maxDataPoints) in your query to return more data points your heatmap will be
more accurate but this can also be very CPU & Memory taxing for your browser and could cause hangs and crashes if the number of
more accurate but this can also be very CPU and Memory taxing for your browser and could cause hangs and crashes if the number of
data points becomes unreasonably large.
docs/sources/guides/whats-new-in-v2-1.md
+++
title = "What's New in Grafana v2.1"
description = "Feature & improvement highlights for Grafana v2.1"
description = "Feature and improvement highlights for Grafana v2.1"
keywords = ["grafana", "new", "documentation", "2.1"]
type = "docs"
+++
......@@ -29,7 +29,7 @@ on a multi-value template variable.</p>
![Repeating Rows and Panels](/img/docs/v2/panel-row-repeat.gif "Repeating Rows and Panels")
<br/><br/>
### Dashboard Links & Navigation
### Dashboard Links and Navigation
To support better navigation between dashboards, it's now possible to create custom and dynamic links from individual
panels to appropriate Dashboards. You also have the ability to create flexible top-level links on any
given dashboard thanks to the new dashboard navigation bar feature.
......
docs/sources/guides/whats-new-in-v2-5.md
+++
title = "What's New in Grafana v2.5"
description = "Feature & improvement highlights for Grafana v2.5"
description = "Feature and improvement highlights for Grafana v2.5"
keywords = ["grafana", "new", "documentation", "2.5"]
type = "docs"
+++
......@@ -16,7 +16,7 @@ resize handles and improved InfluxDB and OpenTSDB support.
<img src="/img/docs/whatsnew_2_5/timepicker.png" alt="New Time picker">
A new timepicker with room for more quick ranges as well as new types of relative ranges, like `Today`,
`The day so far` and `This day last week`. Also an improved time & calendar picker that now works
`The day so far` and `This day last week`. Also an improved time and calendar picker that now works
correctly in UTC mode.
### Elasticsearch
......
docs/sources/guides/whats-new-in-v2-6.md
+++
title = "What's New in Grafana v2.6"
description = "Feature & improvement highlights for Grafana v2.6"
description = "Feature and improvement highlights for Grafana v2.6"
keywords = ["grafana", "new", "documentation", "2.6"]
type = "docs"
+++
......
docs/sources/guides/whats-new-in-v2.md
+++
title = "What's New in Grafana v2.0"
description = "Feature & improvement highlights for Grafana v2.0"
description = "Feature and improvement highlights for Grafana v2.0"
keywords = ["grafana", "new", "documentation", "2.0"]
type = "docs"
+++
......@@ -19,7 +19,7 @@ Grafana now ships with its own required backend server. Also completely open-sou
In addition to new features, the backend server makes it much easier to set up and enjoy Grafana. Grafana 2.0 now ships as cross platform binaries with no dependencies. Authentication is built in, and Grafana is now capable of proxying connections to Data Sources. There are no longer any CORS (Cross Origin Resource Sharing) issues requiring messy workarounds. Elasticsearch is no longer required just to store dashboards.
## User & Organization permissions
## User and Organization permissions
All Dashboards and Data Sources are linked to an Organization (not to a User). Users are linked to
Organizations via a role. That role can be:
......@@ -58,7 +58,7 @@ You can publish snapshots locally or to [snapshot.raintank.io](http://snapshot.r
Either way, anyone with the link (and access to your Grafana instance for local snapshots) can view it.
## Panel time overrides & timeshift
## Panel time overrides and timeshift
In Grafana v2.x you can now override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. You can also add a time shift to individual panels. This allows you to show metrics from different time periods or days at the same time.
......@@ -114,7 +114,7 @@ The side menubar will become more useful as we build out additional functionalit
You can easily collapse or re-open the side menubar at any time by clicking the Grafana icon in the top left. We never want to get in the way of the data.
## New search view & starring dashboards
## New search view and starring dashboards
![](/img/docs/v2/dashboard_search.jpg)
......@@ -135,7 +135,7 @@ The dashlist is a new panel in Grafana v2.0. It allows you to show your personal
dashlist is used on the new Grafana Home screen. It is included as a reference Panel and is useful to provide basic linking between Dashboards.
## Data Source proxy & admin views
## Data Source proxy and admin views
Data sources in Grafana v2.0 are no longer defined in a config file. Instead, they are added through the UI or the HTTP API.
......
docs/sources/guides/whats-new-in-v3-1.md
+++
title = "What's New in Grafana v3.1"
description = "Feature & improvement highlights for Grafana v3.1"
description = "Feature and improvement highlights for Grafana v3.1"
keywords = ["grafana", "new", "documentation", "3.1"]
type = "docs"
[menu.docs]
......@@ -12,7 +12,7 @@ weight = 5
# What's New in Grafana v3.1
## Dashboard Export & Import
## Dashboard Export and Import
The export feature is now accessed from the share menu.
......@@ -32,7 +32,7 @@ Here you can change the name of the dashboard and also pick what data sources yo
## Discover Dashboards
On [Grafana.com](https://grafana.com) you can now browse & search for dashboards. We have already added a few but more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana, then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL.
On [Grafana.com](https://grafana.com) you can now browse and search for dashboards. We have already added a few but more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana, then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL.
<img src="/img/docs/v31/gnet_dashboards_list.png">
......
docs/sources/guides/whats-new-in-v3.md
+++
title = "What's New in Grafana v3.0"
description = "Feature & improvement highlights for Grafana v3.0"
description = "Feature and improvement highlights for Grafana v3.0"
keywords = ["grafana", "new", "documentation", "3.0"]
type = "docs"
[menu.docs]
......@@ -76,7 +76,7 @@ example:
grafana-cli install grafana-pie-chart-panel
```
## Personalization & Preferences
## Personalization and Preferences
The home dashboard, timezone and theme can now be customized on Organization
and user Profile level. Grafana can also track recently viewed dashboards, which
......
docs/sources/guides/whats-new-in-v4-1.md
+++
title = "What's New in Grafana v4.1"
description = "Feature & improvement highlights for Grafana v4.1"
description = "Feature and improvement highlights for Grafana v4.1"
keywords = ["grafana", "new", "documentation", "4.1.0"]
type = "docs"
[menu.docs]
......@@ -53,7 +53,7 @@ This enables people to use the Cloudwatch data source without having access to t
Once the `access key` and `secret key` have been saved the user will no longer be able to view them.
<div class="clearfix"></div>
## Upgrade & Breaking changes
## Upgrade and Breaking changes
Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0 contains no breaking changes.
......@@ -64,7 +64,7 @@ of new features, changes, and bug fixes.
## Download
Head to [v4.1 download page](/download/4_1_0/) for download links & instructions.
Head to [v4.1 download page](/download/4_1_0/) for download links and instructions.
## Thanks
A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!
A big thanks to all the Grafana users who contribute by submitting PRs, bug reports and feedback!
docs/sources/guides/whats-new-in-v4-2.md
+++
title = "What's New in Grafana v4.2"
description = "Feature & improvement highlights for Grafana v4.2"
description = "Feature and improvement highlights for Grafana v4.2"
keywords = ["grafana", "new", "documentation", "4.2.0"]
type = "docs"
[menu.docs]
......@@ -65,7 +65,7 @@ This makes it possible for users to share dashboards between orgs without changi
We aim to introduce [dashboard groups](https://github.com/grafana/grafana/issues/1611) sometime in the future which will introduce access control and user groups within one org.
Making it possible to have users in multiple groups and have detailed access control.
## Upgrade & Breaking changes
## Upgrade and Breaking changes
If you're using https in grafana we now force you to use tls 1.2 and the most secure ciphers.
We think its better to be secure by default rather then making it configurable.
......@@ -81,8 +81,8 @@ of new features, changes, and bug fixes.
## Download
Head to [v4.2-beta download page](/download/4_2_0/) for download links & instructions.
Head to [v4.2-beta download page](/download/4_2_0/) for download links and instructions.
## Thanks
A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!
A big thanks to all the Grafana users who contribute by submitting PRs, bug reports and feedback!
docs/sources/guides/whats-new-in-v4-3.md
+++
title = "What's New in Grafana v4.3"
description = "Feature & improvement highlights for Grafana v4.3"
description = "Feature and improvement highlights for Grafana v4.3"
keywords = ["grafana", "new", "documentation", "4.3.0"]
type = "docs"
[menu.docs]
......@@ -97,7 +97,7 @@ Lots more enhancements and fixes can be found in the [Changelog](https://github.
## Download
Head to the [v4.3 download page](https://grafana.com/grafana/download) for download links & instructions.
Head to the [v4.3 download page](https://grafana.com/grafana/download) for download links and instructions.
## Thanks
......
docs/sources/guides/whats-new-in-v4-4.md
+++
title = "What's New in Grafana v4.4"
description = "Feature & improvement highlights for Grafana v4.4"
description = "Feature and improvement highlights for Grafana v4.4"
keywords = ["grafana", "new", "documentation", "4.4.0"]
type = "docs"
[menu.docs]
......@@ -20,7 +20,7 @@ Grafana v4.4 is now [available for download](https://grafana.com/grafana/downloa
## New Features
**Dashboard History**: View dashboard version history, compare any two versions (summary & json diffs), restore to old version. This big feature
**Dashboard History**: View dashboard version history, compare any two versions (summary and json diffs), restore to old version. This big feature
was contributed by **Walmart Labs**. Big thanks to them for this massive contribution!
Initial feature request: [#4638](https://github.com/grafana/grafana/issues/4638)
Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
......@@ -42,7 +42,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
## Download
Head to the [v4.4 download page](https://grafana.com/grafana/download) for download links & instructions.
Head to the [v4.4 download page](https://grafana.com/grafana/download) for download links and instructions.
## Thanks
......
docs/sources/guides/whats-new-in-v4-5.md
+++
title = "What's New in Grafana v4.5"
description = "Feature & improvement highlights for Grafana v4.5"
description = "Feature and improvement highlights for Grafana v4.5"
keywords = ["grafana", "new", "documentation", "4.5"]
type = "docs"
[menu.docs]
......@@ -40,23 +40,23 @@ More information [here](https://community.grafana.com/t/using-grafanas-query-ins
* **Table panel**: Render cell values as links that can have an url template that uses variables from current table row. [#3754](https://github.com/grafana/grafana/issues/3754)
* **Elasticsearch**: Add ad hoc filters directly by clicking values in table panel [#8052](https://github.com/grafana/grafana/issues/8052).
* **MySQL**: New rich query editor with syntax highlighting
* **Prometheus**: New rich query editor with syntax highlighting, metric & range auto complete and integrated function docs. [#5117](https://github.com/grafana/grafana/issues/5117)
* **Prometheus**: New rich query editor with syntax highlighting, metric and range auto complete and integrated function docs. [#5117](https://github.com/grafana/grafana/issues/5117)
### Enhancements
* **GitHub OAuth**: Support for GitHub organizations with 100+ teams. [#8846](https://github.com/grafana/grafana/issues/8846), thx [@skwashd](https://github.com/skwashd)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboard time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboard time range (from and until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Added new graphite 1.0 functions, available if you set version to 1.0.x in data source settings. New Functions: mapSeries, reduceSeries, isNonNull, groupByNodes, offsetToZero, grep, weightedAverage, removeEmptySeries, aggregateLine, averageOutsidePercentile, delay, exponentialMovingAverage, fallbackSeries, integralByInterval, interpolate, invert, linearRegression, movingMin, movingMax, movingSum, multiplySeriesWithWildcards, pow, powSeries, removeBetweenPercentile, squareRoot, timeSlice, closes [#8261](https://github.com/grafana/grafana/issues/8261)
- **Elasticsearch**: Ad-hoc filters now use query phrase match filters instead of term filters, works on non keyword/raw fields [#9095](https://github.com/grafana/grafana/issues/9095).
### Breaking change
* **InfluxDB/Elasticsearch**: The panel & data source option named "Group by time interval" is now named "Min time interval" and does now always define a lower limit for the auto group by time. Without having to use `>` prefix (that prefix still works). This should in theory have close to zero actual impact on existing dashboards. It does mean that if you used this setting to define a hard group by time interval of, say "1d", if you zoomed to a time range wide enough the time range could increase above the "1d" range as the setting is now always considered a lower limit.
* **InfluxDB/Elasticsearch**: The panel and data source option named "Group by time interval" is now named "Min time interval" and does now always define a lower limit for the auto group by time. Without having to use `>` prefix (that prefix still works). This should in theory have close to zero actual impact on existing dashboards. It does mean that if you used this setting to define a hard group by time interval of, say "1d", if you zoomed to a time range wide enough the time range could increase above the "1d" range as the setting is now always considered a lower limit.
This option is now renamed (and moved to Options sub section above your queries):
![image|519x120](upload://ySjHOVpavV6yk9LHQxL9nq2HIsT.png)
Data source selection & options & help are now above your metric queries.
Data source selection and options and help are now above your metric queries.
![image|690x179](upload://5kNDxKgMz1BycOKgG3iWYLsEVXv.png)
### Minor Changes
......
docs/sources/guides/whats-new-in-v4-6.md
+++
title = "What's New in Grafana v4.6"
description = "Feature & improvement highlights for Grafana v4.6"
description = "Feature and improvement highlights for Grafana v4.6"
keywords = ["grafana", "new", "documentation", "4.6"]
type = "docs"
[menu.docs]
......@@ -12,7 +12,7 @@ weight = -5
# What's New in Grafana v4.6
Grafana v4.6 brings many enhancements to Annotations, Cloudwatch & Prometheus. It also adds support for Postgres as metric & table data source!
Grafana v4.6 brings many enhancements to Annotations, Cloudwatch and Prometheus. It also adds support for Postgres as metric and table data source!
### Annotations
......@@ -47,12 +47,12 @@ This makes exploring and filtering Prometheus data much easier.
* **Prometheus**: Adds /metrics endpoint for exposing Grafana metrics. [#9187](https://github.com/grafana/grafana/pull/9187)
* **Graph**: Add support for local formatting in axis. [#1395](https://github.com/grafana/grafana/issues/1395), thx [@m0nhawk](https://github.com/m0nhawk)
* **Jaeger**: Add support for open tracing using jaeger in Grafana. [#9213](https://github.com/grafana/grafana/pull/9213)
* **Unit types**: New date & time unit types added, useful in singlestat to show dates & times. [#3678](https://github.com/grafana/grafana/issues/3678), [#6710](https://github.com/grafana/grafana/issues/6710), [#2764](https://github.com/grafana/grafana/issues/2764)
* **Unit types**: New date and time unit types added, useful in singlestat to show dates and times. [#3678](https://github.com/grafana/grafana/issues/3678), [#6710](https://github.com/grafana/grafana/issues/6710), [#2764](https://github.com/grafana/grafana/issues/2764)
* **CLI**: Make it possible to install plugins from any url [#5873](https://github.com/grafana/grafana/issues/5873)
* **Prometheus**: Add support for instant queries [#5765](https://github.com/grafana/grafana/issues/5765), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: Add support for alerting using the cloudwatch data source [#8050](https://github.com/grafana/grafana/pull/8050), thx [@mtanda](https://github.com/mtanda)
* **Pagerduty**: Include triggering series in pagerduty notification [#8479](https://github.com/grafana/grafana/issues/8479), thx [@rickymoorhouse](https://github.com/rickymoorhouse)
* **Timezone**: Time ranges like Today & Yesterday now work correctly when timezone setting is set to UTC [#8916](https://github.com/grafana/grafana/issues/8916), thx [@ctide](https://github.com/ctide)
* **Timezone**: Time ranges like Today and Yesterday now work correctly when timezone setting is set to UTC [#8916](https://github.com/grafana/grafana/issues/8916), thx [@ctide](https://github.com/ctide)
* **Prometheus**: Align $__interval with the step parameters. [#9226](https://github.com/grafana/grafana/pull/9226), thx [@alin-amana](https://github.com/alin-amana)
* **Prometheus**: Autocomplete for label name and label value [#9208](https://github.com/grafana/grafana/pull/9208), thx [@mtanda](https://github.com/mtanda)
* **Postgres**: New Postgres data source [#9209](https://github.com/grafana/grafana/pull/9209), thx [@svenklemm](https://github.com/svenklemm)
......
docs/sources/guides/whats-new-in-v4.md
+++
title = "What's New in Grafana v4.0"
description = "Feature & improvement highlights for Grafana v4.0"
description = "Feature and improvement highlights for Grafana v4.0"
keywords = ["grafana", "new", "documentation", "4.0"]
type = "docs"
[menu.docs]
......@@ -89,22 +89,22 @@ dynamically add filters to any log property!
## UX Improvements
We always try to bring some UX/UI refinements & polish in every release.
We always try to bring some UX/UI refinements and polish in every release.
### TV-mode & Kiosk mode
### TV-mode and Kiosk mode
<div class="row">
<div class="medium-6 columns">
<p>
Grafana is so often used on wall mounted TVs that we figured a clean TV mode would be
really nice. In TV mode the top navbar, row & panel controls will all fade to transparent.
really nice. In TV mode the top navbar, row and panel controls will all fade to transparent.
</p>
<p>
This happens automatically after one minute of user inactivity but can also be toggled manually
with the <code>d v</code> sequence shortcut. Any mouse movement or keyboard action will
restore navbar & controls.
restore navbar and controls.
</p>
<p>
......@@ -122,7 +122,7 @@ We always try to bring some UX/UI refinements & polish in every release.
</div>
</div>
### New row menu & add panel experience
### New row menu and add panel experience
{{< imgbox max-width="50%" img="/img/docs/v4/add_panel.gif" caption="Add Panel flow" >}}
......@@ -143,7 +143,7 @@ required, you can also just click the panel type and it will be inserted at the
automatically. Dragging a new panel has an advantage in that you can insert a new panel where ever you want
not just at the end of the row.
We plan to further improve dashboard building in the future with a more rich grid & layout system.
We plan to further improve dashboard building in the future with a more rich grid and layout system.
### Keyboard shortcuts
......@@ -162,7 +162,7 @@ Some nice navigation shortcuts are:
<div class="clearfix"></div>
## Upgrade & Breaking changes
## Upgrade and Breaking changes
There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade its db
schema on restart. It's advisable to do a backup of Grafana's database before updating.
......
docs/sources/guides/whats-new-in-v5-1.md
+++
title = "What's New in Grafana v5.1"
description = "Feature & improvement highlights for Grafana v5.1"
description = "Feature and improvement highlights for Grafana v5.1"
keywords = ["grafana", "new", "documentation", "5.1"]
type = "docs"
[menu.docs]
......@@ -17,8 +17,8 @@ Grafana v5.1 brings new features, many enhancements and bug fixes. This article
* [Improved scrolling experience]({{< relref "#improved-scrolling-experience" >}})
* [Improved docker image]({{< relref "#improved-docker-image-breaking-change" >}}) with a breaking change!
* [Heatmap support for Prometheus]({{< relref "#prometheus" >}})
* [Microsoft SQL Server]({{< relref "#microsoft-sql-server" >}}) as metric & table data source!
* [Dashboards & Panels]({{< relref "#dashboards-panels" >}}) Improved adding panels to dashboards and enhancements to Graph and Table panels.
* [Microsoft SQL Server]({{< relref "#microsoft-sql-server" >}}) as metric and table data source!
* [Dashboards and Panels]({{< relref "#dashboards-panels" >}}) Improved adding panels to dashboards and enhancements to Graph and Table panels.
* [New variable interpolation syntax]({{< relref "#new-variable-interpolation-syntax" >}})
* [Improved workflow for provisioned dashboards]({{< relref "#improved-workflow-for-provisioned-dashboards" >}})
......@@ -67,7 +67,7 @@ Please read [Using Microsoft SQL Server in Grafana documentation](/features/data
<div class="clearfix"></div>
## Dashboards & Panels
## Dashboards and Panels
### Adding new panels to dashboards
......
docs/sources/guides/whats-new-in-v5-2.md
+++
title = "What's New in Grafana v5.2"
description = "Feature & improvement highlights for Grafana v5.2"
description = "Feature and improvement highlights for Grafana v5.2"
keywords = ["grafana", "new", "documentation", "5.2"]
type = "docs"
[menu.docs]
......@@ -21,7 +21,7 @@ Grafana v5.2 brings new features, many enhancements and bug fixes. This article
- [Prometheus]({{< relref "#prometheus" >}}) with alignment enhancements
- [InfluxDB]({{< relref "#influxdb" >}}) now supports the `mode` function
- [Alerting]({{< relref "#alerting" >}}) with alert notification channel type for Discord
- [Dashboards & Panels]({{< relref "#dashboards-panels" >}}) with save & import enhancements
- [Dashboards and Panels]({{< relref "#dashboards-panels" >}}) with save and import enhancements
## Elasticsearch alerting
......@@ -68,7 +68,7 @@ The InfluxDB data source now includes support for the *mode* function which retu
By popular demand Grafana now includes support for an alert notification channel type for [Discord](https://discordapp.com/).
## Dashboards & Panels
## Dashboards and Panels
### Modified time range and variables are no longer saved by default
......
docs/sources/guides/whats-new-in-v5-3.md
+++
title = "What's New in Grafana v5.3"
description = "Feature & improvement highlights for Grafana v5.3"
description = "Feature and improvement highlights for Grafana v5.3"
keywords = ["grafana", "new", "documentation", "5.3"]
type = "docs"
[menu.docs]
......@@ -45,7 +45,7 @@ Please read [Using Google Stackdriver in Grafana](/features/datasources/stackdri
{{< docs-imagebox img="/img/docs/v53/tv_mode_still.png" max-width="600px" class="docs-image--no-shadow docs-image--right" animated-gif="/img/docs/v53/tv_mode.gif" >}}
We've improved the TV & kiosk mode to make it easier to use. There's now an icon in the top bar that will let you cycle through the different view modes.
We've improved the TV and kiosk mode to make it easier to use. There's now an icon in the top bar that will let you cycle through the different view modes.
1. In the first view mode, the sidebar and most of the buttons in the top bar will be hidden.
2. In the second view mode, the top bar is completely hidden so that only the dashboard itself is shown.
......
docs/sources/guides/whats-new-in-v5-4.md
+++
title = "What's New in Grafana v5.4"
description = "Feature & improvement highlights for Grafana v5.4"
description = "Feature and improvement highlights for Grafana v5.4"
keywords = ["grafana", "new", "documentation", "5.4"]
type = "docs"
[menu.docs]
......
docs/sources/guides/whats-new-in-v5.md
+++
title = "What's New in Grafana v5.0"
description = "Feature & improvement highlights for Grafana v5.0"
description = "Feature and improvement highlights for Grafana v5.0"
keywords = ["grafana", "new", "documentation", "5.0"]
type = "docs"
[menu.docs]
......@@ -23,7 +23,7 @@ This is the most substantial update that Grafana has ever seen. This article wil
- [Data source provisioning]({{< relref "#data-sources" >}}) makes it possible to setup data sources via config files.
- [Dashboard provisioning]({{< relref "#dashboards" >}}) makes it possible to setup dashboards via config files.
- [Persistent dashboard url's]({{< relref "#dashboard-model-persistent-url-s-and-api-changes" >}}) makes it possible to rename dashboards without breaking links.
- [Graphite Tags & Integrated Function Docs]({{< relref "#graphite-tags-integrated-function-docs" >}}).
- [Graphite Tags and Integrated Function Docs]({{< relref "#graphite-tags-integrated-function-docs" >}}).
### Video showing new features
......@@ -90,7 +90,7 @@ We hope to do more with teams in future releases like integration with LDAP and
You can assign permissions to folders and dashboards. The default user role-based permissions can be removed and
replaced with specific teams or users enabling more control over what a user can see and edit.
Dashboard permissions only limits what dashboards & folders a user can view & edit not which
Dashboard permissions only limits what dashboards and folders a user can view and edit not which
data sources a user can access nor what queries a user can issue.
<div class="clearfix"></div>
......@@ -118,7 +118,7 @@ which makes it possible to star them, use one as the home dashboard, set permiss
expects the dashboards to exist in the database. More info in the [dashboard provisioning docs](/administration/provisioning/#dashboards)
## Graphite Tags & Integrated Function Docs
## Graphite Tags and Integrated Function Docs
{{< docs-imagebox img="/img/docs/v50/graphite_tags.png" max-width="1000px" class="docs-image--right" >}}
......
docs/sources/guides/whats-new-in-v6-0.md
+++
title = "What's New in Grafana v6.0"
description = "Feature & improvement highlights for Grafana v6.0"
description = "Feature and improvement highlights for Grafana v6.0"
keywords = ["grafana", "new", "documentation", "6.0"]
type = "docs"
[menu.docs]
......@@ -48,7 +48,7 @@ enabled jumping between metrics query and logs query with preserved label filter
### Explore splits
Explore supports splitting the view so you can compare different queries, different data sources and metrics & logs side by side!
Explore supports splitting the view so you can compare different queries, different data sources and metrics and logs side by side!
{{< docs-imagebox img="/img/docs/v60/explore_split.png" max-width="800px" caption="Screenshot of the new Explore option in the panel menu" >}}
......@@ -56,7 +56,7 @@ Explore supports splitting the view so you can compare different queries, differ
### Explore and Grafana Loki
The log exploration & visualization features in Explore are available to any data source but are currently only implemented by the new open source log
The log exploration and visualization features in Explore are available to any data source but are currently only implemented by the new open source log
aggregation system from Grafana Lab called [Grafana Loki](https://github.com/grafana/loki).
Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective, as it does not index the contents of the logs, but rather a set of labels for each log stream. The logs from Loki are queried in a similar way to querying with label selectors in Prometheus. It uses labels to group log streams which can be made to match up with your Prometheus labels.
......@@ -102,7 +102,7 @@ continue to refine and start using in other panels.
<br>
### React Panels & Query Editors
### React Panels and Query Editors
A major part of all the work that has gone into Grafana v6.0 has been on the migration to React. This investment
is part of the future-proofing of Grafana's code base and ecosystem. Starting in v6.0 **Panels** and **Data
......@@ -130,7 +130,7 @@ Please read [Using Azure Monitor in Grafana documentation](/features/datasources
Grafana now has support for provisioning alert notifiers from configuration files, allowing operators to provision notifiers without using the UI or the API. A new field called `uid` has been introduced which is a string identifier that the administrator can set themselves. This is the same kind of identifier used for dashboards since v5.0. This feature makes it possible to use the same notifier configuration in multiple environments and refer to notifiers in dashboard json by a string identifier instead of the numeric id which depends on insert order and how many notifiers exist in the instance.
## Easier to deploy & improved security
## Easier to deploy and improved security
Grafana 6.0 removes the need to configure and set up additional storage for [user sessions](/tutorials/ha_setup/#user-sessions). This should make it easier to deploy and operate Grafana in a
high availability setup and/or if you're using a stateless user session store like Redis, Memcache, Postgres or MySQL.
......
docs/sources/guides/whats-new-in-v6-1.md
+++
title = "What's New in Grafana v6.1"
description = "Feature & improvement highlights for Grafana v6.1"
description = "Feature and improvement highlights for Grafana v6.1"
keywords = ["grafana", "new", "documentation", "6.1"]
type = "docs"
[menu.docs]
......
docs/sources/guides/whats-new-in-v6-2.md
+++
title = "What's New in Grafana v6.2"
description = "Feature & improvement highlights for Grafana v6.2"
description = "Feature and improvement highlights for Grafana v6.2"
keywords = ["grafana", "new", "documentation", "6.2"]
type = "docs"
[menu.docs]
......@@ -46,7 +46,7 @@ Gauge panel and shares almost all it's options. The main difference is that the
vertical space much better and can be more efficiently stacked both vertically and horizontally. The Bar Gauge also
comes with 3 unique display modes, Basic, Gradient, and Retro LED. Read the
[preview article](https://grafana.com/blog/2019/04/11/sneak-preview-of-new-visualizations-coming-to-grafana/) to learn
more about the design & features of this new panel.
more about the design and features of this new panel.
Retro LED display mode
{{< docs-imagebox img="/assets/img/blog/bargauge/bar_gauge_retro_led.jpg" max-width="800px" caption="Bar Gauge LED mode" >}}
......@@ -56,8 +56,8 @@ Gradient mode
## Improved table data support
We have been working on improving table support in our new react panels (Gauge & Bar Gauge) and this is ongoing work
that will eventually come to the new Graph & Singlestat & Table panels we are working on. But you can see it already in
We have been working on improving table support in our new react panels (Gauge and Bar Gauge) and this is ongoing work
that will eventually come to the new Graph and Singlestat and Table panels we are working on. But you can see it already in
the Gauge and Bar Gauge panels. Without any config, you can visualize any number of columns or choose to visualize each
row as its own gauge.
......
docs/sources/guides/whats-new-in-v6-3.md
+++
title = "What's New in Grafana v6.3"
description = "Feature & improvement highlights for Grafana v6.3"
description = "Feature and improvement highlights for Grafana v6.3"
keywords = ["grafana", "new", "documentation", "6.3"]
type = "docs"
[menu.docs]
......@@ -45,7 +45,7 @@ allows you to view lines before and after the line of interest.
### Elasticsearch logs support
This release adds support for searching & visualizing logs stored in Elasticsearch in the Explore mode. With a special
This release adds support for searching and visualizing logs stored in Elasticsearch in the Explore mode. With a special
simplified query interface specifically designed for logs search.
{{< docs-imagebox img="/img/docs/v63/elasticsearch_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
......@@ -54,7 +54,7 @@ Please read [Using Elasticsearch in Grafana](/features/datasources/elasticsearch
### InfluxDB logs support
This release adds support for searching & visualizing logs stored in InfluxDB in the Explore mode. With a special
This release adds support for searching and visualizing logs stored in InfluxDB in the Explore mode. With a special
simplified query interface specifically designed for logs search.
{{< docs-imagebox img="/img/docs/v63/influxdb_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
......
docs/sources/guides/whats-new-in-v6-4.md
+++
title = "What's New in Grafana v6.4"
description = "Feature & improvement highlights for Grafana v6.4"
description = "Feature and improvement highlights for Grafana v6.4"
keywords = ["grafana", "new", "documentation", "6.4"]
type = "docs"
[menu.docs]
......@@ -33,7 +33,7 @@ Some of those new capabilities can already be seen in this release, like sharing
- [**LDAP:** Debug UI]({{< relref "#ldap-debug-ui" >}})
- [**Enterprise**: Reporting]({{< relref "#reporting" >}})
- [**Enterprise**: GitLab OAuth Team Sync support]({{< relref "#gitlab-oauth-team-sync-support" >}})
- [**Enterprise**: Teams & LDAP Improvements]({{< relref "#ldap-teams" >}})
- [**Enterprise**: Teams and LDAP Improvements]({{< relref "#ldap-teams" >}})
### Go back to dashboard from Explore
......@@ -73,7 +73,7 @@ Limitations: Even though Live tailing can be enabled on logs panels in dashboard
With Grafana 6.3 we introduced a new way of creating [Data Links](https://grafana.com/blog/2019/08/27/new-in-grafana-6.3-easy-to-use-data-links/).
Grafana 6.4 improves Data Links and adds them to the Gauge and Bar Gauge and panels.
With Data Links you can define dynamic links to other dashboards and systems. The link can now reference template variables and query results like series name & labels, field name, value and time.
With Data Links you can define dynamic links to other dashboards and systems. The link can now reference template variables and query results like series name and labels, field name, value and time.
Read more about Data Links and what you can do with them in [documentation](https://grafana.com/docs/features/panels/graph/#data-link)
......
docs/sources/http_api/annotations.md
......@@ -127,7 +127,7 @@ Content-Type: application/json
```
> The response for this HTTP request is slightly different in versions prior to v6.4. In prior versions you would
also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time &
also get an endId if you where creating a region. But in 6.4 regions are represented using a single event with time and
timeEnd properties.
## Create Annotation in Graphite format
......
docs/sources/installation/configuration.md
......@@ -460,7 +460,7 @@ If enabled and user is not anonymous, data proxy will add X-Grafana-User header
When enabled Grafana will send anonymous usage statistics to
`stats.grafana.org`. No IP addresses are being tracked, only simple counters to
track running instances, versions, dashboard & error counts. It is very helpful
track running instances, versions, dashboard and error counts. It is very helpful
to us, so please leave this enabled. Counters are sent every 24 hours. Default
value is `true`.
......
docs/sources/installation/migrating_to2.md
+++
title = "Migrating from older versions"
description = "Upgrading & Migrating Grafana from older versions"
description = "Upgrading and Migrating Grafana from older versions"
keywords = ["grafana", "configuration", "documentation", "migration"]
type = "docs"
+++
......
docs/sources/installation/troubleshooting.md
......@@ -11,11 +11,11 @@ weight = 8
# Troubleshooting
## Visualization & Query issues
## Visualization and Query issues
{{< imgbox max-width="40%" img="/img/docs/v45/query_inspector.png" caption="Query Inspector" >}}
The most common problems are related to the query & response from you data source. Even if it looks
The most common problems are related to the query and response from you data source. Even if it looks
like a bug or visualization issue in Grafana it is 99% of time a problem with the data source query or
the data source response.
......@@ -28,7 +28,7 @@ older versions of Grafana read the [how troubleshoot metric query issue](https:/
If you encounter an error or problem it is a good idea to check the grafana server log. Usually
located at `/var/log/grafana/grafana.log` on unix systems or in `<grafana_install_dir>/data/log` on
other platforms & manual installs.
other platforms and manual installs.
You can enable more logging by changing log level in you grafana configuration file.
......
docs/sources/installation/upgrading.md
......@@ -13,7 +13,7 @@ weight = 10
# Upgrading Grafana
We recommend everyone to upgrade Grafana often to stay up to date with the latest fixes and enhancements.
In order make this a reality Grafana upgrades are backward compatible and the upgrade process is simple & quick.
In order make this a reality Grafana upgrades are backward compatible and the upgrade process is simple and quick.
Upgrading is generally always safe (between many minor and one major version) and dashboards and graphs will look the same. There can be minor breaking changes in some edge cases which are usually outlined in the [Release Notes](https://community.grafana.com/c/releases) and [Changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
......
docs/sources/permissions/dashboard_folder_permissions.md
+++
title = "Dashboard & Folder Permissions"
description = "Grafana Dashboard & Folder Permissions Guide "
title = "Dashboard and Folder Permissions"
description = "Grafana Dashboard and Folder Permissions Guide "
keywords = ["grafana", "configuration", "documentation", "dashboard", "folder", "permissions", "teams"]
type = "docs"
[menu.docs]
name = "Dashboard & Folder"
name = "Dashboard and Folder"
identifier = "dashboard-folder-permissions"
parent = "permissions"
weight = 3
+++
# Dashboard & Folder Permissions
# Dashboard and Folder Permissions
{{< docs-imagebox img="/img/docs/v50/folder_permissions.png" max-width="500px" class="docs-image--right" >}}
For dashboards and dashboard folders there is a **Permissions** page that make it possible to
remove the default role based permissions for Editors and Viewers. On this page you can add and assign permissions to specific **Users** and **Teams**.
You can assign & remove permissions for **Organization Roles**, **Users** and **Teams**.
You can assign and remove permissions for **Organization Roles**, **Users** and **Teams**.
Permission levels:
- **Admin**: Can edit & create dashboards and edit permissions.
- **Edit**: Can edit & create dashboards. **Cannot** edit folder/dashboard permissions.
- **Admin**: Can edit and create dashboards and edit permissions.
- **Edit**: Can edit and create dashboards. **Cannot** edit folder/dashboard permissions.
- **View**: Can only view existing dashboards/folders.
## Restricting Access
......
docs/sources/permissions/organization_roles.md
......@@ -19,13 +19,13 @@ in that organization.
Can do everything scoped to the organization. For example:
- Add & Edit data sources.
- Add & Edit organization users & teams.
- Configure App plugins & set org settings.
- Add and Edit data sources.
- Add and Edit organization users and teams.
- Configure App plugins and set org settings.
## Editor Role
- Can create and modify dashboards & alert rules. This can be disabled on specific folders and dashboards.
- Can create and modify dashboards and alert rules. This can be disabled on specific folders and dashboards.
- **Cannot** create or edit data sources nor invite new users.
This role can be tweaked via Grafana server setting [editors_can_admin]({{< relref "installation/configuration.md#editors_can_admin" >}}). If you set this to true users
......@@ -37,5 +37,5 @@ with **Editor** can also administrate dashboards, folders and teams they create.
- **Cannot** create or edit dashboards nor data sources.
This role can be tweaked via Grafana server setting [viewers_can_edit]({{< relref "installation/configuration.md#viewers-can-edit" >}}). If you set this to true users
with **Viewer** can also make transient dashboard edits, meaning they can modify panels & queries but not save the changes (nor create new dashboards).
Useful for public Grafana installations where you want anonymous users to be able to edit panels & queries but not save or create new dashboards.
with **Viewer** can also make transient dashboard edits, meaning they can modify panels and queries but not save the changes (nor create new dashboards).
Useful for public Grafana installations where you want anonymous users to be able to edit panels and queries but not save or create new dashboards.
docs/sources/permissions/overview.md
......@@ -30,9 +30,9 @@ Users can be belong to one or more organizations. A user's organization membersh
in that organization. Learn more about [Organization Roles]({{< relref "permissions/organization_roles.md" >}}).
## Dashboard & Folder Permissions
## Dashboard and Folder Permissions
Dashboard and folder permissions allows you to remove the default role based permissions for Editors and Viewers and assign permissions to specific **Users** and **Teams**. Learn more about [Dashboard & Folder Permissions]({{< relref "permissions/dashboard_folder_permissions.md" >}}).
Dashboard and folder permissions allows you to remove the default role based permissions for Editors and Viewers and assign permissions to specific **Users** and **Teams**. Learn more about [Dashboard and Folder Permissions]({{< relref "permissions/dashboard_folder_permissions.md" >}}).
## Data source permissions
......
docs/sources/project/building_from_source.md
......@@ -92,7 +92,7 @@ You'll also need to run `yarn start` to watch for changes to the front-end (type
- You can run backend Golang tests using `go test ./pkg/...`.
- Execute all frontend tests with `yarn test`
Writing & watching frontend tests
Writing and watching frontend tests
- Start watcher: `yarn jest`
- Jest will run all test files that end with the name ".test.ts"
......
docs/sources/reference/annotations.md
......@@ -37,7 +37,7 @@ max-width="600px" animated-gif="/img/docs/annotations/region-annotation.gif" >}}
After you added an annotation they will still be visible. This is due to the built in annotation query that exists on all dashboards. This annotation query will
fetch all annotation events that originate from the current dashboard and show them on the panel where they where created. This includes alert state history annotations. You can
stop annotations from being fetched & drawn by opening the **Annotations** settings (via Dashboard cogs menu) and modifying the query named `Annotations & Alerts (Built-in)`.
stop annotations from being fetched and drawn by opening the **Annotations** settings (via Dashboard cogs menu) and modifying the query named `Annotations & Alerts (Built-in)`.
When you copy a dashboard using the **Save As** feature it will get a new dashboard id so annotations created on source dashboard will no longer be visible on the copy. You
can still show them if you add a new **Annotation Query** and filter by tags. But this only works if the annotations on the source dashboard had tags to filter by.
......
docs/sources/reference/dashboard.md
......@@ -98,7 +98,7 @@ Panels are the building blocks of a dashboard. It consists of data source querie
}
```
### Panel size & position
### Panel size and position
The gridPos property describes the panel size and position in grid coordinates.
......
docs/sources/reference/dashboard_folders.md
......@@ -47,6 +47,6 @@ The Dashboard Folder Page is similar to the Manage Dashboards page and is where
Permissions can assigned to a folder and inherited by the containing dashboards. An Access Control List (ACL) is used where
**Organization Role**, **Team** and Individual **User** can be assigned permissions. Read the
[Dashboard & Folder Permissions]({{< relref "../permissions/dashboard_folder_permissions.md" >}}) docs for more detail
[Dashboard and Folder Permissions]({{< relref "../permissions/dashboard_folder_permissions.md" >}}) docs for more detail
on the permission system.
docs/sources/reference/export_import.md
+++
title = "Export & Import"
title = "Export and Import"
keywords = ["grafana", "dashboard", "documentation", "export", "import"]
type = "docs"
[menu.docs]
......@@ -47,7 +47,7 @@ Find dashboards for common server applications at [Grafana.com/dashboards](https
{{< docs-imagebox img="/img/docs/v50/gcom_dashboard_list.png" max-width="700px" >}}
## Import & Sharing with Grafana 2.x or 3.0
## Import and Sharing with Grafana 2.x or 3.0
Dashboards on Grafana.com use a new feature in Grafana 3.1 that allows the import process
to update each panel so that they are using a data source of your choosing. If you are running a
......
docs/sources/reference/templating.md
......@@ -106,7 +106,7 @@ Interpolation result: '("test1" OR "test2")'
```
### Percentencode
Formats single & multi valued variables for use in URL parameters.
Formats single and multi valued variables for use in URL parameters.
```bash
servers = ['foo()bar BAZ', 'test2']
......@@ -150,7 +150,7 @@ Type | Description
*Data source* | This type allows you to quickly change the data source for an entire Dashboard. Useful if you have multiple instances of a data source in for example different environments.
*Custom* | Define the variable options manually using a comma separated list.
*Constant* | Define a hidden constant. Useful for metric path prefixes for dashboards you want to share. During dashboard export, constant variables will be made into an import option.
*Ad hoc filters* | Very special kind of variable that only works with some data sources, InfluxDB & Elasticsearch currently. It allows you to add key/value filters that will automatically be added to all metric queries that use the specified data source.
*Ad hoc filters* | Very special kind of variable that only works with some data sources, InfluxDB and Elasticsearch currently. It allows you to add key/value filters that will automatically be added to all metric queries that use the specified data source.
*Text box* | This variable type will display as a free text input field with an optional default value.
### Query options
......@@ -273,7 +273,7 @@ needs to be escaped so that the value can contain lucene control words and quota
#### Formatting troubles
Automatic escaping & formatting can cause problems and it can be tricky to grasp the logic is behind it.
Automatic escaping and formatting can cause problems and it can be tricky to grasp the logic is behind it.
Especially for InfluxDB and Prometheus where the use of regex syntax requires that the variable is used in regex operator context.
If you do not want Grafana to do this automatic regex escaping and formatting your only option is to disable the *Multi-value* or *Include All option*
options.
......
docs/sources/reference/timerange.md
......@@ -55,7 +55,7 @@ From Dashboard settings, click the Timepicker tab. From here you can specify the
Grafana offers the ability to override the `now` value on a per dashboard basis. Most commonly, this feature is used to accommodate known delays in data aggregation to avoid null values.
## Panel time overrides & timeshift
## Panel time overrides and timeshift
You can override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. This allows you to show metrics from different time periods or days at the same time.
......
docs/sources/tutorials/screencasts.md
......@@ -17,7 +17,7 @@ weight = 10
</a>
<figcaption>
<a href="https://youtu.be/iUj6DwfBh88?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
#10 Dashboard Discovery & Sharing
#10 Dashboard Discovery and Sharing
</a>
</figcaption>
</figure>
......@@ -61,7 +61,7 @@ weight = 10
</a>
<figcaption>
<a href="https://youtu.be/9ZCMVNxUf6s?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
#6 Adding data sources, users & orgs.
#6 Adding data sources, users and orgs.
</a>
</figcaption>
</figure>
......@@ -72,7 +72,7 @@ weight = 10
</a>
<figcaption>
<a href="https://youtu.be/E-gMFv84FE8?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
#5 Install & Setup on Redhat / Centos
#5 Install and Setup on Redhat / Centos
</a>
</figcaption>
</figure>
......@@ -83,7 +83,7 @@ weight = 10
</a>
<figcaption>
<a href="https://youtu.be/JY22EBOR9hQ?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
#4 Install & Setup on Ubuntu / Debian
#4 Install and Setup on Ubuntu / Debian
</a>
</figcaption>
</figure>
......
docs/sources/tutorials/stack_guide_graphite.md
---
page_title: Graphite + Grafana + StatsD - Stack Setup Guide
page_description: Installation and configuration guide & how to for Grafana, Graphite & StatsD
page_description: Installation and configuration guide and how to for Grafana, Graphite and StatsD
page_keywords: grafana, tutorials, graphite, statsd, setup, configuration, howto, installation
author: Torkel Ödegaard
---
# Stack Setup & Config Guide: Graphite + Grafana + StatsD
# Stack Setup and Config Guide: Graphite + Grafana + StatsD
This lengthy article will guide you through installation, configuration and getting started with the amazing metric
stack that is composed of Graphite, Grafana and StatsD.
Graphite is still king when it comes to time series databases due to its simple data model, ingestion
with integrated aggregation & rollups, amazing query features and speed. No other time series
with integrated aggregation and rollups, amazing query features and speed. No other time series
database has yet to match Graphite's query flexibility and analytics potential.
Graphite has a reputation for being tricky to install and scale. This guide aims to show
......@@ -36,7 +36,7 @@ queries that will make the most out of your collected metrics.
### Carbon
Graphite & Carbon are written in python, so we will start by installing python packages.
Graphite and Carbon are written in python, so we will start by installing python packages.
```
apt-get install \
......
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