From 94da3b2ad5f21803be2562ee637db18b6076d120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Fri, 6 Dec 2019 12:30:10 +0100
Subject: [PATCH 1/2] Fix broken aria references

`EuiDescribedFormGroup` needs an actual header in its `title` for it to
make a correct `aria-labelledby`.
---
 .../analysis_setup_indices_form.tsx                    | 10 ++++++----
 .../analysis_setup_timerange_form.tsx                  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_indices_form.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_indices_form.tsx
index 585a65b9ad1c8..a6ee2345d25eb 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_indices_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_indices_form.tsx
@@ -62,10 +62,12 @@ export const AnalysisSetupIndicesForm: React.FunctionComponent<{
     <EuiDescribedFormGroup
       idAria="indices"
       title={
-        <FormattedMessage
-          id="xpack.infra.analysisSetup.indicesSelectionTitle"
-          defaultMessage="Choose indices"
-        />
+        <h3>
+          <FormattedMessage
+            id="xpack.infra.analysisSetup.indicesSelectionTitle"
+            defaultMessage="Choose indices"
+          />
+        </h3>
       }
       description={
         <FormattedMessage
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
index 17f1aa48c87a2..02a25bf134fef 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
@@ -63,10 +63,12 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
     <EuiDescribedFormGroup
       idAria="timeRange"
       title={
-        <FormattedMessage
-          id="xpack.infra.analysisSetup.timeRangeTitle"
-          defaultMessage="Choose a time range"
-        />
+        <h3>
+          <FormattedMessage
+            id="xpack.infra.analysisSetup.timeRangeTitle"
+            defaultMessage="Choose a time range"
+          />
+        </h3>
       }
       description={
         <FormattedMessage

From 24c6d900bd31b51f09927fb599d000fabe7d581d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Fri, 6 Dec 2019 17:23:35 +0100
Subject: [PATCH 2/2] Fix `aria-labelledby` references in settings page

---
 .../fields_configuration_panel.tsx            | 50 +++++++++++--------
 .../indices_configuration_panel.tsx           | 22 ++++----
 .../name_configuration_panel.tsx              |  4 +-
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
index 771285e8ccee4..5f3d1a63e72eb 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
@@ -50,10 +50,12 @@ export const FieldsConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="timestampField"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.timestampFieldLabel"
-          defaultMessage="Timestamp"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.timestampFieldLabel"
+            defaultMessage="Timestamp"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
@@ -95,10 +97,12 @@ export const FieldsConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="tiebreakerField"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
-          defaultMessage="Tiebreaker"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+            defaultMessage="Tiebreaker"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
@@ -140,10 +144,12 @@ export const FieldsConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="containerField"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.containerFieldLabel"
-          defaultMessage="Container ID"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.containerFieldLabel"
+            defaultMessage="Container ID"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
@@ -185,10 +191,12 @@ export const FieldsConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="hostNameField"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
-          defaultMessage="Host name"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
+            defaultMessage="Host name"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
@@ -230,10 +238,12 @@ export const FieldsConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="podField"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.podFieldLabel"
-          defaultMessage="Pod ID"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.podFieldLabel"
+            defaultMessage="Pod ID"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
index 57863d8d2df82..e779b35975ec3 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
@@ -42,12 +42,14 @@ export const IndicesConfigurationPanel = ({
     </EuiTitle>
     <EuiSpacer size="m" />
     <EuiDescribedFormGroup
-      idAria="matricIndices"
+      idAria="metricIndices"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.metricIndicesTitle"
-          defaultMessage="Metric indices"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.metricIndicesTitle"
+            defaultMessage="Metric indices"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
@@ -90,10 +92,12 @@ export const IndicesConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="logIndices"
       title={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.logIndicesTitle"
-          defaultMessage="Log indices"
-        />
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.logIndicesTitle"
+            defaultMessage="Log indices"
+          />
+        </h4>
       }
       description={
         <FormattedMessage
diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/name_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/name_configuration_panel.tsx
index 7129097cff160..130f30717268c 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/name_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/name_configuration_panel.tsx
@@ -41,7 +41,9 @@ export const NameConfigurationPanel = ({
     <EuiDescribedFormGroup
       idAria="name"
       title={
-        <FormattedMessage id="xpack.infra.sourceConfiguration.nameLabel" defaultMessage="Name" />
+        <h4>
+          <FormattedMessage id="xpack.infra.sourceConfiguration.nameLabel" defaultMessage="Name" />
+        </h4>
       }
       description={
         <FormattedMessage