From 02e1181c3bb3dbc01c5ddd08813ac7b38f2ae5f2 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 24 Apr 2023 16:07:09 +0100
Subject: [PATCH] [v9.5.x] Cloudwatch Logs: Clarify Cloudwatch Logs Limits
 (#67101)

Cloudwatch Logs: Clarify Cloudwatch Logs Limits (#67072)

Clarify Cloudwatch Logs Limits

(cherry picked from commit 5f16cd5124ca3ab81afd3d2dddf484591d3022f0)

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
---
 .../cloudwatch/components/ConfigEditor.tsx        |  4 ++--
 .../components/LogGroups/LogGroupsSelector.tsx    | 15 +++++++++++++--
 .../datasource/cloudwatch/components/styles.ts    |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
index 17229ff62b4..7f647403340 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx
@@ -74,9 +74,9 @@ export const ConfigEditor = (props: Props) => {
       <h3 className="page-heading">CloudWatch Logs</h3>
       <div className="gf-form-group">
         <InlineField
-          label="Timeout"
+          label="Retry Timeout"
           labelWidth={28}
-          tooltip='Custom timeout for CloudWatch Logs insights queries which have max concurrency limits. Default is 15 minutes. Must be a valid duration string, such as "15m" "30s" "2000ms" etc.'
+          tooltip='Cloudwatch Logs allows for a maximum of 30 concurrent queries. If Grafana hits a concurrent max query error from Cloudwatch Logs it will auto-retry requesting a query for up to 30min. This retry timeout strategy is configurable. Must be a valid duration string, such as "15m" "30s" "2000ms" etc.'
           invalid={Boolean(logsTimeoutError)}
         >
           <Input
diff --git a/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
index a9949551ea4..e4e53f8e92a 100644
--- a/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/LogGroups/LogGroupsSelector.tsx
@@ -139,11 +139,22 @@ export const LogGroupsSelector = ({
         <div>
           {!isLoading && selectableLogGroups.length >= 25 && (
             <>
-              <Label className={styles.limitLabel}>
+              <div className={styles.limitLabel}>
                 <Icon name="info-circle"></Icon>
                 Only the first 50 results can be shown. If you do not see an expected log group, try narrowing down your
                 search.
-              </Label>
+                <p>
+                  A{' '}
+                  <a
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html"
+                  >
+                    maximum{' '}
+                  </a>{' '}
+                  of 50 Cloudwatch log groups can be queried at one time.
+                </p>
+              </div>
               <Space layout="block" v={1} />
             </>
           )}
diff --git a/public/app/plugins/datasource/cloudwatch/components/styles.ts b/public/app/plugins/datasource/cloudwatch/components/styles.ts
index 6a5da27adde..4d69dd7a07e 100644
--- a/public/app/plugins/datasource/cloudwatch/components/styles.ts
+++ b/public/app/plugins/datasource/cloudwatch/components/styles.ts
@@ -26,6 +26,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     svg: {
       marginRight: theme.spacing(0.5),
     },
+    fontSize: 12,
   }),
 
   logGroupCountLabel: css({