diff --git a/docs/sources/datasources/influxdb/_index.md b/docs/sources/datasources/influxdb/_index.md index fe6ea11ff13..5a11458f3be 100644 --- a/docs/sources/datasources/influxdb/_index.md +++ b/docs/sources/datasources/influxdb/_index.md @@ -35,7 +35,7 @@ These options apply if you are using the InfluxQL query language. If you are usi | `Access` | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser. | **Note**: Browser access is deprecated and will be removed in a future release. -`Whitelisted Cookies`| Cookies that will be forwarded to the data source. All other cookies will be deleted. +`Allowed cookies`| Cookies that will be forwarded to the data source. All other cookies will be deleted. `Database` | The ID of the bucket you want to query from, copied from the [Buckets page](https://docs.influxdata.com/influxdb/v2.0/organizations/buckets/view-buckets/) of the InfluxDB UI. `User` | The username you use to sign into InfluxDB. `Password` | The token you use to query the bucket above, copied from the [Tokens page](https://docs.influxdata.com/influxdb/v2.0/security/tokens/view-tokens/) of the InfluxDB UI. diff --git a/docs/sources/datasources/loki.md b/docs/sources/datasources/loki.md index b2863011828..58f5d48c4b1 100644 --- a/docs/sources/datasources/loki.md +++ b/docs/sources/datasources/loki.md @@ -20,13 +20,13 @@ You can run Loki on your own hardware or use [Grafana Cloud](https://grafana.com To access Loki settings, click the **Configuration** (gear) icon, then click **Data Sources**, and then click the Loki data source. -| Name | Description | -| --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `Name` | The data source name. This is how you refer to the data source in panels, queries, and Explore. | -| `Default` | Default data source that is pre-selected for new panels. | -| `URL` | URL of the Loki instance, e.g., `http://localhost:3100`. | -| `Whitelisted Cookies` | Grafana Proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source. | -| `Maximum lines` | Upper limit for the number of log lines returned by Loki (default is 1000). Lower this limit if your browser is sluggish when displaying logs in Explore. | +| Name | Description | +| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `Name` | The data source name. This is how you refer to the data source in panels, queries, and Explore. | +| `Default` | Default data source that is pre-selected for new panels. | +| `URL` | URL of the Loki instance, e.g., `http://localhost:3100`. | +| `Allowed cookies` | Grafana Proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source. | +| `Maximum lines` | Upper limit for the number of log lines returned by Loki (default is 1000). Lower this limit if your browser is sluggish when displaying logs in Explore. | > **Note:** To troubleshoot configuration and other issues, check the log file located at /var/log/grafana/grafana.log on Unix systems or in /data/log on other platforms and manual installations. diff --git a/docs/sources/datasources/opentsdb.md b/docs/sources/datasources/opentsdb.md index b5daf5df38c..7750aab7aa1 100644 --- a/docs/sources/datasources/opentsdb.md +++ b/docs/sources/datasources/opentsdb.md @@ -14,15 +14,15 @@ Grafana ships with advanced support for OpenTSDB. This topic explains options, v To access OpenTSDB settings, hover your mouse over the **Configuration** (gear) icon, then click **Data Sources**, and then click the OpenTSDB data source. -| Name | Description | -| --------------------- | --------------------------------------------------------------------------------------- | -| `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 OpenTSDB server (default port is usually 4242) | -| `Whitelisted Cookies` | List the names of cookies to forward to the data source. | -| `Version` | Version = opentsdb version, either <=2.1 or 2.2 | -| `Resolution` | Metrics from opentsdb may have datapoints with either second or millisecond resolution. | -| `Lookup Limit` | Default is 1000. | +| Name | Description | +| ------------------ | --------------------------------------------------------------------------------------- | +| `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 OpenTSDB server (default port is usually 4242) | +| `Allowed cookies` | List the names of cookies to forward to the data source. | +| `Version` | Version = opentsdb version, either <=2.1 or 2.2 | +| `Resolution` | Metrics from opentsdb may have datapoints with either second or millisecond resolution. | +| `Lookup limit` | Default is 1000. | ## Query editor diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx index 2b99623ac03..73c78e5d172 100644 --- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx +++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx @@ -163,7 +163,7 @@ export const DataSourceHttpSettings: React.FC = (props) => { width={13} tooltip="Grafana proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source." > - Accepted Cookies + Allowed cookies { />
- Lookup Limit + Lookup limit