Use CLI11 to provide proper argument/option parsing to netdatacli #19099
Conversation
This file contains hidden or 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
Ferroin
reviewed
Dec 9, 2024
| ) | ||
| else() | ||
| FetchContent_Declare(CLI11 | ||
| GIT_REPOSITORY https://github.com/microsoft/mimalloc.git |
There was a problem hiding this comment.
Mimalloc should be it’s own thing unless it’s absolutely required by CLI11.
Comment on lines
+152
to
+167
| app.set_help_flag("--help", "Show this help message and exit"); | ||
| app.add_flag("--reload-health", reload_health, "Reload health configuration"); | ||
| app.add_flag("--reload-labels", reload_labels, "Reload all labels"); | ||
| app.add_flag("--reopen-logs", reopen_logs, "Close and reopen log files"); | ||
| app.add_flag("--shutdown-agent", shutdown_agent, "Cleanup and exit the netdata agent"); | ||
| app.add_flag("--fatal-agent", fatal_agent, "Log the state and halt the netdata agent"); | ||
| app.add_flag("--reload-claiming-state", reload_claiming_state, "Reload agent claiming state from disk"); | ||
| app.add_flag("--ping", ping, "Return with 'pong' if agent is alive"); | ||
| app.add_option( | ||
| "--aclk-state", aclk_state, "Returns current state of ACLK and Cloud connection. Use 'json' for JSON format"); | ||
| app.add_flag("--dump-config", dumpconfig, "Returns the current netdata.conf on stdout"); | ||
| app.add_option( | ||
| "--remove-stale-node", | ||
| remove_stale_node, | ||
| "Unregisters and removes a node from the cloud. Specify node_id, machine_guid, hostname, or ALL_NODES"); | ||
| app.add_flag("--version", version, "Returns the netdata version"); |
There was a problem hiding this comment.
Changing all of these to use a -- prefix is a breaking change. Ideally we need to keep the old syntax without the -- to avoid breaking things (though I would like to see --help supported alongside help, and probably ideally also a --version option since we should be able to provide that).
Comment on lines
+2644
to
+2662
| include(FetchContent) | ||
| include(NetdataFetchContentExtra) | ||
|
|
||
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28) | ||
| FetchContent_Declare( | ||
| CLI11 | ||
| GIT_REPOSITORY https://github.com/CLIUtils/CLI11.git | ||
| GIT_TAG 6c7b07a878ad834957b98d0f9ce1dbe0cb204fc9 # v2.4.2 | ||
| EXCLUDE_FROM_ALL | ||
| ) | ||
| else() | ||
| FetchContent_Declare(CLI11 | ||
| GIT_REPOSITORY https://github.com/microsoft/mimalloc.git | ||
| GIT_REPOSITORY https://github.com/CLIUtils/CLI11.git | ||
| GIT_TAG 6c7b07a878ad834957b98d0f9ce1dbe0cb204fc9 # v2.4.2 | ||
| ) | ||
| endif() | ||
|
|
||
| FetchContent_MakeAvailable_NoInstall(CLI11) |
There was a problem hiding this comment.
I thought our goal was to minimize the amount of stuff like this in the main CMakeLists.txt file?
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.
Summary
SSIA.
Test Plan
Additional Information
Needs more work to update references of
netdataclithroughout the codebase.