From 1c5f2b35abc8aa2bb69ec4bd63006fbf3f6bfa6c Mon Sep 17 00:00:00 2001
From: klacabane <kevin.lacabane@elastic.co>
Date: Wed, 13 Oct 2021 17:24:36 +0200
Subject: [PATCH 1/2] fix beats pages test-subj attributes

---
 .../public/application/pages/beats/beats_template.tsx          | 2 ++
 .../monitoring/public/application/pages/beats/instances.tsx    | 1 -
 .../monitoring/public/application/pages/beats/overview.tsx     | 3 +--
 3 files changed, 3 insertions(+), 3 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 3bab01af8ceb7..7a070c735bbea 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 489ad110c40fd..de940a564bf7e 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -75,7 +75,6 @@ export const BeatsInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
       title={title}
       pageTitle={pageTitle}
       getPageData={getPageData}
-      data-test-subj="beatsListingPage"
     >
       <div data-test-subj="monitoringBeatsInstancesApp">
         <SetupModeRenderer
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 1fa37a2c7b3e6..6431b9c46c08a 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -76,9 +76,8 @@ export const BeatsOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
       title={title}
       pageTitle={pageTitle}
       getPageData={getPageData}
-      data-test-subj="beatsOverviewPage"
     >
-      <div data-test-subj="beatsOverviewPage">{renderOverview(data)}</div>
+      <div>{renderOverview(data)}</div>
     </BeatsTemplate>
   );
 };

From 638192987d3529b39ed8fda48d651d1010b0a415 Mon Sep 17 00:00:00 2001
From: klacabane <kevin.lacabane@elastic.co>
Date: Wed, 13 Oct 2021 18:53:50 +0200
Subject: [PATCH 2/2] fix eslint errors

---
 .../monitoring/public/application/pages/beats/instances.tsx | 6 +-----
 .../monitoring/public/application/pages/beats/overview.tsx  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

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 de940a564bf7e..4611f17159621 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -71,11 +71,7 @@ export const BeatsInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
   ]);
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-    >
+    <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 6431b9c46c08a..aec89c92055c4 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -72,11 +72,7 @@ export const BeatsOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
   };
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-    >
+    <BeatsTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
       <div>{renderOverview(data)}</div>
     </BeatsTemplate>
   );