diff --git a/CHANGELOG.md b/CHANGELOG.md index 58aa25ba170..2d080e9d0a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ This changelog documents all notable user-facing changes of VAST. ## Unreleased +- ⚠️ The option `vast.no-default-schema` is deprecated, as it is no longer needed + to override types from bundled schemas. + [#1409](https://github.com/tenzir/vast/pull/1409) + - ⚠️ VAST now ships with schema record types for Suricata's `mqtt` and `anomaly` event types. [#1408](https://github.com/tenzir/vast/pull/1408) diff --git a/libvast/src/schema.cpp b/libvast/src/schema.cpp index 22e7a6b8ad6..5ce3ac9dff5 100644 --- a/libvast/src/schema.cpp +++ b/libvast/src/schema.cpp @@ -223,7 +223,10 @@ detail::stable_set get_schema_dirs(const caf::actor_system_config& cfg, std::vector objpath_addresses) { detail::stable_set result; - if (!caf::get_or(cfg, "vast.no-default-schema", false)) { + if (caf::get_or(cfg, "vast.no-default-schema", false)) { + VAST_WARN("the option 'vast.no-default-schema' is deprecated and will be " + "removed in a future release"); + } else { #if !VAST_ENABLE_RELOCATABLE_INSTALLATIONS result.insert(VAST_DATADIR "/vast/schema"); #endif diff --git a/libvast/src/system/application.cpp b/libvast/src/system/application.cpp index 2b8f0220f5e..9155dfd8c6f 100644 --- a/libvast/src/system/application.cpp +++ b/libvast/src/system/application.cpp @@ -517,7 +517,7 @@ auto make_root_command(std::string_view path) { .add("node,N", "spawn a node instead of connecting to one") .add("enable-metrics", "keep track of performance metrics") .add("no-default-schema", "don't load the default schema " - "definitions") + "definitions (deprecated)") .add>("plugin-dirs", "additional directories " "to load plugins from") .add>("plugins", "plugins to load at startup") diff --git a/vast.yaml.example b/vast.yaml.example index 75ced210281..2b1f3446a98 100644 --- a/vast.yaml.example +++ b/vast.yaml.example @@ -57,7 +57,6 @@ vast: # List of directories to look for schema files in ascending order of priority. # Note: Automatically prepended with # ["/../share/vast/schema", "/etc/vast/schema"]. - # Use the no-default-schema option to turn off this mechanism. #schema-dirs: [] # Additional directories to load plugins specified using `vast.plugins` from. @@ -66,8 +65,6 @@ vast: # files in the specified `vast.plugin-dirs`. # Note: Add libexample or libexample here to load the example plugin. plugins: [] - # Don't load the default schema definitions. - no-default-schema: false # The unique ID of this node. node-id: "node" # Spawn a node instead of connecting to one.