From cfa2df790d80c57f8b5b670246231cda5666e13d Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@elastic.co>
Date: Fri, 15 Oct 2021 18:08:26 +0900
Subject: [PATCH] [Stack Monitoring] fix beats pages test-subj attributes
 (#114835) (#115138)

* fix beats pages test-subj attributes

* fix eslint errors

Co-authored-by: Kevin Lacabane <kevin.lacabane@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/application/pages/beats/beats_template.tsx    | 2 ++
 .../public/application/pages/beats/instances.tsx         | 7 +------
 .../public/application/pages/beats/overview.tsx          | 9 ++-------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
index 3bab01af8ceb71..7a070c735bbea4 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
@@ -23,6 +23,7 @@ export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ instance, ...props
         defaultMessage: 'Overview',
       }),
       route: '/beats',
+      testSubj: 'beatsOverviewPage',
     });
     tabs.push({
       id: 'instances',
@@ -30,6 +31,7 @@ export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ instance, ...props
         defaultMessage: 'Instances',
       }),
       route: '/beats/beats',
+      testSubj: 'beatsListingPage',
     });
   } else {
     tabs.push({
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
index 489ad110c40fde..4611f17159621d 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -71,12 +71,7 @@ export const BeatsInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
   ]);
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="beatsListingPage"
-    >
+    <BeatsTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
       <div data-test-subj="monitoringBeatsInstancesApp">
         <SetupModeRenderer
           productName={BEATS_SYSTEM_ID}
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
index 1fa37a2c7b3e69..aec89c92055c45 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -72,13 +72,8 @@ export const BeatsOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
   };
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="beatsOverviewPage"
-    >
-      <div data-test-subj="beatsOverviewPage">{renderOverview(data)}</div>
+    <BeatsTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
+      <div>{renderOverview(data)}</div>
     </BeatsTemplate>
   );
 };