From a45d1091699f8f132bf6d7c05164d006ae92ede8 Mon Sep 17 00:00:00 2001 From: Ousmane Samba Date: Wed, 21 Feb 2024 15:07:07 +0100 Subject: [PATCH] fix review comments --- .../src/components/datanode/Constants.ts | 14 +++++------ .../DataNodeConfiguration/CAConfiguration.tsx | 2 +- .../DataNodeConfiguration/CACreateForm.tsx | 2 +- .../CertificateRenewal.tsx | 8 +++---- .../migrations/CertificateRenewalStep.tsx | 1 - .../CompatibilityCheckStep.test.tsx | 4 ++-- .../migrations/CompatibilityCheckStep.tsx | 6 ++--- .../migrations/CompatibilityStatus.tsx | 6 +++-- .../migrations/MigrationDatanodeList.tsx | 14 +++++------ .../migrations/MigrationWelcomeStep.tsx | 10 ++++---- .../datanode/migrations/MigrationWizard.tsx | 23 +++++++++++++------ .../migrations/RemoteReindexingMigration.tsx | 2 +- .../migrations/RollingUpgradeMigration.tsx | 10 ++++---- .../ConnectionStringRemovalStep.tsx | 2 +- .../remoteReindexing/ShutdownClusterStep.tsx | 5 ++-- .../migrations/remoteReindexing/Welcome.tsx | 2 +- .../CertificatesProvisioning.tsx | 4 ++-- .../rollingUpgrade/JournalDowntimeWarning.tsx | 3 ++- .../rollingUpgrade/JournalSizeWarning.tsx | 3 ++- .../rollingUpgrade/RestartGraylog.tsx | 5 ++-- .../rollingUpgrade/StopMessageProcessing.tsx | 7 +++--- .../migrations/rollingUpgrade/Welcome.tsx | 4 ++-- 22 files changed, 75 insertions(+), 62 deletions(-) diff --git a/graylog2-web-interface/src/components/datanode/Constants.ts b/graylog2-web-interface/src/components/datanode/Constants.ts index 65df4521c3a9..644c89ce8cc5 100644 --- a/graylog2-web-interface/src/components/datanode/Constants.ts +++ b/graylog2-web-interface/src/components/datanode/Constants.ts @@ -26,7 +26,7 @@ export const MIGRATION_STEP = { }, COMPATIBILITY_CHECK: { key: 'COMPATIBILITY_CHECK', - description: 'Check opensearch compatibility with datanode', + description: 'Check OpenSearch compatibility with datanode', }, MANUAL_MIGRATION_STEP: { key: 'MANUAL_MIGRATION_STEP', @@ -49,7 +49,7 @@ export const MIGRATION_STATE = { }, CA_CREATION_PAGE: { key: 'CA_CREATION_PAGE', - description: 'Certificate autority', + description: 'Certificate authority', }, RENEWAL_POLICY_CREATION_PAGE: { key: 'RENEWAL_POLICY_CREATION_PAGE', @@ -81,7 +81,7 @@ export const MIGRATION_STATE = { }, RESTART_GRAYLOG: { key: 'RESTART_GRAYLOG', - description: 'Update configuration file and restart graylog', + description: 'Update configuration file and restart Graylog', }, REMOTE_REINDEX_WELCOME_PAGE: { key: 'REMOTE_REINDEX_WELCOME_PAGE', @@ -89,11 +89,11 @@ export const MIGRATION_STATE = { }, PROVISION_DATANODE_CERTIFICATES_PAGE: { key: 'PROVISION_DATANODE_CERTIFICATES_PAGE', - description: 'Provision data node with certificates', + description: 'Provision Data Node with certificates', }, PROVISION_DATANODE_CERTIFICATES_RUNNING: { key: 'PROVISION_DATANODE_CERTIFICATES_RUNNING', - description: 'Provision data node with certificates running', + description: 'Provision Data Node with certificates running', }, EXISTING_DATA_MIGRATION_QUESTION_PAGE: { key: 'EXISTING_DATA_MIGRATION_QUESTION_PAGE', @@ -121,7 +121,7 @@ export const MIGRATION_STATE = { }, PROVISION_ROLLING_UPGRADE_NODES_RUNNING: { key: 'PROVISION_ROLLING_UPGRADE_NODES_RUNNING', - description: 'Provisionning data nodes certificate.', + description: 'Provisionning Data Nodes certificate.', }, JOURNAL_SIZE_DOWNTIME_WARNING: { key: 'JOURNAL_SIZE_DOWNTIME_WARNING', @@ -186,7 +186,7 @@ export const MIGRATION_ACTIONS = { }, PROVISION_DATANODE_CERTIFICATES: { key: 'PROVISION_DATANODE_CERTIFICATES', - label: 'Provision data nodes with certificates', + label: 'Provision Data Nodes with certificates', }, SKIP_EXISTING_DATA_MIGRATION: { key: 'SKIP_EXISTING_DATA_MIGRATION', diff --git a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CAConfiguration.tsx b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CAConfiguration.tsx index 108cd277ed05..fd2da3028dd9 100644 --- a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CAConfiguration.tsx +++ b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CAConfiguration.tsx @@ -26,7 +26,7 @@ const CAConfiguration = () => (

Configure Certificate Authority

In this first step you can either upload or create a new certificate authority.
- Using it we can provision your data nodes with certificates easily. + Using it we can provision your Data Nodes with certificates easily.

diff --git a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CACreateForm.tsx b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CACreateForm.tsx index 0c0955a7d13e..86d08bdf175c 100644 --- a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CACreateForm.tsx +++ b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CACreateForm.tsx @@ -55,7 +55,7 @@ const CaCreateForm = () => {

Here you can quickly create a new certificate authority. All you need to do is to click on the “Create CA” button. - The CA should only be used to secure your Graylog data nodes. + The CA should only be used to secure your Graylog Data Nodes.

onSubmit(formValues)}> {({ isSubmitting, isValid }) => ( diff --git a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CertificateRenewal.tsx b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CertificateRenewal.tsx index 1f5805808783..50756dd4bf0f 100644 --- a/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CertificateRenewal.tsx +++ b/graylog2-web-interface/src/components/datanode/DataNodeConfiguration/CertificateRenewal.tsx @@ -61,7 +61,7 @@ const useDataNodes = () => { queryKey: ['data-nodes', 'overview'], queryFn: fetchDataNodes, onError: (errorThrown) => { - UserNotification.error(`Loading data nodes failed with status: ${errorThrown}`, + UserNotification.error(`Loading Data Nodes failed with status: ${errorThrown}`, 'Could not load streams'); }, keepPreviousData: true, @@ -153,9 +153,9 @@ const CertificateRenewal = () => {

Certificate Renewal & Provisioning

- Here you can manually trigger the certificate renewal or provisioning for Graylog data nodes. + Here you can manually trigger the certificate renewal or provisioning for Graylog Data Nodes. It is only necessary to manually provision certificates when the renewal policy mode "Manual" is configured and - data nodes have been started after the initial certificate provisioning. + Data Nodes have been started after the initial certificate provisioning.

{!!sortedDataNodes?.length && ( @@ -190,7 +190,7 @@ const CertificateRenewal = () => { {isInitialLoadingDataNodes && } {(!sortedDataNodes?.length && !isInitialLoadingDataNodes) && ( - No data nodes have been found. + No Data Nodes have been found. )}
diff --git a/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx index 75a87d859422..1bc3dc2f99d4 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx @@ -30,6 +30,5 @@ const CertificateRenewalStep = ({ currentStep, onTriggerStep }: MigrationStepCom {(currentStep.next_steps.length <= 0) && (

Please create a certificate renewal policy before proceeding.

)} - ); export default CertificateRenewalStep; diff --git a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx index 682b73c95a26..9896b7a8689d 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx @@ -58,7 +58,7 @@ describe('CompatibilityCheckStep', () => { render( {}} currentStep={currentStep} />); await screen.findByRole('heading', { - name: /Your existing opensearch data can be migrated to data node\./i, + name: /Your existing OpenSearch data can be migrated to Data Node\./i, }); }); @@ -78,7 +78,7 @@ describe('CompatibilityCheckStep', () => { render( {}} currentStep={currentStep} />); await screen.findByRole('heading', { - name: /your existing opensearch data cannot be migrated to data node\./i, + name: /your existing OpenSearch data cannot be migrated to Data Node\./i, }); }); }); diff --git a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx index 1ec5d9c52884..e71f75d9c9dc 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx @@ -42,10 +42,10 @@ const CompatibilityCheckStep = ({ currentStep, onTriggerStep }: MigrationStepCom <>

Directory compatibility check

- {isCompatible &&

Your existing opensearch data can be migrated to data node.

} + {isCompatible &&

Your existing OpenSearch data can be migrated to Data Node.

} {!isError && !isCompatible && ( <> -

Your existing opensearch data cannot be migrated to data node.

+

Your existing OpenSearch data cannot be migrated to Data Node.


Error: {data?.compatibility_errors.map((error) =>
{error}
)} @@ -57,7 +57,7 @@ const CompatibilityCheckStep = ({ currentStep, onTriggerStep }: MigrationStepCom )} - {!isCompatible && (

Your Opensearch cluster cannot be migrated to this data node version because it's not compatible

)} + {!isCompatible && (

Your OpenSearch cluster cannot be migrated to this Data Node version because it's not compatible

)} {isCompatible && } diff --git a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityStatus.tsx b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityStatus.tsx index e9b036771cbd..bb6dc45aeb80 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityStatus.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityStatus.tsx @@ -28,13 +28,15 @@ type Props = { nodes: Array, opensearch_data_location: string, } -} +}; + const Grid = styled.div` display: grid; grid-template-columns: 25% 75%; grid-gap: 0.5rem; margin-bottom: 1rem; `; + const StyledSpan = styled.span` display: block; clear: both; @@ -51,7 +53,7 @@ const CompatibilityStatus = ({ opensearchVersion, nodeInfo }: Props) => { return (
- Datanode Opensearch version: {opensearchVersion} + Datanode OpenSearch version: {opensearchVersion} OpenSearch data location: {opensearchLocation}
diff --git a/graylog2-web-interface/src/components/datanode/migrations/MigrationDatanodeList.tsx b/graylog2-web-interface/src/components/datanode/migrations/MigrationDatanodeList.tsx index 6e2764ce93bb..beecf6bbb866 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/MigrationDatanodeList.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/MigrationDatanodeList.tsx @@ -30,29 +30,29 @@ const MigrationDatanodeList = () => { const { data: dataNodes, isInitialLoading } = useDataNodes(); if (isInitialLoading) { - return ; + return ; } return (
{(!dataNodes || dataNodes?.elements.length === 0) ? ( <> -

There are no data nodes found.

- - Please start at least a data node to continue the migration process. You can find more information on how to start a data nodes in our . +

There are no Data Nodes found.

+ + Please start at least a Data Node to continue the migration process. You can find more information on how to start a Data Nodes in our . -

+

) : ( <> -

Data nodes found:

+

Data Nodes found:


- + diff --git a/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx index c9e71de1918c..493208941c5b 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx @@ -52,15 +52,15 @@ const MigrationWelcomeStep = ({ currentStep, onTriggerStep }: Props) => ( - Migration to Data node ! + Migration to Data Node !

- It looks like you updated Graylog and want to configure a data node. Data nodes allow you to index and search through all the messages in your Graylog message database. + It looks like you updated Graylog and want to configure a Data Node. Data Nodes allow you to index and search through all the messages in your Graylog message database.

- Using this migration tool you can check the compatibility and follow the steps to migrate your exsisting Opensearch data to a Data node.
+ Using this migration tool you can check the compatibility and follow the steps to migrate your exsisting OpenSearch data to a Data Node.

-

Migrating to data node require some step the are performed using the UI in this wizard, but it also require some additional step that should be performed on the OS, you current OS/ES cluster and you config files

-

You can get more information on the Data node migration

+

Migrating to Data Node requires some steps the are performed using the UI in this wizard, but it also requires some additional steps that should be performed on the OS, your current OS/ES cluster and your config files.

+

You can get more information on the Data Node migration .


diff --git a/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx b/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx index a20cf7fd03a2..eaa21542fa2b 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx @@ -15,6 +15,7 @@ * . */ import * as React from 'react'; +import styled from 'styled-components'; import CompatibilityCheckStep from 'components/datanode/migrations/CompatibilityCheckStep'; import { Spinner, Wizard } from 'components/common'; @@ -28,6 +29,14 @@ import MigrationWelcomeStep from 'components/datanode/migrations/MigrationWelcom import CertificateRenewalStep from 'components/datanode/migrations/CertificateRenewalStep'; import MigrationFinishedStep from 'components/datanode/migrations/MigrationFinishedStep'; +const StyledWizard = styled(Wizard)` + .migration-wizard{ + .nav > li > a { + background-color: red !important; + } + } +`; + const MigrationWizard = () => { const { step: currentStep, isLoading } = useMigrationWizardStep(); const { onTriggerNextState } = useTriggerMigrationState(); @@ -76,13 +85,13 @@ const MigrationWizard = () => { ]; return ( - {}} - horizontal - justified - containerClassName="" - hidePreviousNextButtons /> + {}} + horizontal + justified + containerClassName="migration-wizard" + hidePreviousNextButtons /> ); }; diff --git a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx index 9d5566d06e47..bdd05259a9b4 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx @@ -40,6 +40,7 @@ const StyledTitle = styled.h3` font-size: 80%; } `; + const StyledPanelGroup = styled(PanelGroup)` &.panel-group > .panel { margin-top: 0; @@ -121,7 +122,6 @@ const RemoteReindexingMigration = ({ currentStep, onTriggerNextStep }: Props) => ); })} - ); diff --git a/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx index 1bf9d9c3e460..58b848dff14e 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx @@ -31,7 +31,8 @@ import MigrationError from 'components/datanode/migrations/common/MigrationError type Props = { currentStep: MigrationState, onTriggerNextStep: (step: MigrationActions, args: StepArgs) => void, -} +}; + const StyledTitle = styled.h3` margin-bottom: 10px; @@ -39,6 +40,7 @@ const StyledTitle = styled.h3` font-size: 80%; } `; + const StyledPanelGroup = styled(PanelGroup)` &.panel-group > .panel { margin-top: 0; @@ -91,9 +93,9 @@ const RollingUpgradeMigration = ({ currentStep, onTriggerNextStep }: Props) => { return ( - Rolling upgrade migration. -

Follow these steps to migrate your existing migrating an existing OpenSearch 2.x or 1.3.x cluster to Data - Node + Rolling upgrade migration +

Follow these steps to migrate your existing OpenSearch version 2.x or 1.3.x cluster to the Data + Node.

{}}> {ROLLING_UPGRADE_MIGRATION_STEPS.map((rollingUpgradeStep, index) => { diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx index b6ff652c61a8..4df18934595b 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx @@ -22,7 +22,7 @@ import { Space } from 'preflight/components/common'; const ConnectionStringRemovalStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <> -

Please remove the elasticsearch_hosts line from you graylog configuration file (graylog.conf).

+

Please remove the elasticsearch_hosts line from you Graylog configuration file (graylog.conf).

Ex. elasticsearch_hosts = https://admin:admin@opensearch1:9200,https://admin:admin@opensearch2:9200,https://admin:admin@opensearch3:9200

Once that is done please proceed to the next step.

diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx index 990e362c50d4..d11b631577d5 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx @@ -22,11 +22,10 @@ import { Space } from 'preflight/components/common'; const ShutdownClusterStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <> -

The migration from your current Opensearch to the data node is almost done.

-

to finish please shut down your Opensearch cluster before continuing.

+

The migration from your current OpenSearch to the Data Node is almost done.

+

to finish please shut down your OpenSearch cluster before continuing.

- ); export default ShutdownClusterStep; diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx index 5fc4bdb91f77..44820edb7e81 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx @@ -30,7 +30,7 @@ const Welcome = ({ currentStep, onTriggerStep } : MigrationStepComponentProps) = <>

Welcome

Using the Remote Reindexing will allow you to move the datanode by reindexing the data in your existing cluster to the datanode cluster.

-

To start please install Data node on every OS/ES node from you previous setup. You can fing more information on how to download and install the data node .

+

To start please install Data Node on every OS/ES node from you previous setup. You can fing more information on how to download and install the Data Node .

diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx index cc66aa2708dc..7e9aa0ba222e 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx @@ -40,14 +40,14 @@ const CertificatesProvisioning = ({ currentStep, onTriggerStep }: MigrationStepC {isProvisioningOverview && (

Certificate authority has been configured successfully.
- You can now provision certificate for your data nodes. + You can now provision certificate for your Data Nodes.

)} {(isProvisioningRunning && !haveNextStep) && ( )} {(isProvisioningRunning && haveNextStep) && ( - Provisioning the data node finished. + Provisioning the Data Node finished. )}
diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx index 099e96ce41c8..806576e51791 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx @@ -29,7 +29,7 @@ const DownsizeWarning = styled(Alert)` const JournalDowntimeWarning = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

Journal downtime size warning

-

Please note that during migration you will have to stop processing on your graylog node, this will result in the journal growing in size.

+

Please note that during migration you will have to stop processing on your Graylog node, this will result in the journal growing in size.

Therefore you will have to increase your journal volume size during the Journal size downsize step or earlier.

Please make sure your journal volume size is enough before proceeding.

@@ -37,4 +37,5 @@ const JournalDowntimeWarning = ({ currentStep, onTriggerStep }: MigrationStepCom ); + export default JournalDowntimeWarning; diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalSizeWarning.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalSizeWarning.tsx index c80836056ead..28f02f08269a 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalSizeWarning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalSizeWarning.tsx @@ -30,10 +30,11 @@ const JournalSizeWarning = () => ( Journal size warning -

Please note that during migration you will have to stop processing on your graylog node, this will result in the journal growing in size. +

Please note that during migration you will have to stop processing on your Graylog node, this will result in the journal growing in size. Therefore you will have to increase your journal volume size during the Journal size downsize step or earlier.

); + export default JournalSizeWarning; diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx index 3533cd7e56ac..153723e05571 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx @@ -23,13 +23,12 @@ import { Space } from 'preflight/components/common'; const RestartGraylog = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

Almost there !

-

Please remove the elasticsearch_hosts line from you graylog

+

Please remove the elasticsearch_hosts line from your graylog.conf

Ex. elasticsearch_hosts = https://admin:admin@opensearch1:9200,https://admin:admin@opensearch2:9200,https://admin:admin@opensearch3:9200

-

Once the done. Please restart graylog to finish the migration

+

Once that`‘`s done. Please restart Graylog to finish the migration.

- ); export default RestartGraylog; diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx index e4d4e39d4dff..85262d7f3acc 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx @@ -26,6 +26,7 @@ import { StyledPanel } from 'components/datanode/migrations/MigrationWelcomeStep const StyledHelpPanel = styled(StyledPanel)` margin-top: 30px; `; + const StopMessageProcessing = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

Graylog processing is stopped.

@@ -33,13 +34,13 @@ const StopMessageProcessing = ({ currentStep, onTriggerStep }: MigrationStepComp - Stop Opensearch + Stop OpenSearch -

Please stop your Opensearch cluster before proceeding.

+

Please stop your OpenSearch cluster before proceeding.

 - ); + export default StopMessageProcessing; diff --git a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx index ba9267f6356e..91effe6e4033 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx @@ -32,8 +32,8 @@ const Welcome = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) =>

Welcome

-

Using the rolling upgrade will allow you to move the data node by using the data folder of your existing cluster to the datanode cluster.

-

To start please install Data node on every OS/ES node from you previous setup. You can find more information on how to download and install the data node .

+

Using the rolling upgrade will allow you to move the Data Node by using the data folder of your existing cluster to the datanode cluster.

+

To start please install Data Node on every OS/ES node from your previous setup. You can find more information on how to download and install the Data Node .

Hostname Transport addressstatusStatus Certificate valid until