Docs: Replace ampersands with and (#19609)
This commit is contained in:
committed by
Marcus Olsson
parent
4b042c89fe
commit
618652d16e
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
+++
|
||||
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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user