diff --git a/docs/sources/plugins/catalog.md b/docs/sources/plugins/catalog.md
index 0be50c2cc62..85ba05a6f3e 100644
--- a/docs/sources/plugins/catalog.md
+++ b/docs/sources/plugins/catalog.md
@@ -6,7 +6,7 @@ weight = 1
# Plugin catalog
-The Plugin catalog allows users to browse and manage plugins from within Grafana. Only Organization Admins who are also Grafana Server Admins can access and use the catalog.
+The plugin catalog allows you to browse and manage plugins from within Grafana. Only a Grafana server administrator can access and use the catalog.
- {!searchQuery && (
-
- <>
-
-
- Note that unsigned front-end data source plugins are still usable, but this is subject to change in
- the upcoming releases of Grafana.
-
- >
-
- )}
+ {!searchQuery && }
{searchQuery && this.renderPlugins(plugins)}
{!searchQuery && this.renderCategories()}
diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx
index 5f0f123abe0..7d843545e72 100644
--- a/public/app/features/plugins/PluginListPage.tsx
+++ b/public/app/features/plugins/PluginListPage.tsx
@@ -64,16 +64,7 @@ export const PluginListPage: React.FC
= ({
placeholder="Search by name, author, description or type"
target={actionTarget}
/>
-
-
- <>
-
-
- Note that unsigned front-end datasource and panel plugins are still usable, but this is
- subject to change in the upcoming releases of Grafana
-
- >
-
+
{hasFetched && plugins && }
>
diff --git a/public/app/features/plugins/PluginPage.tsx b/public/app/features/plugins/PluginPage.tsx
index dcda8969185..46e0f44466b 100644
--- a/public/app/features/plugins/PluginPage.tsx
+++ b/public/app/features/plugins/PluginPage.tsx
@@ -311,7 +311,7 @@ class PluginPage extends PureComponent {
Grafana Labs checks each plugin to verify that it has a valid digital signature. Plugin signature verification
- is part of our security measures to ensure plugins are safe and trustworthy.
+ is part of our security measures to ensure plugins are safe and trustworthy.{' '}
{!isSignatureValid &&
'Grafana Labs can’t guarantee the integrity of this unsigned plugin. Ask the plugin author to request it to be signed.'}
diff --git a/public/app/features/plugins/PluginsErrorsInfo.tsx b/public/app/features/plugins/PluginsErrorsInfo.tsx
index 6e1f5989c56..18c1bfd4b1c 100644
--- a/public/app/features/plugins/PluginsErrorsInfo.tsx
+++ b/public/app/features/plugins/PluginsErrorsInfo.tsx
@@ -47,16 +47,8 @@ export const PluginsErrorsInfoUnconnected: React.FC = ({
>
- We have encountered{' '}
-
- data source backend plugins
- {' '}
- that are unsigned. Grafana Labs cannot guarantee the integrity of unsigned plugins and recommends using signed
- plugins only.
+ Unsigned plugins were found during plugin initialization. Grafana Labs cannot guarantee the integrity of these
+ plugins. We recommend only using signed plugins.
The following plugins are disabled and not shown in the list below: