From 4227984591c539f85a23cb56e32ef92a63dd1595 Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:44:39 -0400
Subject: [PATCH 1/2] [Ingest Pipelines] Add descriptions for ingest processors
 T-U

---
 .../manage_processor_form/processors/trim.tsx  |  2 +-
 .../processors/uppercase.tsx                   |  5 ++++-
 .../processors/url_decode.tsx                  |  2 +-
 .../processors/user_agent.tsx                  | 18 +++++++++++++++---
 .../shared/map_processor_type_to_form.tsx      | 12 ++++++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/trim.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/trim.tsx
index aca5a3b4121b5c..18f3e84fb27061 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/trim.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/trim.tsx
@@ -17,7 +17,7 @@ export const Trim: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.trimForm.fieldNameHelpText',
-          { defaultMessage: 'The field to trim whitespace from.' }
+          { defaultMessage: 'Field to trim. For an array of strings, each element is trimmed.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/uppercase.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/uppercase.tsx
index 336b68f8c2b7bd..e32b75a2151553 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/uppercase.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/uppercase.tsx
@@ -17,7 +17,10 @@ export const Uppercase: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.uppercaseForm.fieldNameHelpText',
-          { defaultMessage: 'The field to make uppercase.' }
+          {
+            defaultMessage:
+              'Field to uppercase. For an array of strings, each element is uppercased.',
+          }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/url_decode.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/url_decode.tsx
index 196645a89f7071..2cccdec9b88854 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/url_decode.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/url_decode.tsx
@@ -17,7 +17,7 @@ export const UrlDecode: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.urlDecodeForm.fieldNameHelpText',
-          { defaultMessage: 'The field to decode.' }
+          { defaultMessage: 'Field to decode. For an array of strings, each element is decoded.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/user_agent.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/user_agent.tsx
index 8395833c09f285..a7866d08ef022e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/user_agent.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/user_agent.tsx
@@ -5,6 +5,8 @@
  */
 
 import React, { FunctionComponent } from 'react';
+import { EuiCode } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
@@ -39,7 +41,7 @@ const fieldsConfig: FieldsConfig = {
       'xpack.ingestPipelines.pipelineEditor.userAgentForm.regexFileFieldHelpText',
       {
         defaultMessage:
-          'A filename containing the regular expressions for parsing the user agent string.',
+          'File containing the regular expressions used to parse the user agent string.',
       }
     ),
   },
@@ -51,13 +53,23 @@ export const UserAgent: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.userAgentForm.fieldNameHelpText',
-          { defaultMessage: 'The field containing the user agent string.' }
+          { defaultMessage: 'Field containing the user agent string.' }
         )}
       />
 
       <UseField config={fieldsConfig.regex_file} component={Field} path="fields.regex_file" />
 
-      <TargetField />
+      <TargetField
+        helpText={
+          <FormattedMessage
+            id="xpack.ingestPipelines.pipelineEditor.userAgentForm.targetFieldHelpText"
+            defaultMessage="Output field. Defaults to {defaultField}."
+            values={{
+              defaultField: <EuiCode inline>{'user_agent'}</EuiCode>,
+            }}
+          />
+        }
+      />
 
       <PropertiesField
         helpText={i18n.translate(
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
index 95a8d35c119a63..11485027221bc6 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
@@ -413,6 +413,9 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.trim', {
       defaultMessage: 'Trim',
     }),
+    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+      defaultMessage: 'Removes leading and trailing whitespace from a string.',
+    }),
   },
   uppercase: {
     FieldsComponent: Uppercase,
@@ -420,6 +423,9 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.uppercase', {
       defaultMessage: 'Uppercase',
     }),
+    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+      defaultMessage: 'Converts a string to uppercase.',
+    }),
   },
   urldecode: {
     FieldsComponent: UrlDecode,
@@ -427,6 +433,9 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.urldecode', {
       defaultMessage: 'URL decode',
     }),
+    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+      defaultMessage: 'Decodes a URL-encoded string.',
+    }),
   },
   user_agent: {
     FieldsComponent: UserAgent,
@@ -434,6 +443,9 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.userAgent', {
       defaultMessage: 'User agent',
     }),
+    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+      defaultMessage: "Extracts field values from a browser's user agent string.",
+    }),
   },
 };
 

From d536fec784f57640d363aac70f30c534f6b2ca19 Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Tue, 15 Sep 2020 11:10:25 -0400
Subject: [PATCH 2/2] Fix il8n IDs

---
 .../components/shared/map_processor_type_to_form.tsx   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
index 11485027221bc6..fdfbe131bd79ff 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/shared/map_processor_type_to_form.tsx
@@ -413,7 +413,7 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.trim', {
       defaultMessage: 'Trim',
     }),
-    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+    description: i18n.translate('xpack.ingestPipelines.processors.description.trim', {
       defaultMessage: 'Removes leading and trailing whitespace from a string.',
     }),
   },
@@ -423,7 +423,7 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.uppercase', {
       defaultMessage: 'Uppercase',
     }),
-    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+    description: i18n.translate('xpack.ingestPipelines.processors.description.uppercase', {
       defaultMessage: 'Converts a string to uppercase.',
     }),
   },
@@ -433,7 +433,7 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.urldecode', {
       defaultMessage: 'URL decode',
     }),
-    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
+    description: i18n.translate('xpack.ingestPipelines.processors.description.urldecode', {
       defaultMessage: 'Decodes a URL-encoded string.',
     }),
   },
@@ -443,8 +443,8 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
     label: i18n.translate('xpack.ingestPipelines.processors.label.userAgent', {
       defaultMessage: 'User agent',
     }),
-    description: i18n.translate('xpack.ingestPipelines.processors.description.split', {
-      defaultMessage: "Extracts field values from a browser's user agent string.",
+    description: i18n.translate('xpack.ingestPipelines.processors.description.userAgent', {
+      defaultMessage: "Extracts values from a browser's user agent string.",
     }),
   },
 };