server.conf instead of graylog.conf (#20450)

* server.conf instead of graylog.conf * changelog file * readable changelog --------- Co-authored-by: Matthias Oesterheld <[email protected]>
Graylog2 · Sep 20, 2024 · 7b1aa3b · 7b1aa3b
1 parent 64a6352
commit 7b1aa3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/changelog/unreleased/issue-20448.toml b/changelog/unreleased/issue-20448.toml
@@ -0,0 +1,5 @@
+type="f"
+message="Use the correct Data Node configuration file server.conf instead of graylog.conf"
+
+issues=["20448"]
+pulls=["20450"]
diff --git a/graylog2-web-interface/src/components/datanode/migrations/in-place/RestartGraylog.tsx b/graylog2-web-interface/src/components/datanode/migrations/in-place/RestartGraylog.tsx
@@ -24,7 +24,7 @@ import MigrationDatanodeList from 'components/datanode/migrations/MigrationDatan
 const RestartGraylog = ({ currentStep, onTriggerStep, hideActions }: MigrationStepComponentProps) => (
   <>
     <p>Almost there!</p>
-    <p>Please remove the <code>elasticsearch_hosts</code> line from your <code>graylog.conf</code></p>
+    <p>Please remove the <code>elasticsearch_hosts</code> line from your <code>server.conf</code></p>
     <p>E.g., <code>elasticsearch_hosts = https://admin:admin@opensearch1:9200,https://admin:admin@opensearch2:9200,https://admin:admin@opensearch3:9200</code></p>
     <Space h="md" />
     <MigrationDatanodeList showProvisioningState={false} />

diff --git a/...ace/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx b/...ace/src/components/datanode/migrations/remoteReindexing/ExistingDataMigrationQuestion.tsx
@@ -25,7 +25,7 @@ const ExistingDataMigrationQuestion = ({ currentStep, onTriggerStep, hideActions
   <>
     <p>Do you want to migrate your existing data?</p>
     <Space h="md" />
-    <p>Please remove the <code>elasticsearch_hosts</code> line from your Graylog configuration file (<code>graylog.conf</code>).</p>
+    <p>Please remove the <code>elasticsearch_hosts</code> line from your Graylog configuration file (<code>server.conf</code>).</p>
     <p>E.g., <code>elasticsearch_hosts = https://admin:admin@opensearch1:9200,https://admin:admin@opensearch2:9200,https://admin:admin@opensearch3:9200</code></p>
     <Space h="md" />
     <p>Once that is done please restart Graylog to finish the migration.</p>