From 5148464c88909dfa134cab8377df11f85bb9ca0b Mon Sep 17 00:00:00 2001
From: Hamas Shafiq <hamas.shafiq@grafana.com>
Date: Thu, 25 Aug 2022 09:51:21 +0100
Subject: [PATCH] Jaeger: Make search form fields more consistent with Tempo
 (#54026)

---
 .../plugins/datasource/jaeger/components/SearchForm.tsx   | 8 +++++---
 .../plugins/datasource/tempo/QueryEditor/NativeSearch.tsx | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
index 5a3b00b0ca3..38556b90cdf 100644
--- a/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
+++ b/public/app/plugins/datasource/jaeger/components/SearchForm.tsx
@@ -96,13 +96,14 @@ export function SearchForm({ datasource, query, onChange }: Props) {
   return (
     <div className={css({ maxWidth: '500px' })}>
       <InlineFieldRow>
-        <InlineField label="Service" labelWidth={14} grow>
+        <InlineField label="Service Name" labelWidth={14} grow>
           <Select
             inputId="service"
             options={serviceOptions}
             onOpenMenu={() => loadOptions('/api/services', 'services')}
             isLoading={isLoading.services}
             value={serviceOptions?.find((v) => v?.value === query.service) || undefined}
+            placeholder="Select a service"
             onChange={(v) =>
               onChange({
                 ...query,
@@ -118,7 +119,7 @@ export function SearchForm({ datasource, query, onChange }: Props) {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField label="Operation" labelWidth={14} grow disabled={!query.service}>
+        <InlineField label="Operation Name" labelWidth={14} grow disabled={!query.service}>
           <Select
             inputId="operation"
             options={operationOptions}
@@ -130,6 +131,7 @@ export function SearchForm({ datasource, query, onChange }: Props) {
             }
             isLoading={isLoading.operations}
             value={operationOptions?.find((v) => v.value === query.operation) || null}
+            placeholder="Select an operation"
             onChange={(v) =>
               onChange({
                 ...query,
@@ -144,7 +146,7 @@ export function SearchForm({ datasource, query, onChange }: Props) {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        <InlineField label="Tags" labelWidth={14} grow>
+        <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in logfmt.">
           <Input
             id="tags"
             value={transformToLogfmt(query.tags)}
diff --git a/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx b/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx
index ffddb9ded88..91bae0eb551 100644
--- a/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx
+++ b/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.tsx
@@ -204,7 +204,7 @@ const NativeSearch = ({ datasource, query, onChange, onBlur, onRunQuery }: Props
           </InlineField>
         </InlineFieldRow>
         <InlineFieldRow>
-          <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in the logfmt format.">
+          <InlineField label="Tags" labelWidth={14} grow tooltip="Values should be in logfmt.">
             <QueryField
               additionalPlugins={plugins}
               query={query.search}