Remove Sidecar collector configuration path #5278
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mariussturm
reviewed
Nov 13, 2018
...c/main/java/org/graylog/plugins/sidecar/migrations/V20180212165000_AddDefaultCollectors.java
Outdated
Show resolved
Hide resolved
We use the collector name in the configuration path. Avoid problems by restricting it to a characters that need no escape handling.
and fix annotation on copy route
Instead of a GUI option, we let the sidecar autogenerate the path to ".../generated/<collector_name>.conf" Remove existing configuration_path values in the migration to simplify upgrading to this change. Fixes #5265
mariussturm
approved these changes
Nov 14, 2018
mpfz0r
added a commit
to Graylog2/collector-sidecar
that referenced
this pull request
Sep 12, 2022
thll
pushed a commit
to Graylog2/collector-sidecar
that referenced
this pull request
Sep 14, 2022
* Add configuration id to backend name and configuration path
This enables us to use the same backend with multiple
configurations
* Support multiple configs per assignment
Expand each assignment and backend into a unique ID
that combines the backendID + configID
Most of the stores us a map with this Id that holds
everything together.
* Replace GetBackendById with simpler GetBackend method
* Cleanup
* Keep using old assignment struct
Multiple configs can still be assigned by using multiple assignments.
E.g.:
[
{ "collector-1": "config-A" },
{ "collector-1": "config-B" }
]
* Report collector config directory to the server
This will be used to create the ${sidecar.spoolDir} config variable.
* Only report CollectorConfigurationDirectory to newer Graylog instances
Older Graylog servers will refuse unknown NodeDetails attributes
Also update go module to version 1.19
* Make collector status ID backwards compatible
If we are talking to an older Graylog instance,
report the collectors with just the collector ID.
Refactor version handling into separate type
* Fix and refactor version comparison
* Ignore sleep on the first periodical loop
Speeds up testing the sidecar
* fix benchmarks
* build with go 1.19
* fix jeninks file
* Fix null pointer deref.
The recent code changes triggered an old exisiting bug,
because we would only keep a backend list of actually assigned
backends.
* Prefer pointer receivers
* Send tags and collector config regardless of send_status
* Remove configuration_file_name support.
Refs Graylog2/graylog2-server#5278
* Add configuration_id to each collector status request
Newer Graylog servers can use it to differentiate
multiple configs on one collector.
Older servers won't see this field for backwards compatibility.
* fix runner comparision
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of a GUI option, we let the sidecar autogenerate the path
to ".../generated/<collector_name>.conf"
Add validations for the collector name, so it can be used as a filename.