diff --git a/graylog2-web-interface/src/components/datanode/Types.ts b/graylog2-web-interface/src/components/datanode/Types.ts index 43a8f20ebddaf..93fb4db1fc566 100644 --- a/graylog2-web-interface/src/components/datanode/Types.ts +++ b/graylog2-web-interface/src/components/datanode/Types.ts @@ -85,7 +85,7 @@ export type MigrationStateItem = ExtractKeyValues export type MigrationState = { state: MigrationStateItem, next_steps: Array, - error_message?: string|null, + error_message?: string | null, response?: { [_key: string]: unknown }, } @@ -99,6 +99,6 @@ export type StepArgs = {[_key: string]: unknown}; export type OnTriggerStepFunction = (step: MigrationActions, args: StepArgs) => void export type MigrationStepComponentProps = { - nextSteps: Array, + currentStep: MigrationState, onTriggerStep: OnTriggerStepFunction, }; diff --git a/graylog2-web-interface/src/components/datanode/migrations/CAStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/CAStep.tsx index 570cc491f3599..aa9ce99371ca1 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CAStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CAStep.tsx @@ -20,12 +20,15 @@ import CAConfiguration from 'components/datanode/DataNodeConfiguration/CAConfigu import { Space } from 'preflight/components/common'; import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; -const CaStep = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const CaStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <> + - + {(currentStep.next_steps.length <= 0) && (

Please create a certificate Authority before proceeding.

)} + ); export default CaStep; diff --git a/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx index 678c1d29776c6..75a87d859422e 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CertificateRenewalStep.tsx @@ -20,12 +20,15 @@ import CertificateRenewalPolicyConfig from 'components/datanode/DataNodeConfigur import { Space } from 'preflight/components/common'; import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; -const CertificateRenewalStep = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const CertificateRenewalStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <> + - + {(currentStep.next_steps.length <= 0) && (

Please create a certificate renewal policy before proceeding.

)} + ); 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 f9a0da939046b..682b73c95a26e 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.test.tsx @@ -20,6 +20,7 @@ import { render, screen } from 'wrappedTestingLibrary'; import CompatibilityCheckStep from 'components/datanode/migrations/CompatibilityCheckStep'; import { asMock } from 'helpers/mocking'; import useCompatibilityCheck from 'components/datanode/hooks/useCompatibilityCheck'; +import type { MigrationState } from 'components/datanode/Types'; jest.mock('components/datanode/hooks/useCompatibilityCheck', () => jest.fn(() => ({ data: { @@ -43,9 +44,18 @@ jest.mock('components/datanode/hooks/useCompatibilityCheck', () => jest.fn(() => error: undefined, }))); +const currentStep = { + state: 'DIRECTORY_COMPATIBILITY_CHECK_PAGE', + next_steps: [ + 'SHOW_CA_CREATION', + ], + error_message: null, + response: null, +} as MigrationState; + describe('CompatibilityCheckStep', () => { it('should render CompatibilityCheckStep', async () => { - render( {}} nextSteps={[]} />); + render( {}} currentStep={currentStep} />); await screen.findByRole('heading', { name: /Your existing opensearch data can be migrated to data node\./i, @@ -65,7 +75,7 @@ describe('CompatibilityCheckStep', () => { error: undefined, }); - render( {}} nextSteps={[]} />); + render( {}} currentStep={currentStep} />); await screen.findByRole('heading', { 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 d474b7b184e2b..1ec5d9c528840 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/CompatibilityCheckStep.tsx @@ -29,7 +29,7 @@ const CompatibilityAlert = styled(Alert)` margin-bottom: 5px; `; -const CompatibilityCheckStep = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { +const CompatibilityCheckStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => { const { error: requestError, data, isInitialLoading, isError } = useCompatibilityCheck(); if (isInitialLoading) { @@ -60,7 +60,7 @@ const CompatibilityCheckStep = ({ nextSteps, onTriggerStep }: MigrationStepCompo {!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/ManualMigrationStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/ManualMigrationStep.tsx index f5887abdf4399..f67cf68acb318 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/ManualMigrationStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/ManualMigrationStep.tsx @@ -29,6 +29,7 @@ import { ROLLING_UPGRADE_MIGRATION_STEPS, } from 'components/datanode/Constants'; import RemoteReindexingMigration from 'components/datanode/migrations/RemoteReindexingMigration'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; const ManualMigrationStep = () => { const migrationTypeOptions = [{ label: 'Rolling upgrade migration', value: 'SELECT_ROLLING_UPGRADE_MIGRATION' }, { label: 'Remote Re-indexing Migration', value: 'SELECT_REMOTE_REINDEX_MIGRATION' }]; @@ -62,6 +63,7 @@ const ManualMigrationStep = () => { )} + {(currentStep && ROLLING_UPGRADE_MIGRATION_STEPS.includes(currentStep.state)) && } {(currentStep && REMOTE_REINDEXING_MIGRATION_STEPS.includes(currentStep.state)) && } diff --git a/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx b/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx index 3f65931a7de9a..c9e71de1918c1 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/MigrationWelcomeStep.tsx @@ -22,10 +22,11 @@ import { Icon } from 'components/common'; import { DocumentationLink } from 'components/support'; import MigrationDatanodeList from 'components/datanode/migrations/MigrationDatanodeList'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; -import type { MigrationActions, OnTriggerStepFunction } from 'components/datanode/Types'; +import type { MigrationState, OnTriggerStepFunction } from 'components/datanode/Types'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; type Props = { - nextSteps: Array, + currentStep: MigrationState, onTriggerStep: OnTriggerStepFunction, }; @@ -47,9 +48,10 @@ const StyledHelpPanel = styled(StyledPanel)` margin-top: 30px; `; -const MigrationWelcomeStep = ({ nextSteps, onTriggerStep }: Props) => ( +const MigrationWelcomeStep = ({ currentStep, onTriggerStep }: Props) => ( + 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. @@ -61,7 +63,7 @@ const MigrationWelcomeStep = ({ nextSteps, onTriggerStep }: Props) => (

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 1b72e5e1988eb..a20cf7fd03a2a 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/MigrationWizard.tsx @@ -40,28 +40,28 @@ const MigrationWizard = () => { onTriggerNextState({ step, args }); }; - const { state: activeStep, next_steps: nextSteps } = currentStep; + const { state: activeStep } = currentStep; const steps = [ { key: MIGRATION_STATE.MIGRATION_WELCOME_PAGE.key, title: MIGRATION_STATE.MIGRATION_WELCOME_PAGE.description, - component: , + component: , }, { key: MIGRATION_STATE.DIRECTORY_COMPATIBILITY_CHECK_PAGE.key, title: MIGRATION_STATE.DIRECTORY_COMPATIBILITY_CHECK_PAGE.description, - component: , + component: , }, { key: MIGRATION_STATE.CA_CREATION_PAGE.key, title: MIGRATION_STATE.CA_CREATION_PAGE.description, - component: , + component: , }, { key: MIGRATION_STATE.RENEWAL_POLICY_CREATION_PAGE.key, title: MIGRATION_STATE.RENEWAL_POLICY_CREATION_PAGE.description, - component: , + component: , }, { key: MIGRATION_STATE.MIGRATION_SELECTION_PAGE.key, diff --git a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx index 790325fe85d6e..64427eb0ba4ad 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx @@ -23,6 +23,7 @@ import { REMOTE_REINDEXING_MIGRATION_STEPS, } from 'components/datanode/Constants'; import type { MigrationActions, StepArgs, MigrationState, MigrationStateItem } from 'components/datanode/Types'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; import Welcome from './remoteReindexing/Welcome'; import ExistingDataMigrationQuestion from './remoteReindexing/ExistingDataMigrationQuestion'; @@ -68,7 +69,7 @@ type Props = { } const RemoteReindexingMigration = ({ currentStep, onTriggerNextStep }: Props) => { - const { next_steps: nextSteps, state: activeStep } = currentStep; + const { state: activeStep } = currentStep; const onStepComplete = (step: MigrationActions, args: StepArgs = {}) => { onTriggerNextStep(step, args); @@ -77,22 +78,22 @@ const RemoteReindexingMigration = ({ currentStep, onTriggerNextStep }: Props) => const getStepComponent = (step: MigrationStateItem) => { switch (step) { case MIGRATION_STATE.REMOTE_REINDEX_WELCOME_PAGE.key: - return ; + return ; case MIGRATION_STATE.PROVISION_DATANODE_CERTIFICATES_PAGE.key: case MIGRATION_STATE.PROVISION_DATANODE_CERTIFICATES_RUNNING.key: - return ; + return ; case MIGRATION_STATE.EXISTING_DATA_MIGRATION_QUESTION_PAGE.key: - return ; + return ; case MIGRATION_STATE.MIGRATE_EXISTING_DATA.key: - return ; + return ; case MIGRATION_STATE.REMOTE_REINDEX_RUNNING.key: - return ; + return ; case MIGRATION_STATE.ASK_TO_SHUTDOWN_OLD_CLUSTER.key: - return ; + return ; case MIGRATION_STATE.MANUALLY_REMOVE_OLD_CONNECTION_STRING_FROM_CONFIG.key: - return ; + return ; default: - return ; + return ; } }; @@ -114,6 +115,7 @@ const RemoteReindexingMigration = ({ currentStep, onTriggerNextStep }: Props) => + {getStepComponent(remoteReindexingStep)} diff --git a/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx index 9cca73e6d8724..1bf9d9c3e460d 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/RollingUpgradeMigration.tsx @@ -26,6 +26,7 @@ import JournalDowntimeWarning from 'components/datanode/migrations/rollingUpgrad import StopMessageProcessing from 'components/datanode/migrations/rollingUpgrade/StopMessageProcessing'; import CompatibilityCheckStep from 'components/datanode/migrations/CompatibilityCheckStep'; import RestartGraylog from 'components/datanode/migrations/rollingUpgrade/RestartGraylog'; +import MigrationError from 'components/datanode/migrations/common/MigrationError'; type Props = { currentStep: MigrationState, @@ -62,7 +63,7 @@ const StyledPanelGroup = styled(PanelGroup)` `; const RollingUpgradeMigration = ({ currentStep, onTriggerNextStep }: Props) => { - const { next_steps: nextSteps, state: activeStep } = currentStep; + const { state: activeStep } = currentStep; const onStepComplete = (step: MigrationActions, args: StepArgs = {}) => { onTriggerNextStep(step, args); @@ -71,20 +72,20 @@ const RollingUpgradeMigration = ({ currentStep, onTriggerNextStep }: Props) => { const getStepComponent = (step: MigrationStateItem) => { switch (step) { case MIGRATION_STATE.ROLLING_UPGRADE_MIGRATION_WELCOME_PAGE.key: - return ; + return ; case MIGRATION_STATE.DIRECTORY_COMPATIBILITY_CHECK_PAGE2.key: - return ; + return ; case MIGRATION_STATE.PROVISION_ROLLING_UPGRADE_NODES_WITH_CERTIFICATES.key: case MIGRATION_STATE.PROVISION_ROLLING_UPGRADE_NODES_RUNNING.key: - return ; + return ; case MIGRATION_STATE.JOURNAL_SIZE_DOWNTIME_WARNING.key: - return ; + return ; case MIGRATION_STATE.MESSAGE_PROCESSING_STOP.key: - return ; + return ; case MIGRATION_STATE.RESTART_GRAYLOG.key: - return ; + return ; default: - return ; + return ; } }; @@ -107,6 +108,7 @@ const RollingUpgradeMigration = ({ currentStep, onTriggerNextStep }: Props) => { + {getStepComponent(rollingUpgradeStep)} 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 5b33e4e7b9b1e..b6ff652c61a89 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ConnectionStringRemovalStep.tsx @@ -20,13 +20,13 @@ import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; import { Space } from 'preflight/components/common'; -const ConnectionStringRemovalStep = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const ConnectionStringRemovalStep = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

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.

- + ); export default ConnectionStringRemovalStep; diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx index c7318dd887aee..c32d12edc1c14 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx @@ -19,12 +19,12 @@ import * as React from 'react'; import type { MigrationStepComponentProps } from '../../Types'; import MigrationStepTriggerButtonToolbar from '../common/MigrationStepTriggerButtonToolbar'; -const ExistingDataMigrationQuestion = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const ExistingDataMigrationQuestion = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <> Do you want to migrate your existing data?

- + ); diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/MigrateExistingData.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/MigrateExistingData.tsx index 002785c8d9ac9..a205662ff4fa4 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/MigrateExistingData.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/MigrateExistingData.tsx @@ -23,7 +23,7 @@ import type { RemoteReindexRequest } from '../../hooks/useRemoteReindexMigration import type { MigrationStepComponentProps } from '../../Types'; import MigrationStepTriggerButtonToolbar from '../common/MigrationStepTriggerButtonToolbar'; -const MigrateExistingData = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { +const MigrateExistingData = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => { const initialValues: RemoteReindexRequest = { hostname: '', user: '', @@ -58,7 +58,7 @@ const MigrateExistingData = ({ nextSteps, onTriggerStep }: MigrationStepComponen type="password" value={values.password} onChange={handleChange} /> - + )} diff --git a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/RemoteReindexRunning.tsx b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/RemoteReindexRunning.tsx index cb0eb1a8f7273..4b6f58731230f 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/RemoteReindexRunning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/RemoteReindexRunning.tsx @@ -23,7 +23,7 @@ import type { MigrationStepComponentProps } from '../../Types'; import MigrationStepTriggerButtonToolbar from '../common/MigrationStepTriggerButtonToolbar'; import useMigrationState from '../../hooks/useMigrationState'; -const RemoteReindexRunning = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { +const RemoteReindexRunning = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => { const { currentStep: { response } } = useMigrationState(3000); const remoteReindexMigration = response as RemoteReindexMigration; @@ -41,7 +41,7 @@ const RemoteReindexRunning = ({ nextSteps, onTriggerStep }: MigrationStepCompone bsStyle: 'info', label: remoteReindexMigration?.status, }]} /> - + ); }; 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 9870a2840df64..990e362c50d4e 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/ShutdownClusterStep.tsx @@ -20,12 +20,12 @@ import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/co import type { MigrationStepComponentProps } from 'components/datanode/Types'; import { Space } from 'preflight/components/common'; -const ShutdownClusterStep = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +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.

- + ); 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 d489a4ec2dcd0..5fc4bdb91f776 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/remoteReindexing/Welcome.tsx @@ -23,7 +23,7 @@ import useDataNodes from 'components/datanode/hooks/useDataNodes'; import MigrationStepTriggerButtonToolbar from '../common/MigrationStepTriggerButtonToolbar'; import type { MigrationStepComponentProps } from '../../Types'; -const Welcome = ({ nextSteps, onTriggerStep } : MigrationStepComponentProps) => { +const Welcome = ({ currentStep, onTriggerStep } : MigrationStepComponentProps) => { const { data: dataNodes } = useDataNodes(); return ( @@ -32,7 +32,7 @@ const Welcome = ({ nextSteps, onTriggerStep } : MigrationStepComponentProps) =>

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 .

- + ); }; 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 30a5ae860bd55..cc66aa2708dca 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/CertificatesProvisioning.tsx @@ -24,7 +24,7 @@ import useMigrationState from 'components/datanode/hooks/useMigrationState'; import MigrationDatanodeList from 'components/datanode/migrations/MigrationDatanodeList'; import { Alert } from 'components/bootstrap'; -const CertificatesProvisioning = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { +const CertificatesProvisioning = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => { const { currentStep: step, isLoading } = useMigrationState(3000); if (isLoading) { @@ -51,7 +51,7 @@ const CertificatesProvisioning = ({ nextSteps, onTriggerStep }: MigrationStepCom )}
- + ); }; 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 83b50fdc0021c..099e96ce41c8c 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/JournalDowntimeWarning.tsx @@ -20,21 +20,21 @@ import styled from 'styled-components'; import { Alert } from 'components/bootstrap'; import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; -import JournalSizeWarning from 'components/datanode/migrations/rollingUpgrade/JournalSizeWarning'; const DownsizeWarning = styled(Alert)` margin-top: 10px; margin-bottom: 5px; `; -const JournalDowntimeWarning = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +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.

+

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.

- + ); export default JournalDowntimeWarning; 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 5f867f9dfa808..3533cd7e56ac3 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/RestartGraylog.tsx @@ -20,14 +20,14 @@ import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; import { Space } from 'preflight/components/common'; -const RestartGraylog = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const RestartGraylog = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

Almost there !

Please remove the elasticsearch_hosts line from you graylog

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

- + ); 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 dae81cdbc1b32..29d98c347faa5 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/StopMessageProcessing.tsx @@ -19,11 +19,11 @@ import * as React from 'react'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; import type { MigrationStepComponentProps } from 'components/datanode/Types'; -const StopMessageProcessing = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => ( +const StopMessageProcessing = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => ( <>

Graylog processing is stopped.

- + ); 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 a90b31f15dde1..ba9267f6356e9 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/rollingUpgrade/Welcome.tsx @@ -24,7 +24,7 @@ import type { MigrationStepComponentProps } from 'components/datanode/Types'; import MigrationStepTriggerButtonToolbar from 'components/datanode/migrations/common/MigrationStepTriggerButtonToolbar'; import JournalSizeWarning from 'components/datanode/migrations/rollingUpgrade/JournalSizeWarning'; -const Welcome = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { +const Welcome = ({ currentStep, onTriggerStep }: MigrationStepComponentProps) => { const { data: dataNodes } = useDataNodes(); return ( @@ -40,7 +40,7 @@ const Welcome = ({ nextSteps, onTriggerStep }: MigrationStepComponentProps) => { - + ); };