From 70dfe4f942067b8f6535568ad7acbe5ad6be238a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 29 Nov 2021 12:10:14 -0500
Subject: [PATCH] Transformations: Clarify behaviour of `Date format` (#42436)
 (#42466)

* Transformations: Clarify behaviour of `Date format`

* Remove full stop from bullet point

(cherry picked from commit 5eb35606b995f0067faaadb5a6561de398efca3a)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 docs/sources/panels/transformations/types-options.md         | 4 ++--
 .../TransformersUI/ConvertFieldTypeTransformerEditor.tsx     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/sources/panels/transformations/types-options.md b/docs/sources/panels/transformations/types-options.md
index 575010c8ee8..d69948f8525 100644
--- a/docs/sources/panels/transformations/types-options.md
+++ b/docs/sources/panels/transformations/types-options.md
@@ -347,10 +347,10 @@ This transformation changes the field type of the specified field.
   - **Numeric -** attempts to make the values numbers
   - **String -** will make the values strings
   - **Time -** attempts to parse the values as time
-    - Will show an option to specify a DateFormat as input by a string like yyyy-mm-dd or DD MM YYYY hh:mm:ss
+    - Will show an option to specify a DateFormat for the input field like yyyy-mm-dd or DD MM YYYY hh:mm:ss
   - **Boolean -** will make the values booleans
 
-For example the following query could be modified by selecting the time field, as Time, and Date Format as YYYY.
+For example the following query could be modified by selecting the time field, as Time, and Input format as YYYY.
 
 | Time       | Mark  | Value |
 | ---------- | ----- | ----- |
diff --git a/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx b/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx
index 1086ac74d18..6aaa2777239 100644
--- a/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx
+++ b/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx
@@ -113,7 +113,10 @@ export const ConvertFieldTypeTransformerEditor: React.FC<TransformerUIProps<Conv
               />
             </InlineField>
             {c.destinationType === FieldType.time && (
-              <InlineField label={'Date Format'}>
+              <InlineField
+                label="Input format"
+                tooltip="Specify the format of the input field so Grafana can parse the date string correctly."
+              >
                 <Input value={c.dateFormat} placeholder={'e.g. YYYY-MM-DD'} onChange={onInputFormat(idx)} width={24} />
               </InlineField>
             )}