From d5536819bfe7c5759006844a1a7420ed6d2498dd Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Thu, 2 Apr 2020 13:52:15 -0400
Subject: [PATCH 1/3] update cloud callout message + move server_name input

---
 .../remote_cluster_form.test.js.snap          | 192 +++++++++---------
 .../remote_cluster_form.js                    |  80 +++++---
 2 files changed, 148 insertions(+), 124 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index 4c109c557fdb0..bfc68072051da 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -687,23 +687,37 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                     </div>
                   </EuiFormRow>
                   <EuiFormRow
-                    data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
+                    data-test-subj="remoteClusterFormServerNameFormRow"
                     describedByIds={Array []}
                     display="row"
+                    error={null}
                     fullWidth={true}
                     hasChildLabel={true}
                     hasEmptyLabelSpace={false}
                     helpText={
                       <FormattedMessage
-                        defaultMessage="The number of socket connections to open per remote cluster."
-                        id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
-                        values={Object {}}
+                        defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
+                        values={
+                          Object {
+                            "learnMoreLink": <ForwardRef
+                              target="_blank"
+                            >
+                              <FormattedMessage
+                                defaultMessage="Learn more."
+                                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
+                                values={Object {}}
+                              />
+                            </ForwardRef>,
+                          }
+                        }
                       />
                     }
+                    isInvalid={false}
                     label={
                       <FormattedMessage
-                        defaultMessage="Socket connections"
-                        id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
+                        defaultMessage="Server name (optional)"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
                         values={Object {}}
                       />
                     }
@@ -711,28 +725,31 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                   >
                     <div
                       className="euiFormRow euiFormRow--fullWidth"
-                      data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
+                      data-test-subj="remoteClusterFormServerNameFormRow"
                       id="mockId-row"
                     >
                       <div
                         className="euiFormRow__labelWrapper"
                       >
                         <EuiFormLabel
+                          aria-invalid={false}
                           className="euiFormRow__label"
                           htmlFor="mockId"
                           isFocused={false}
+                          isInvalid={false}
                           type="label"
                         >
                           <label
+                            aria-invalid={false}
                             className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
                           >
                             <FormattedMessage
-                              defaultMessage="Socket connections"
-                              id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
+                              defaultMessage="Server name (optional)"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
                               values={Object {}}
                             >
-                              Socket connections
+                              Server name (optional)
                             </FormattedMessage>
                           </label>
                         </EuiFormLabel>
@@ -740,20 +757,19 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                       <div
                         className="euiFormRow__fieldWrapper"
                       >
-                        <EuiFieldNumber
+                        <EuiFieldText
                           aria-describedby="mockId-help"
                           fullWidth={true}
                           id="mockId"
+                          isInvalid={false}
                           onBlur={[Function]}
                           onChange={[Function]}
                           onFocus={[Function]}
-                          value={18}
+                          value=""
                         >
                           <EuiFormControlLayout
-                            compressed={false}
                             fullWidth={true}
                             inputId="mockId"
-                            isLoading={false}
                           >
                             <div
                               className="euiFormControlLayout euiFormControlLayout--fullWidth"
@@ -761,25 +777,25 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                               <div
                                 className="euiFormControlLayout__childrenWrapper"
                               >
-                                <EuiValidatableControl>
+                                <EuiValidatableControl
+                                  isInvalid={false}
+                                >
                                   <input
                                     aria-describedby="mockId-help"
-                                    className="euiFieldNumber euiFieldNumber--fullWidth"
+                                    className="euiFieldText euiFieldText--fullWidth"
                                     id="mockId"
                                     onBlur={[Function]}
                                     onChange={[Function]}
                                     onFocus={[Function]}
-                                    type="number"
-                                    value={18}
+                                    type="text"
+                                    value=""
                                   />
                                 </EuiValidatableControl>
-                                <EuiFormControlLayoutIcons
-                                  isLoading={false}
-                                />
+                                <EuiFormControlLayoutIcons />
                               </div>
                             </div>
                           </EuiFormControlLayout>
-                        </EuiFieldNumber>
+                        </EuiFieldText>
                         <EuiFormHelpText
                           className="euiFormRow__text"
                           id="mockId-help"
@@ -789,11 +805,39 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                             id="mockId-help"
                           >
                             <FormattedMessage
-                              defaultMessage="The number of socket connections to open per remote cluster."
-                              id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
-                              values={Object {}}
+                              defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
+                              values={
+                                Object {
+                                  "learnMoreLink": <ForwardRef
+                                    target="_blank"
+                                  >
+                                    <FormattedMessage
+                                      defaultMessage="Learn more."
+                                      id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
+                                      values={Object {}}
+                                    />
+                                  </ForwardRef>,
+                                }
+                              }
                             >
-                              The number of socket connections to open per remote cluster.
+                              A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. 
+                              <EuiLink
+                                target="_blank"
+                              >
+                                <button
+                                  className="euiLink euiLink--primary"
+                                  type="button"
+                                >
+                                  <FormattedMessage
+                                    defaultMessage="Learn more."
+                                    id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
+                                    values={Object {}}
+                                  >
+                                    Learn more.
+                                  </FormattedMessage>
+                                </button>
+                              </EuiLink>
                             </FormattedMessage>
                           </div>
                         </EuiFormHelpText>
@@ -801,37 +845,23 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                     </div>
                   </EuiFormRow>
                   <EuiFormRow
-                    data-test-subj="remoteClusterFormServerNameFormRow"
+                    data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
                     describedByIds={Array []}
                     display="row"
-                    error={null}
                     fullWidth={true}
                     hasChildLabel={true}
                     hasEmptyLabelSpace={false}
                     helpText={
                       <FormattedMessage
-                        defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
-                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
-                        values={
-                          Object {
-                            "learnMoreLink": <ForwardRef
-                              target="_blank"
-                            >
-                              <FormattedMessage
-                                defaultMessage="Learn more."
-                                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
-                                values={Object {}}
-                              />
-                            </ForwardRef>,
-                          }
-                        }
+                        defaultMessage="The number of socket connections to open per remote cluster."
+                        id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+                        values={Object {}}
                       />
                     }
-                    isInvalid={false}
                     label={
                       <FormattedMessage
-                        defaultMessage="Server name (optional)"
-                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
+                        defaultMessage="Socket connections"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
                         values={Object {}}
                       />
                     }
@@ -839,31 +869,28 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                   >
                     <div
                       className="euiFormRow euiFormRow--fullWidth"
-                      data-test-subj="remoteClusterFormServerNameFormRow"
+                      data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
                       id="mockId-row"
                     >
                       <div
                         className="euiFormRow__labelWrapper"
                       >
                         <EuiFormLabel
-                          aria-invalid={false}
                           className="euiFormRow__label"
                           htmlFor="mockId"
                           isFocused={false}
-                          isInvalid={false}
                           type="label"
                         >
                           <label
-                            aria-invalid={false}
                             className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
                           >
                             <FormattedMessage
-                              defaultMessage="Server name (optional)"
-                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
+                              defaultMessage="Socket connections"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
                               values={Object {}}
                             >
-                              Server name (optional)
+                              Socket connections
                             </FormattedMessage>
                           </label>
                         </EuiFormLabel>
@@ -871,19 +898,20 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                       <div
                         className="euiFormRow__fieldWrapper"
                       >
-                        <EuiFieldText
+                        <EuiFieldNumber
                           aria-describedby="mockId-help"
                           fullWidth={true}
                           id="mockId"
-                          isInvalid={false}
                           onBlur={[Function]}
                           onChange={[Function]}
                           onFocus={[Function]}
-                          value=""
+                          value={18}
                         >
                           <EuiFormControlLayout
+                            compressed={false}
                             fullWidth={true}
                             inputId="mockId"
+                            isLoading={false}
                           >
                             <div
                               className="euiFormControlLayout euiFormControlLayout--fullWidth"
@@ -891,25 +919,25 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                               <div
                                 className="euiFormControlLayout__childrenWrapper"
                               >
-                                <EuiValidatableControl
-                                  isInvalid={false}
-                                >
+                                <EuiValidatableControl>
                                   <input
                                     aria-describedby="mockId-help"
-                                    className="euiFieldText euiFieldText--fullWidth"
+                                    className="euiFieldNumber euiFieldNumber--fullWidth"
                                     id="mockId"
                                     onBlur={[Function]}
                                     onChange={[Function]}
                                     onFocus={[Function]}
-                                    type="text"
-                                    value=""
+                                    type="number"
+                                    value={18}
                                   />
                                 </EuiValidatableControl>
-                                <EuiFormControlLayoutIcons />
+                                <EuiFormControlLayoutIcons
+                                  isLoading={false}
+                                />
                               </div>
                             </div>
                           </EuiFormControlLayout>
-                        </EuiFieldText>
+                        </EuiFieldNumber>
                         <EuiFormHelpText
                           className="euiFormRow__text"
                           id="mockId-help"
@@ -919,39 +947,11 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                             id="mockId-help"
                           >
                             <FormattedMessage
-                              defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
-                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
-                              values={
-                                Object {
-                                  "learnMoreLink": <ForwardRef
-                                    target="_blank"
-                                  >
-                                    <FormattedMessage
-                                      defaultMessage="Learn more."
-                                      id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
-                                      values={Object {}}
-                                    />
-                                  </ForwardRef>,
-                                }
-                              }
+                              defaultMessage="The number of socket connections to open per remote cluster."
+                              id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+                              values={Object {}}
                             >
-                              A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. 
-                              <EuiLink
-                                target="_blank"
-                              >
-                                <button
-                                  className="euiLink euiLink--primary"
-                                  type="button"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Learn more."
-                                    id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
-                                    values={Object {}}
-                                  >
-                                    Learn more.
-                                  </FormattedMessage>
-                                </button>
-                              </EuiLink>
+                              The number of socket connections to open per remote cluster.
                             </FormattedMessage>
                           </div>
                         </EuiFormHelpText>
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index c98bd73bf83a0..9ff8f7d86b8c3 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -405,30 +405,6 @@ export class RemoteClusterForm extends Component {
           />
         </EuiFormRow>
 
-        <EuiFormRow
-          data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
-          label={
-            <FormattedMessage
-              id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
-              defaultMessage="Socket connections"
-            />
-          }
-          helpText={
-            <FormattedMessage
-              id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
-              defaultMessage="The number of socket connections to open per remote cluster."
-            />
-          }
-          fullWidth
-        >
-          <EuiFieldNumber
-            value={proxySocketConnections || ''}
-            onChange={e =>
-              this.onFieldsChange({ proxySocketConnections: Number(e.target.value) || null })
-            }
-            fullWidth
-          />
-        </EuiFormRow>
         <EuiFormRow
           data-test-subj="remoteClusterFormServerNameFormRow"
           isInvalid={Boolean(areErrorsVisible && errorServerName)}
@@ -471,6 +447,31 @@ export class RemoteClusterForm extends Component {
             fullWidth
           />
         </EuiFormRow>
+
+        <EuiFormRow
+          data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
+          label={
+            <FormattedMessage
+              id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
+              defaultMessage="Socket connections"
+            />
+          }
+          helpText={
+            <FormattedMessage
+              id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+              defaultMessage="The number of socket connections to open per remote cluster."
+            />
+          }
+          fullWidth
+        >
+          <EuiFieldNumber
+            value={proxySocketConnections || ''}
+            onChange={e =>
+              this.onFieldsChange({ proxySocketConnections: Number(e.target.value) || null })
+            }
+            fullWidth
+          />
+        </EuiFormRow>
       </>
     );
   }
@@ -519,15 +520,38 @@ export class RemoteClusterForm extends Component {
               <>
                 <EuiSpacer size="s" />
                 <EuiCallOut
+                  iconType="pin"
+                  size="s"
                   title={
                     <FormattedMessage
                       id="xpack.remoteClusters.cloudClusterInformationTitle"
-                      defaultMessage="You can find the proxy address and server name of your cluster in the Security section of your deployment."
+                      defaultMessage="Use the proxy address for Elastic Cloud deployments"
                     />
                   }
-                  iconType="pin"
-                  size="s"
-                />
+                >
+                  <FormattedMessage
+                    id="xpack.remoteClusters.cloudClusterInformationDescription"
+                    defaultMessage="To find the proxy address and server name of your cluster, go to the {security} page of your deployment menu and search for {searchString}."
+                    values={{
+                      security: (
+                        <strong>
+                          <FormattedMessage
+                            id="xpack.remoteClusters.cloudClusterSecurityDescription"
+                            defaultMessage="Security"
+                          />
+                        </strong>
+                      ),
+                      searchString: (
+                        <strong>
+                          <FormattedMessage
+                            id="xpack.remoteClusters.cloudClusterSearchDescription"
+                            defaultMessage="Remote cluster parameters"
+                          />
+                        </strong>
+                      ),
+                    }}
+                  />
+                </EuiCallOut>
               </>
             ) : null}
           </>

From 38d02a25fa0112cdb9e0177d279f2e77aa57e67b Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Mon, 6 Apr 2020 17:04:19 -0400
Subject: [PATCH 2/3] address copy feedback

---
 .../remote_cluster_form.test.js.snap           | 18 +++++++++---------
 .../remote_cluster_form/remote_cluster_form.js |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index bfc68072051da..1e6c2c4d289aa 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -350,7 +350,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
         description={
           <React.Fragment>
             <FormattedMessage
-              defaultMessage="Use seed nodes by default, or switch to a single proxy address."
+              defaultMessage="Use seed nodes by default, or switch to proxy mode."
               id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
               values={Object {}}
             />
@@ -367,7 +367,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                 data-test-subj="remoteClusterFormConnectionModeToggle"
                 label={
                   <FormattedMessage
-                    defaultMessage="Use a single proxy address"
+                    defaultMessage="Use proxy mode"
                     id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
                     values={Object {}}
                   />
@@ -443,11 +443,11 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                           className="euiTextColor euiTextColor--subdued"
                         >
                           <FormattedMessage
-                            defaultMessage="Use seed nodes by default, or switch to a single proxy address."
+                            defaultMessage="Use seed nodes by default, or switch to proxy mode."
                             id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
                             values={Object {}}
                           >
-                            Use seed nodes by default, or switch to a single proxy address.
+                            Use seed nodes by default, or switch to proxy mode.
                           </FormattedMessage>
                           <EuiFormRow
                             describedByIds={Array []}
@@ -470,7 +470,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                   id="mockId"
                                   label={
                                     <FormattedMessage
-                                      defaultMessage="Use a single proxy address"
+                                      defaultMessage="Use proxy mode"
                                       id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
                                       values={Object {}}
                                     />
@@ -534,11 +534,11 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                       onClick={[Function]}
                                     >
                                       <FormattedMessage
-                                        defaultMessage="Use a single proxy address"
+                                        defaultMessage="Use proxy mode"
                                         id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
                                         values={Object {}}
                                       >
-                                        Use a single proxy address
+                                        Use proxy mode
                                       </FormattedMessage>
                                     </span>
                                   </div>
@@ -1447,7 +1447,7 @@ Array [
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Use seed nodes by default, or switch to a single proxy address.
+              Use seed nodes by default, or switch to proxy mode.
               <div
                 class="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--fullWidth"
                 id="mockId-row"
@@ -1491,7 +1491,7 @@ Array [
                       class="euiSwitch__label"
                       id="mockId"
                     >
-                      Use a single proxy address
+                      Use proxy mode
                     </span>
                   </div>
                 </div>
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index 9ff8f7d86b8c3..af7854caa9631 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -499,14 +499,14 @@ export class RemoteClusterForm extends Component {
           <>
             <FormattedMessage
               id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
-              defaultMessage="Use seed nodes by default, or switch to a single proxy address."
+              defaultMessage="Use seed nodes by default, or switch to proxy mode."
             />
             <EuiFormRow hasEmptyLabelSpace fullWidth>
               <EuiSwitch
                 label={
                   <FormattedMessage
                     id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
-                    defaultMessage="Use a single proxy address"
+                    defaultMessage="Use proxy mode"
                   />
                 }
                 checked={mode === PROXY_MODE}
@@ -525,7 +525,7 @@ export class RemoteClusterForm extends Component {
                   title={
                     <FormattedMessage
                       id="xpack.remoteClusters.cloudClusterInformationTitle"
-                      defaultMessage="Use the proxy address for Elastic Cloud deployments"
+                      defaultMessage="Use proxy mode for Elasticsearch Service deployment"
                     />
                   }
                 >

From 59cf55052d19a7e1335d0621432881f4f146543c Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Tue, 7 Apr 2020 10:27:46 -0400
Subject: [PATCH 3/3] address feedback

---
 .../components/remote_cluster_form/remote_cluster_form.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index af7854caa9631..a392cc9607784 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -525,7 +525,7 @@ export class RemoteClusterForm extends Component {
                   title={
                     <FormattedMessage
                       id="xpack.remoteClusters.cloudClusterInformationTitle"
-                      defaultMessage="Use proxy mode for Elasticsearch Service deployment"
+                      defaultMessage="Use proxy mode for Elasticsearch Cloud deployment"
                     />
                   }
                 >