Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate the vast.no-default-schema option #1409

Merged
merged 1 commit into from Mar 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion libvast/src/schema.cpp
Expand Up @@ -223,7 +223,10 @@ detail::stable_set<vast::path>
get_schema_dirs(const caf::actor_system_config& cfg,
std::vector<const void*> objpath_addresses) {
detail::stable_set<vast::path> 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
Expand Down
2 changes: 1 addition & 1 deletion libvast/src/system/application.cpp
Expand Up @@ -517,7 +517,7 @@ auto make_root_command(std::string_view path) {
.add<bool>("node,N", "spawn a node instead of connecting to one")
.add<bool>("enable-metrics", "keep track of performance metrics")
.add<bool>("no-default-schema", "don't load the default schema "
"definitions")
"definitions (deprecated)")
.add<std::vector<std::string>>("plugin-dirs", "additional directories "
"to load plugins from")
.add<std::vector<std::string>>("plugins", "plugins to load at startup")
Expand Down
3 changes: 0 additions & 3 deletions vast.yaml.example
Expand Up @@ -57,7 +57,6 @@ vast:
# List of directories to look for schema files in ascending order of priority.
# Note: Automatically prepended with
# ["<binary_directory>/../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.
Expand All @@ -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.
Expand Down