From 121353cf457efe957662bf18d867ba76ffb4100e Mon Sep 17 00:00:00 2001
From: Cee Chen <549407+cee-chen@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:18:42 -0700
Subject: [PATCH] [rollup][licensing_management][grokdebugger] Migrate
 deprecated `EuiPage*` components (#168300)

## Summary

EUI will shortly be removing several deprecated `EuiPage*` components,
and we're updating a few remaining Kibana usages of these deprecated
components ahead of time.

See https://github.com/elastic/kibana/issues/161872 for other similar
tasks with more information about this effort.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../components/grok_debugger/grok_debugger.js |  60 +-
 .../public/components/inactive_license.js     |  87 +-
 .../upload_license.test.tsx.snap              | 993 +++++++++---------
 .../public/application/app.js                 |  20 +-
 .../license_dashboard/license_dashboard.js    |  10 +-
 .../sections/upload_license/upload_license.js |  12 +-
 .../sections/job_create/job_create.js         |   6 +-
 .../crud_app/sections/job_list/job_list.js    |  21 +-
 8 files changed, 604 insertions(+), 605 deletions(-)

diff --git a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
index 7eb4e9412edaa..cfae6749879f3 100644
--- a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
+++ b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
@@ -11,15 +11,7 @@ import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line no-restricted-imports
 import isEmpty from 'lodash/isEmpty';
 
-import {
-  EuiForm,
-  EuiButton,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiForm, EuiButton, EuiPage, EuiPageBody, EuiPageSection, EuiSpacer } from '@elastic/eui';
 import { EventInput } from '../event_input';
 import { PatternInput } from '../pattern_input';
 import { CustomPatternsInput } from '../custom_patterns_input';
@@ -126,33 +118,31 @@ export class GrokDebuggerComponent extends React.Component {
     return (
       <EuiPage>
         <EuiPageBody>
-          <EuiPageContent>
-            <EuiPageContentBody>
-              <EuiForm className="grokdebugger-container" data-test-subj="grokDebuggerContainer">
-                <EventInput value={this.state.rawEvent} onChange={this.onRawEventChange} />
-                <PatternInput value={this.state.pattern} onChange={this.onPatternChange} />
-                <EuiSpacer />
-                <CustomPatternsInput
-                  value={this.state.customPatterns}
-                  onChange={this.onCustomPatternsChange}
+          <EuiPageSection grow={true} color="plain">
+            <EuiForm className="grokdebugger-container" data-test-subj="grokDebuggerContainer">
+              <EventInput value={this.state.rawEvent} onChange={this.onRawEventChange} />
+              <PatternInput value={this.state.pattern} onChange={this.onPatternChange} />
+              <EuiSpacer />
+              <CustomPatternsInput
+                value={this.state.customPatterns}
+                onChange={this.onCustomPatternsChange}
+              />
+              <EuiSpacer />
+              <EuiButton
+                fill
+                onClick={this.onSimulateClick}
+                isDisabled={this.isSimulateDisabled()}
+                data-test-subj="btnSimulate"
+              >
+                <FormattedMessage
+                  id="xpack.grokDebugger.simulateButtonLabel"
+                  defaultMessage="Simulate"
                 />
-                <EuiSpacer />
-                <EuiButton
-                  fill
-                  onClick={this.onSimulateClick}
-                  isDisabled={this.isSimulateDisabled()}
-                  data-test-subj="btnSimulate"
-                >
-                  <FormattedMessage
-                    id="xpack.grokDebugger.simulateButtonLabel"
-                    defaultMessage="Simulate"
-                  />
-                </EuiButton>
-                <EuiSpacer />
-                <EventOutput value={this.state.structuredEvent} />
-              </EuiForm>
-            </EuiPageContentBody>
-          </EuiPageContent>
+              </EuiButton>
+              <EuiSpacer />
+              <EventOutput value={this.state.structuredEvent} />
+            </EuiForm>
+          </EuiPageSection>
         </EuiPageBody>
       </EuiPage>
     );
diff --git a/x-pack/plugins/grokdebugger/public/components/inactive_license.js b/x-pack/plugins/grokdebugger/public/components/inactive_license.js
index f373c65bf9bb1..b9abdd6a4706f 100644
--- a/x-pack/plugins/grokdebugger/public/components/inactive_license.js
+++ b/x-pack/plugins/grokdebugger/public/components/inactive_license.js
@@ -13,8 +13,7 @@ import {
   EuiCode,
   EuiPage,
   EuiPageBody,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
+  EuiPageSection,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -43,49 +42,47 @@ export const InactiveLicenseSlate = () => {
   return (
     <EuiPage>
       <EuiPageBody component="div">
-        <EuiPageContent verticalPosition="center" horizontalPosition="center">
-          <EuiPageContentBody>
-            <EuiCallOut
-              title={i18n.translate('xpack.grokDebugger.licenseErrorMessageTitle', {
-                defaultMessage: 'License error',
-              })}
-              color="danger"
-              iconType="warning"
-              style={{ padding: '16px' }}
-            >
-              <EuiText size="s">
-                <p>
-                  <FormattedMessage
-                    id="xpack.grokDebugger.licenseErrorMessageDescription"
-                    defaultMessage="The Grok Debugger requires an active license ({licenseTypeList} or {platinumLicenseType}), but none were found in your cluster."
-                    values={{
-                      licenseTypeList: (
-                        <>
-                          <EuiCode>{trialLicense}</EuiCode>, <EuiCode>{basicLicense}</EuiCode>,{' '}
-                          <EuiCode>{goldLicense}</EuiCode>
-                        </>
-                      ),
-                      platinumLicenseType: <EuiCode>{platinumLicense}</EuiCode>,
-                    }}
-                  />
-                </p>
-                <p>
-                  <FormattedMessage
-                    id="xpack.grokDebugger.registerLicenseDescription"
-                    defaultMessage="Please {registerLicenseLink} to continue using the Grok Debugger"
-                    values={{
-                      registerLicenseLink: (
-                        <EuiLink href="https://www.elastic.co/subscriptions" rel="noopener">
-                          {registerLicenseLinkLabel}
-                        </EuiLink>
-                      ),
-                    }}
-                  />
-                </p>
-              </EuiText>
-            </EuiCallOut>
-          </EuiPageContentBody>
-        </EuiPageContent>
+        <EuiPageSection alignment="center" grow={true} color="plain">
+          <EuiCallOut
+            title={i18n.translate('xpack.grokDebugger.licenseErrorMessageTitle', {
+              defaultMessage: 'License error',
+            })}
+            color="danger"
+            iconType="warning"
+            style={{ padding: '16px' }}
+          >
+            <EuiText size="s">
+              <p>
+                <FormattedMessage
+                  id="xpack.grokDebugger.licenseErrorMessageDescription"
+                  defaultMessage="The Grok Debugger requires an active license ({licenseTypeList} or {platinumLicenseType}), but none were found in your cluster."
+                  values={{
+                    licenseTypeList: (
+                      <>
+                        <EuiCode>{trialLicense}</EuiCode>, <EuiCode>{basicLicense}</EuiCode>,{' '}
+                        <EuiCode>{goldLicense}</EuiCode>
+                      </>
+                    ),
+                    platinumLicenseType: <EuiCode>{platinumLicense}</EuiCode>,
+                  }}
+                />
+              </p>
+              <p>
+                <FormattedMessage
+                  id="xpack.grokDebugger.registerLicenseDescription"
+                  defaultMessage="Please {registerLicenseLink} to continue using the Grok Debugger"
+                  values={{
+                    registerLicenseLink: (
+                      <EuiLink href="https://www.elastic.co/subscriptions" rel="noopener">
+                        {registerLicenseLinkLabel}
+                      </EuiLink>
+                    ),
+                  }}
+                />
+              </p>
+            </EuiText>
+          </EuiCallOut>
+        </EuiPageSection>
       </EuiPageBody>
     </EuiPage>
   );
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 1ce5f5a38b043..8a845149b95e8 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -1,675 +1,690 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`UploadLicense should display a modal when license requires acknowledgement 1`] = `
-<div
-  class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter emotion-euiPanel-grow-m-l-subdued"
-  role="main"
+<section
+  class="emotion-euiPageSection-grow-l-center-transparent"
 >
   <div
-    class="euiPageContentBody"
+    class="emotion-euiPageSection__content-l-center"
   >
-    <h1
-      class="euiTitle emotion-euiTitle-m"
-    >
-      Upload your license
-    </h1>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiText emotion-euiText-m"
-    >
-      <p>
-        Your license key is a JSON file with a signature attached.
-      </p>
-      <p>
-        Uploading a license will replace your current 
-        <strong />
-         license.
-      </p>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
     <div
-      class="euiForm"
+      class="euiPanel euiPanel--subdued euiPanel--paddingLarge emotion-euiPanel-grow-m-l-subdued"
     >
+      <h1
+        class="euiTitle emotion-euiTitle-m"
+      >
+        Upload your license
+      </h1>
+      <div
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiText emotion-euiText-m"
+      >
+        <p>
+          Your license key is a JSON file with a signature attached.
+        </p>
+        <p>
+          Uploading a license will replace your current 
+          <strong />
+           license.
+        </p>
+      </div>
+      <div
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
       <div
-        class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        class="euiForm"
       >
         <div
-          class="euiFilePicker__wrap"
+          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
         >
-          <input
-            aria-describedby="licenseFile-filePicker__prompt"
-            class="euiFilePicker__input"
-            id="licenseFile"
-            type="file"
-          />
           <div
-            class="euiFilePicker__prompt"
-            id="licenseFile-filePicker__prompt"
+            class="euiFilePicker__wrap"
           >
-            <span
-              aria-hidden="true"
-              class="euiFilePicker__icon"
-              color="primary"
-              data-euiicon-type="importAction"
+            <input
+              aria-describedby="licenseFile-filePicker__prompt"
+              class="euiFilePicker__input"
+              id="licenseFile"
+              type="file"
             />
             <div
-              class="euiFilePicker__promptText"
+              class="euiFilePicker__prompt"
+              id="licenseFile-filePicker__prompt"
             >
-              Select or drag your license file
+              <span
+                aria-hidden="true"
+                class="euiFilePicker__icon"
+                color="primary"
+                data-euiicon-type="importAction"
+              />
+              <div
+                class="euiFilePicker__promptText"
+              >
+                Select or drag your license file
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
-      >
         <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
         >
-          <a
-            class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
-            data-test-subj="cancelUploadButton"
-            href="/home"
-            rel="noreferrer"
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
+            <a
+              class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
+              data-test-subj="cancelUploadButton"
+              href="/home"
+              rel="noreferrer"
             >
               <span
-                class="eui-textTruncate euiButtonEmpty__text"
+                class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
               >
-                Cancel
+                <span
+                  class="eui-textTruncate euiButtonEmpty__text"
+                >
+                  Cancel
+                </span>
               </span>
-            </span>
-          </a>
-        </div>
-        <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
-        >
-          <button
-            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
-            data-test-subj="uploadLicenseButton"
-            type="button"
+            </a>
+          </div>
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="emotion-euiButtonDisplayContent"
+            <button
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
+              data-test-subj="uploadLicenseButton"
+              type="button"
             >
-              Upload
-            </span>
-          </button>
+              <span
+                class="emotion-euiButtonDisplayContent"
+              >
+                Upload
+              </span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
 `;
 
 exports[`UploadLicense should display an error when ES says license is expired 1`] = `
-<div
-  class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter emotion-euiPanel-grow-m-l-subdued"
-  role="main"
+<section
+  class="emotion-euiPageSection-grow-l-center-transparent"
 >
   <div
-    class="euiPageContentBody"
+    class="emotion-euiPageSection__content-l-center"
   >
-    <h1
-      class="euiTitle emotion-euiTitle-m"
-    >
-      Upload your license
-    </h1>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiText emotion-euiText-m"
-    >
-      <p>
-        Your license key is a JSON file with a signature attached.
-      </p>
-      <p>
-        Uploading a license will replace your current 
-        <strong />
-         license.
-      </p>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
     <div
-      class="euiForm"
+      class="euiPanel euiPanel--subdued euiPanel--paddingLarge emotion-euiPanel-grow-m-l-subdued"
     >
+      <h1
+        class="euiTitle emotion-euiTitle-m"
+      >
+        Upload your license
+      </h1>
+      <div
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
       <div
-        aria-live="assertive"
-        class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
-        role="alert"
-        tabindex="-1"
+        class="euiText emotion-euiText-m"
       >
-        <p
-          class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
-        >
-          Please address the highlighted errors.
+        <p>
+          Your license key is a JSON file with a signature attached.
+        </p>
+        <p>
+          Uploading a license will replace your current 
+          <strong />
+           license.
         </p>
-        <div
-          class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
-        />
-        <div
-          class="euiText emotion-euiText-s-euiTextColor-default"
-        >
-          <ul>
-            <li
-              class="euiForm__error"
-            >
-              The supplied license has expired.
-            </li>
-          </ul>
-        </div>
       </div>
       <div
-        class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiForm"
       >
         <div
-          class="euiFilePicker__wrap"
+          aria-live="assertive"
+          class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
+          role="alert"
+          tabindex="-1"
         >
-          <input
-            aria-describedby="licenseFile-filePicker__prompt"
-            class="euiFilePicker__input"
-            id="licenseFile"
-            type="file"
+          <p
+            class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
+          >
+            Please address the highlighted errors.
+          </p>
+          <div
+            class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFilePicker__prompt"
-            id="licenseFile-filePicker__prompt"
+            class="euiText emotion-euiText-s-euiTextColor-default"
           >
-            <span
-              aria-hidden="true"
-              class="euiFilePicker__icon"
-              color="primary"
-              data-euiicon-type="importAction"
+            <ul>
+              <li
+                class="euiForm__error"
+              >
+                The supplied license has expired.
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div
+          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        >
+          <div
+            class="euiFilePicker__wrap"
+          >
+            <input
+              aria-describedby="licenseFile-filePicker__prompt"
+              class="euiFilePicker__input"
+              id="licenseFile"
+              type="file"
             />
             <div
-              class="euiFilePicker__promptText"
+              class="euiFilePicker__prompt"
+              id="licenseFile-filePicker__prompt"
             >
-              Select or drag your license file
+              <span
+                aria-hidden="true"
+                class="euiFilePicker__icon"
+                color="primary"
+                data-euiicon-type="importAction"
+              />
+              <div
+                class="euiFilePicker__promptText"
+              >
+                Select or drag your license file
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
-      >
         <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
         >
-          <a
-            class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
-            data-test-subj="cancelUploadButton"
-            href="/home"
-            rel="noreferrer"
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
+            <a
+              class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
+              data-test-subj="cancelUploadButton"
+              href="/home"
+              rel="noreferrer"
             >
               <span
-                class="eui-textTruncate euiButtonEmpty__text"
+                class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
               >
-                Cancel
+                <span
+                  class="eui-textTruncate euiButtonEmpty__text"
+                >
+                  Cancel
+                </span>
               </span>
-            </span>
-          </a>
-        </div>
-        <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
-        >
-          <button
-            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
-            data-test-subj="uploadLicenseButton"
-            type="button"
+            </a>
+          </div>
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="emotion-euiButtonDisplayContent"
+            <button
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
+              data-test-subj="uploadLicenseButton"
+              type="button"
             >
-              Upload
-            </span>
-          </button>
+              <span
+                class="emotion-euiButtonDisplayContent"
+              >
+                Upload
+              </span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
 `;
 
 exports[`UploadLicense should display an error when ES says license is invalid 1`] = `
-<div
-  class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter emotion-euiPanel-grow-m-l-subdued"
-  role="main"
+<section
+  class="emotion-euiPageSection-grow-l-center-transparent"
 >
   <div
-    class="euiPageContentBody"
+    class="emotion-euiPageSection__content-l-center"
   >
-    <h1
-      class="euiTitle emotion-euiTitle-m"
-    >
-      Upload your license
-    </h1>
     <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiText emotion-euiText-m"
-    >
-      <p>
-        Your license key is a JSON file with a signature attached.
-      </p>
-      <p>
-        Uploading a license will replace your current 
-        <strong />
-         license.
-      </p>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiForm"
+      class="euiPanel euiPanel--subdued euiPanel--paddingLarge emotion-euiPanel-grow-m-l-subdued"
     >
+      <h1
+        class="euiTitle emotion-euiTitle-m"
+      >
+        Upload your license
+      </h1>
+      <div
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
       <div
-        aria-live="assertive"
-        class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
-        role="alert"
-        tabindex="-1"
+        class="euiText emotion-euiText-m"
       >
-        <p
-          class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
-        >
-          Please address the highlighted errors.
+        <p>
+          Your license key is a JSON file with a signature attached.
+        </p>
+        <p>
+          Uploading a license will replace your current 
+          <strong />
+           license.
         </p>
-        <div
-          class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
-        />
-        <div
-          class="euiText emotion-euiText-s-euiTextColor-default"
-        >
-          <ul>
-            <li
-              class="euiForm__error"
-            >
-              The supplied license is not valid for this product.
-            </li>
-          </ul>
-        </div>
       </div>
       <div
-        class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiForm"
       >
         <div
-          class="euiFilePicker__wrap"
+          aria-live="assertive"
+          class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
+          role="alert"
+          tabindex="-1"
         >
-          <input
-            aria-describedby="licenseFile-filePicker__prompt"
-            class="euiFilePicker__input"
-            id="licenseFile"
-            type="file"
+          <p
+            class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
+          >
+            Please address the highlighted errors.
+          </p>
+          <div
+            class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFilePicker__prompt"
-            id="licenseFile-filePicker__prompt"
+            class="euiText emotion-euiText-s-euiTextColor-default"
           >
-            <span
-              aria-hidden="true"
-              class="euiFilePicker__icon"
-              color="primary"
-              data-euiicon-type="importAction"
+            <ul>
+              <li
+                class="euiForm__error"
+              >
+                The supplied license is not valid for this product.
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div
+          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        >
+          <div
+            class="euiFilePicker__wrap"
+          >
+            <input
+              aria-describedby="licenseFile-filePicker__prompt"
+              class="euiFilePicker__input"
+              id="licenseFile"
+              type="file"
             />
             <div
-              class="euiFilePicker__promptText"
+              class="euiFilePicker__prompt"
+              id="licenseFile-filePicker__prompt"
             >
-              Select or drag your license file
+              <span
+                aria-hidden="true"
+                class="euiFilePicker__icon"
+                color="primary"
+                data-euiicon-type="importAction"
+              />
+              <div
+                class="euiFilePicker__promptText"
+              >
+                Select or drag your license file
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
-      >
         <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
         >
-          <a
-            class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
-            data-test-subj="cancelUploadButton"
-            href="/home"
-            rel="noreferrer"
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
+            <a
+              class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
+              data-test-subj="cancelUploadButton"
+              href="/home"
+              rel="noreferrer"
             >
               <span
-                class="eui-textTruncate euiButtonEmpty__text"
+                class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
               >
-                Cancel
+                <span
+                  class="eui-textTruncate euiButtonEmpty__text"
+                >
+                  Cancel
+                </span>
               </span>
-            </span>
-          </a>
-        </div>
-        <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
-        >
-          <button
-            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
-            data-test-subj="uploadLicenseButton"
-            type="button"
+            </a>
+          </div>
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="emotion-euiButtonDisplayContent"
+            <button
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
+              data-test-subj="uploadLicenseButton"
+              type="button"
             >
-              Upload
-            </span>
-          </button>
+              <span
+                class="emotion-euiButtonDisplayContent"
+              >
+                Upload
+              </span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
 `;
 
 exports[`UploadLicense should display an error when submitting invalid JSON 1`] = `
-<div
-  class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter emotion-euiPanel-grow-m-l-subdued"
-  role="main"
+<section
+  class="emotion-euiPageSection-grow-l-center-transparent"
 >
   <div
-    class="euiPageContentBody"
+    class="emotion-euiPageSection__content-l-center"
   >
-    <h1
-      class="euiTitle emotion-euiTitle-m"
-    >
-      Upload your license
-    </h1>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
     <div
-      class="euiText emotion-euiText-m"
-    >
-      <p>
-        Your license key is a JSON file with a signature attached.
-      </p>
-      <p>
-        Uploading a license will replace your current 
-        <strong />
-         license.
-      </p>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiForm"
+      class="euiPanel euiPanel--subdued euiPanel--paddingLarge emotion-euiPanel-grow-m-l-subdued"
     >
+      <h1
+        class="euiTitle emotion-euiTitle-m"
+      >
+        Upload your license
+      </h1>
       <div
-        aria-live="assertive"
-        class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
-        role="alert"
-        tabindex="-1"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiText emotion-euiText-m"
       >
-        <p
-          class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
-        >
-          Please address the highlighted errors.
+        <p>
+          Your license key is a JSON file with a signature attached.
+        </p>
+        <p>
+          Uploading a license will replace your current 
+          <strong />
+           license.
         </p>
-        <div
-          class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
-        />
-        <div
-          class="euiText emotion-euiText-s-euiTextColor-default"
-        >
-          <ul>
-            <li
-              class="euiForm__error"
-            >
-              Error encountered uploading license: Check your license file.
-            </li>
-          </ul>
-        </div>
       </div>
       <div
-        class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiForm"
       >
         <div
-          class="euiFilePicker__wrap"
+          aria-live="assertive"
+          class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
+          role="alert"
+          tabindex="-1"
         >
-          <input
-            aria-describedby="licenseFile-filePicker__prompt"
-            class="euiFilePicker__input"
-            id="licenseFile"
-            type="file"
+          <p
+            class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
+          >
+            Please address the highlighted errors.
+          </p>
+          <div
+            class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFilePicker__prompt"
-            id="licenseFile-filePicker__prompt"
+            class="euiText emotion-euiText-s-euiTextColor-default"
+          >
+            <ul>
+              <li
+                class="euiForm__error"
+              >
+                Error encountered uploading license: Check your license file.
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div
+          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        >
+          <div
+            class="euiFilePicker__wrap"
           >
-            <span
-              aria-hidden="true"
-              class="euiFilePicker__icon"
-              color="primary"
-              data-euiicon-type="importAction"
+            <input
+              aria-describedby="licenseFile-filePicker__prompt"
+              class="euiFilePicker__input"
+              id="licenseFile"
+              type="file"
             />
             <div
-              class="euiFilePicker__promptText"
+              class="euiFilePicker__prompt"
+              id="licenseFile-filePicker__prompt"
             >
-              Select or drag your license file
+              <span
+                aria-hidden="true"
+                class="euiFilePicker__icon"
+                color="primary"
+                data-euiicon-type="importAction"
+              />
+              <div
+                class="euiFilePicker__promptText"
+              >
+                Select or drag your license file
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
-      >
         <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
         >
-          <a
-            class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
-            data-test-subj="cancelUploadButton"
-            href="/home"
-            rel="noreferrer"
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
+            <a
+              class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
+              data-test-subj="cancelUploadButton"
+              href="/home"
+              rel="noreferrer"
             >
               <span
-                class="eui-textTruncate euiButtonEmpty__text"
+                class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
               >
-                Cancel
+                <span
+                  class="eui-textTruncate euiButtonEmpty__text"
+                >
+                  Cancel
+                </span>
               </span>
-            </span>
-          </a>
-        </div>
-        <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
-        >
-          <button
-            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
-            data-test-subj="uploadLicenseButton"
-            type="button"
+            </a>
+          </div>
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="emotion-euiButtonDisplayContent"
+            <button
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
+              data-test-subj="uploadLicenseButton"
+              type="button"
             >
-              Upload
-            </span>
-          </button>
+              <span
+                class="emotion-euiButtonDisplayContent"
+              >
+                Upload
+              </span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
 `;
 
 exports[`UploadLicense should display error when ES returns error 1`] = `
-<div
-  class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter emotion-euiPanel-grow-m-l-subdued"
-  role="main"
+<section
+  class="emotion-euiPageSection-grow-l-center-transparent"
 >
   <div
-    class="euiPageContentBody"
+    class="emotion-euiPageSection__content-l-center"
   >
-    <h1
-      class="euiTitle emotion-euiTitle-m"
-    >
-      Upload your license
-    </h1>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
-    <div
-      class="euiText emotion-euiText-m"
-    >
-      <p>
-        Your license key is a JSON file with a signature attached.
-      </p>
-      <p>
-        Uploading a license will replace your current 
-        <strong />
-         license.
-      </p>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
-    />
     <div
-      class="euiForm"
+      class="euiPanel euiPanel--subdued euiPanel--paddingLarge emotion-euiPanel-grow-m-l-subdued"
     >
+      <h1
+        class="euiTitle emotion-euiTitle-m"
+      >
+        Upload your license
+      </h1>
+      <div
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
       <div
-        aria-live="assertive"
-        class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
-        role="alert"
-        tabindex="-1"
+        class="euiText emotion-euiText-m"
       >
-        <p
-          class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
-        >
-          Please address the highlighted errors.
+        <p>
+          Your license key is a JSON file with a signature attached.
+        </p>
+        <p>
+          Uploading a license will replace your current 
+          <strong />
+           license.
         </p>
-        <div
-          class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
-        />
-        <div
-          class="euiText emotion-euiText-s-euiTextColor-default"
-        >
-          <ul>
-            <li
-              class="euiForm__error"
-            >
-              Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
-            </li>
-          </ul>
-        </div>
       </div>
       <div
-        class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
+      />
+      <div
+        class="euiForm"
       >
         <div
-          class="euiFilePicker__wrap"
+          aria-live="assertive"
+          class="euiPanel euiPanel--danger euiPanel--paddingMedium euiCallOut euiCallOut--danger euiForm__errors emotion-euiPanel-none-m-danger-euiCallOut"
+          role="alert"
+          tabindex="-1"
         >
-          <input
-            aria-describedby="licenseFile-filePicker__prompt"
-            class="euiFilePicker__input"
-            id="licenseFile"
-            type="file"
+          <p
+            class="euiTitle euiCallOutHeader__title emotion-euiTitle-xs-euiCallOutHeader-danger"
+          >
+            Please address the highlighted errors.
+          </p>
+          <div
+            class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFilePicker__prompt"
-            id="licenseFile-filePicker__prompt"
+            class="euiText emotion-euiText-s-euiTextColor-default"
           >
-            <span
-              aria-hidden="true"
-              class="euiFilePicker__icon"
-              color="primary"
-              data-euiicon-type="importAction"
+            <ul>
+              <li
+                class="euiForm__error"
+              >
+                Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div
+          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+        >
+          <div
+            class="euiFilePicker__wrap"
+          >
+            <input
+              aria-describedby="licenseFile-filePicker__prompt"
+              class="euiFilePicker__input"
+              id="licenseFile"
+              type="file"
             />
             <div
-              class="euiFilePicker__promptText"
+              class="euiFilePicker__prompt"
+              id="licenseFile-filePicker__prompt"
             >
-              Select or drag your license file
+              <span
+                aria-hidden="true"
+                class="euiFilePicker__icon"
+                color="primary"
+                data-euiicon-type="importAction"
+              />
+              <div
+                class="euiFilePicker__promptText"
+              >
+                Select or drag your license file
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
-      />
-      <div
-        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
-      >
         <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        />
+        <div
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
         >
-          <a
-            class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
-            data-test-subj="cancelUploadButton"
-            href="/home"
-            rel="noreferrer"
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
+            <a
+              class="euiButtonEmpty emotion-euiButtonDisplay-euiButtonEmpty-m-empty-primary"
+              data-test-subj="cancelUploadButton"
+              href="/home"
+              rel="noreferrer"
             >
               <span
-                class="eui-textTruncate euiButtonEmpty__text"
+                class="euiButtonEmpty__content emotion-euiButtonDisplayContent"
               >
-                Cancel
+                <span
+                  class="eui-textTruncate euiButtonEmpty__text"
+                >
+                  Cancel
+                </span>
               </span>
-            </span>
-          </a>
-        </div>
-        <div
-          class="euiFlexItem emotion-euiFlexItem-growZero"
-        >
-          <button
-            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
-            data-test-subj="uploadLicenseButton"
-            type="button"
+            </a>
+          </div>
+          <div
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
-            <span
-              class="emotion-euiButtonDisplayContent"
+            <button
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-fill-primary"
+              data-test-subj="uploadLicenseButton"
+              type="button"
             >
-              Upload
-            </span>
-          </button>
+              <span
+                class="emotion-euiButtonDisplayContent"
+              >
+                Upload
+              </span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</section>
 `;
diff --git a/x-pack/plugins/license_management/public/application/app.js b/x-pack/plugins/license_management/public/application/app.js
index e1b2ea7fb6b2e..8932193b01f4a 100644
--- a/x-pack/plugins/license_management/public/application/app.js
+++ b/x-pack/plugins/license_management/public/application/app.js
@@ -11,11 +11,7 @@ import { LicenseDashboard, UploadLicense } from './sections';
 import { Routes, Route } from '@kbn/shared-ux-router';
 import { APP_PERMISSION } from '../../common/constants';
 import { SectionLoading, useExecutionContext } from '../shared_imports';
-import {
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPageBody,
-  EuiEmptyPrompt,
-} from '@elastic/eui';
+import { EuiPageSection, EuiPageBody, EuiEmptyPrompt } from '@elastic/eui';
 import { UPLOAD_LICENSE_ROUTE } from '../locator';
 
 export const App = ({
@@ -37,14 +33,14 @@ export const App = ({
 
   if (permissionsLoading) {
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+      <EuiPageSection alignment="center" grow={true}>
         <SectionLoading>
           <FormattedMessage
             id="xpack.licenseMgmt.app.loadingPermissionsDescription"
             defaultMessage="Checking permissions…"
           />
         </SectionLoading>
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
@@ -52,8 +48,9 @@ export const App = ({
     const error = permissionsError?.data?.message;
 
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+      <EuiPageSection alignment="center" grow={true}>
         <EuiEmptyPrompt
+          color="danger"
           iconType="warning"
           title={
             <h1>
@@ -65,14 +62,15 @@ export const App = ({
           }
           body={error ? <p>{error}</p> : null}
         />
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
   if (!hasPermission) {
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+      <EuiPageSection alignment="center" grow={true}>
         <EuiEmptyPrompt
+          color="subdued"
           iconType="securityApp"
           title={
             <h1>
@@ -94,7 +92,7 @@ export const App = ({
             </p>
           }
         />
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
diff --git a/x-pack/plugins/license_management/public/application/sections/license_dashboard/license_dashboard.js b/x-pack/plugins/license_management/public/application/sections/license_dashboard/license_dashboard.js
index ce5048679ffeb..d412415752944 100644
--- a/x-pack/plugins/license_management/public/application/sections/license_dashboard/license_dashboard.js
+++ b/x-pack/plugins/license_management/public/application/sections/license_dashboard/license_dashboard.js
@@ -6,11 +6,7 @@
  */
 
 import React, { useEffect } from 'react';
-import {
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
-  EuiFlexGroup,
-  EuiFlexItem,
-} from '@elastic/eui';
+import { EuiPageSection, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { StartTrial } from './start_trial';
 import { LicensePageHeader } from './license_page_header';
@@ -27,7 +23,7 @@ export const LicenseDashboard = ({ setBreadcrumb, telemetry } = { setBreadcrumb:
     <>
       <LicensePageHeader />
 
-      <EuiPageContentBody>
+      <EuiPageSection>
         <EuiFlexGroup justifyContent="spaceAround">
           <EuiFlexItem>
             <AddLicense />
@@ -36,7 +32,7 @@ export const LicenseDashboard = ({ setBreadcrumb, telemetry } = { setBreadcrumb:
           <RequestTrialExtension />
           <RevertToBasic />
         </EuiFlexGroup>
-      </EuiPageContentBody>
+      </EuiPageSection>
     </>
   );
 };
diff --git a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
index 09b076cc4efc9..b637b9a29f2fc 100644
--- a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
+++ b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
@@ -17,8 +17,8 @@ import {
   EuiTitle,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
+  EuiPageSection,
+  EuiPanel,
 } from '@elastic/eui';
 import { TelemetryOptIn } from '../../components/telemetry_opt_in';
 import { shouldShowTelemetryOptIn } from '../../lib/telemetry';
@@ -126,8 +126,8 @@ export class UploadLicense extends React.PureComponent {
     const { currentLicenseType, applying, telemetry, history } = this.props;
 
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
-        <EuiPageContentBody>
+      <EuiPageSection alignment="center" grow={true}>
+        <EuiPanel color="subdued" paddingSize="l">
           <EuiTitle size="m">
             <h1>
               <FormattedMessage
@@ -215,8 +215,8 @@ export class UploadLicense extends React.PureComponent {
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiForm>
-        </EuiPageContentBody>
-      </EuiPageContent>
+        </EuiPanel>
+      </EuiPageSection>
     );
   }
 }
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
index a0defbc7e1d9f..c782e8646b714 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
@@ -18,7 +18,7 @@ import {
   EuiCallOut,
   EuiLoadingLogo,
   EuiOverlayMask,
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
+  EuiPageSection,
   EuiPageHeader,
   EuiSpacer,
   EuiStepsHorizontal,
@@ -543,7 +543,7 @@ export class JobCreateUi extends Component {
     }
 
     return (
-      <EuiPageContentBody restrictWidth style={{ width: '100%' }}>
+      <EuiPageSection restrictWidth>
         <EuiPageHeader
           bottomBorder
           pageTitle={
@@ -569,7 +569,7 @@ export class JobCreateUi extends Component {
         {this.renderNavigation()}
 
         {savingFeedback}
-      </EuiPageContentBody>
+      </EuiPageSection>
     );
   }
 
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
index 89ef725ad05ae..83641d6483817 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
@@ -15,7 +15,7 @@ import {
   EuiButtonEmpty,
   EuiEmptyPrompt,
   EuiPageHeader,
-  EuiPageContent_Deprecated as EuiPageContent,
+  EuiPageSection,
   EuiSpacer,
 } from '@elastic/eui';
 
@@ -87,8 +87,9 @@ export class JobListUi extends Component {
       defaultMessage: 'Permission error',
     });
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+      <EuiPageSection alignment="center" grow={true}>
         <EuiEmptyPrompt
+          color="danger"
           data-test-subj="jobListNoPermission"
           iconType="warning"
           title={<h1>{title}</h1>}
@@ -101,7 +102,7 @@ export class JobListUi extends Component {
             </p>
           }
         />
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
@@ -115,8 +116,9 @@ export class JobListUi extends Component {
     });
 
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+      <EuiPageSection alignment="center" grow={true}>
         <EuiEmptyPrompt
+          color="danger"
           data-test-subj="jobListError"
           iconType="warning"
           title={<h1>{title}</h1>}
@@ -126,14 +128,15 @@ export class JobListUi extends Component {
             </p>
           }
         />
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
   renderEmpty() {
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+      <EuiPageSection alignment="center" grow={true}>
         <EuiEmptyPrompt
+          color="subdued"
           data-test-subj="jobListEmptyPrompt"
           iconType="indexRollupApp"
           title={
@@ -169,20 +172,20 @@ export class JobListUi extends Component {
             </EuiButton>
           }
         />
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }
 
   renderLoading() {
     return (
-      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+      <EuiPageSection alignment="center" grow={true}>
         <SectionLoading>
           <FormattedMessage
             id="xpack.rollupJobs.jobList.loadingTitle"
             defaultMessage="Loading rollup jobs…"
           />
         </SectionLoading>
-      </EuiPageContent>
+      </EuiPageSection>
     );
   }