v2 migration script - change wording when unexpected fluent-bit secti…

…on encountered
SumoLogic · Jan 12, 2021 · 4229c55 · 4229c55
1 parent 3bcfbad
commit 4229c55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deploy/helm/sumologic/upgrade-2.0.0.sh b/deploy/helm/sumologic/upgrade-2.0.0.sh
@@ -861,7 +861,7 @@ function migrate_fluent_bit() {
       fi
     elif [[ "${line}" =~ ^@.* ]]; then
       # Don't migrate "@INCLUDE"s and other unrecognized sections
-      warning "You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. Please migrate it manually. Line: ${line}"
+      warning "You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. It shouldn't be necessary in 2.0 but please consider whether you need to migrate this manually. Line: ${line}"
       continue
     else
       # Trim whitespace

diff --git a/tests/upgrade_v2_script/static/fluent_bit.log b/tests/upgrade_v2_script/static/fluent_bit.log
@@ -1,8 +1,8 @@
 
 [INFO]    Migrating prometheus remote write urls
 [INFO]    Migrating "fluent-bit.backend.forward.host" from "${CHART}.${NAMESPACE}.svc.cluster.local." to "${FLUENTD_LOGS_SVC}.${NAMESPACE}.svc.cluster.local."
-[WARNING] You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. Please migrate it manually. Line: @INCLUDE fluent-bit-service.conf
-[WARNING] You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. Please migrate it manually. Line: @INCLUDE fluent-bit-output.conf
+[WARNING] You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. It shouldn't be necessary in 2.0 but please consider whether you need to migrate this manually. Line: @INCLUDE fluent-bit-service.conf
+[WARNING] You have an unexpected section in your fluent-bit configuration that we're not migrating automatically. It shouldn't be necessary in 2.0 but please consider whether you need to migrate this manually. Line: @INCLUDE fluent-bit-output.conf
 
 Thank you for upgrading to v2.0.0 of the Sumo Logic Kubernetes Collection Helm chart.
 A new yaml file has been generated for you. Please check the current directory for new_values.yaml.