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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support loading multiple configuration files #970

Merged
merged 2 commits into from
Aug 28, 2023
Merged

Conversation

SuperQ
Copy link
Member

@SuperQ SuperQ commented Aug 27, 2023

Support loading multiple configuration files by by allowing --config.file to be repeateable. As well as supporting glob file matching for config.d style setups.

  • Conflicting auth or module keys are treated as errors.

Fixes: #628

@SuperQ SuperQ requested a review from RichiH August 27, 2023 16:15
@SuperQ SuperQ force-pushed the superq/multi_config branch from a4c4a38 to da55a14 Compare August 27, 2023 16:21
Support loading multiple configuration files by by allowing
`--config.file` to be repeateable. As well as supporting glob file
matching for `config.d` style setups.
* Conflicting auth or module keys are treated as errors.

Fixes: #628

Signed-off-by: SuperQ <superq@gmail.com>
@SuperQ SuperQ force-pushed the superq/multi_config branch from da55a14 to 266b98b Compare August 27, 2023 16:22
@SuperQ SuperQ requested a review from roidelapluie August 27, 2023 19:26
README.md Outdated Show resolved Hide resolved
Signed-off-by: Ben Kochie <superq@gmail.com>

Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com>
Signed-off-by: Ben Kochie <superq@gmail.com>
@SuperQ SuperQ merged commit cbb5f04 into main Aug 28, 2023
@SuperQ SuperQ deleted the superq/multi_config branch August 28, 2023 09:37
SuperQ added a commit that referenced this pull request Aug 29, 2023
* [CHANGE] Sanitize invalid UTF-8 #968
* [FEATURE] Support fetching multiple modules in one scrape #945
* [FEATURE] Support loading multiple configuration files #970

Signed-off-by: SuperQ <superq@gmail.com>
@SuperQ SuperQ mentioned this pull request Aug 29, 2023
SuperQ added a commit that referenced this pull request Aug 29, 2023
* [CHANGE] Sanitize invalid UTF-8 #968
* [FEATURE] Support fetching multiple modules in one scrape #945
* [FEATURE] Support loading multiple configuration files #970

Signed-off-by: SuperQ <superq@gmail.com>
stephan-windischmann-sky pushed a commit to stephan-windischmann-sky/snmp_exporter that referenced this pull request Oct 27, 2023
* Support loading multiple configuration files

Support loading multiple configuration files by by allowing
`--config.file` to be repeateable. As well as supporting glob file
matching for `config.d` style setups.
* Conflicting auth or module keys are treated as errors.

Fixes: prometheus#628
---------

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Ben Kochie <superq@gmail.com>
Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com>
Signed-off-by: Stephan Windischmann <windi@Stephans-MacBook-Pro.local>
stephan-windischmann-sky pushed a commit to stephan-windischmann-sky/snmp_exporter that referenced this pull request Oct 27, 2023
* [CHANGE] Sanitize invalid UTF-8 prometheus#968
* [FEATURE] Support fetching multiple modules in one scrape prometheus#945
* [FEATURE] Support loading multiple configuration files prometheus#970

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Stephan Windischmann <windi@Stephans-MacBook-Pro.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support config.d
2 participants