From d35f9f7ec2b114dfbc7e8e42bf35cfc608009214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Mon, 18 Jan 2021 17:31:32 +0100
Subject: [PATCH] Zipkin: Remove browser access mode (#30360)

* Zipkin: Remove browser access mode

* Update zipkin.md
---
 docs/sources/datasources/zipkin.md              | 17 ++++++++---------
 .../plugins/datasource/zipkin/ConfigEditor.tsx  |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/sources/datasources/zipkin.md b/docs/sources/datasources/zipkin.md
index e27de588560..74cb19944a4 100644
--- a/docs/sources/datasources/zipkin.md
+++ b/docs/sources/datasources/zipkin.md
@@ -15,15 +15,14 @@ Just add it as a data source and you are ready to query your traces in [Explore]
 
 To access Zipkin settings, click the **Configuration** (gear) icon, then click **Data Sources** > **Zipkin**.
 
-| 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 Zipkin instance, e.g., `http://localhost:9411`.                                                                        |
-| `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 Zipkin 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 Zipkin instance. For example, `http://localhost:9411`. |
+| `Basic Auth` | Enable basic authentication for the Zipkin 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/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
index d58403456c4..d92190b6e53 100644
--- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
@@ -11,7 +11,7 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
       <DataSourceHttpSettings
         defaultUrl="http://localhost:9411"
         dataSourceConfig={options}
-        showAccessOptions={true}
+        showAccessOptions={false}
         onChange={onOptionsChange}
       />