From 87f39f60c14d6d8f8096d37a66361e37b77b4097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Mon, 18 Jan 2021 17:30:39 +0100 Subject: [PATCH] Jaeger: Remove browser access mode (#30349) * Jaeger: Remove browser access mode * Apply suggestions from code review Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update docs/sources/datasources/jaeger.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> --- docs/sources/datasources/jaeger.md | 17 ++++++++--------- .../plugins/datasource/jaeger/ConfigEditor.tsx | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/sources/datasources/jaeger.md b/docs/sources/datasources/jaeger.md index 546d383a7c3..993a92a17d0 100644 --- a/docs/sources/datasources/jaeger.md +++ b/docs/sources/datasources/jaeger.md @@ -15,15 +15,14 @@ Just add it as a data source and you are ready to query your traces in [Explore] To access Jaeger settings, click the **Configuration** (gear) icon, then click **Data Sources** > **Jaeger**. -| Name | Description | -| ------------ | ------------------------------------------------------------------------------------------------------------------------------------- | -| `Name` | The data source name. This is how you refer to the data source in panels, queries, and Explore. | -| `Default` | Data source will be pre-selected for new panels. | -| `URL` | The URL of the Jaeger instance, for example, `http://localhost:16686` | -| `Access` | Server (default) = URL needs to be accessible from the Grafana backend/server. Browser = URL needs to be accessible from the browser. | -| `Basic Auth` | Enable basic authentication to the Jaeger data source. | -| `User` | User name for basic authentication. | -| `Password` | Password for basic authentication. | +| Name | Description | +| ------------ | ---------------------------------------------------------------------- | +| `Name` | The data source name in panels, queries, and Explore. | +| `Default` | The pre-selected data source for a new panel. | +| `URL` | The URL of the Jaeger instance. For example, `http://localhost:16686`. | +| `Basic Auth` | Enable basic authentication for the Jaeger data source. | +| `User` | Specify a user name for basic authentication. | +| `Password` | Specify a password for basic authentication. | ### Trace to logs diff --git a/public/app/plugins/datasource/jaeger/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/ConfigEditor.tsx index b0e5f11c7cb..29d02ee1691 100644 --- a/public/app/plugins/datasource/jaeger/ConfigEditor.tsx +++ b/public/app/plugins/datasource/jaeger/ConfigEditor.tsx @@ -11,7 +11,7 @@ export const ConfigEditor: React.FC = ({ options, onOptionsChange }) => {