[pdm-devel] [PATCH proxmox-datacenter-manager 25/25] cli: add commands for metric-collection settings, trigger, status

Lukas Wagner l.wagner at proxmox.com
Thu Feb 13 15:17:03 CET 2025



On  2025-02-13 13:14, Wolfgang Bumiller wrote:
> On Tue, Feb 11, 2025 at 01:05:41PM +0100, Lukas Wagner wrote:
>> This adds new commands to the proxmox-datacenter-client CLI tool, namely
>>  - to update metric collection settings
>>  - trigger metric collection
>>  - show status of the last metric collection
>>
>> Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
>> ---
>>  cli/client/Cargo.toml               |   1 +
>>  cli/client/src/main.rs              |   2 +
>>  cli/client/src/metric_collection.rs | 164 ++++++++++++++++++++++++++++
>>  3 files changed, 167 insertions(+)
>>  create mode 100644 cli/client/src/metric_collection.rs
>>
>> diff --git a/cli/client/Cargo.toml b/cli/client/Cargo.toml
>> index 96016cd..5c96b28 100644
>> --- a/cli/client/Cargo.toml
>> +++ b/cli/client/Cargo.toml
>> @@ -46,6 +46,7 @@ proxmox-rrd-api-types.workspace = true
>>  proxmox-schema = { workspace = true, features = [ "api-macro" ] }
>>  proxmox-section-config.workspace = true
>>  proxmox-sys.workspace = true
>> +proxmox-time.workspace = true
>>  proxmox-tfa = { workspace = true, features = [ "types" ] }
>>  
>>  # for the pve API types:
>> diff --git a/cli/client/src/main.rs b/cli/client/src/main.rs
>> index c913e97..55877cf 100644
>> --- a/cli/client/src/main.rs
>> +++ b/cli/client/src/main.rs
>> @@ -17,6 +17,7 @@ pub mod env;
>>  
>>  pub mod acl;
>>  pub mod config;
>> +pub mod metric_collection;
>>  pub mod pbs;
>>  pub mod pve;
>>  pub mod remotes;
>> @@ -93,6 +94,7 @@ fn main_do() -> Result<(), Error> {
>>          )
>>          .insert("acl", acl::cli())
>>          .insert("login", CliCommand::new(&API_METHOD_LOGIN))
>> +        .insert("metric-collection", metric_collection::cli())
> 
> maaaaaybe...
>     .alias(&["mc"], &["metric-collection"])
> ? 🤪
> 

Good idea, didn't know about 'alias'. :)

Although I really couldn't make it work after trying around for a bit, I might save that for a
followup.

>>          .insert("pbs", pbs::cli())
>>          .insert("pve", pve::cli())
>>          .insert("remote", remotes::cli())
>> diff --git a/cli/client/src/metric_collection.rs b/cli/client/src/metric_collection.rs
>> new file mode 100644
>> index 0000000..8ca861a
>> --- /dev/null
>> +++ b/cli/client/src/metric_collection.rs
>> @@ -0,0 +1,164 @@
>> +use anyhow::Error;
>> +use pdm_api_types::{
>> +    remotes::REMOTE_ID_SCHEMA, CollectionSettingsUpdater, DeletableCollectionSettingsProperty,
>> +};
>> +use proxmox_router::cli::{
>> +    format_and_print_result, CliCommand, CliCommandMap, CommandLineInterface, OutputFormat,
>> +};
>> +use proxmox_schema::api;
>> +
>> +use crate::{client, env};
>> +
>> +pub fn cli() -> CommandLineInterface {
>> +    CliCommandMap::new()
>> +        .insert(
>> +            "show-settings",
>> +            CliCommand::new(&API_METHOD_SHOW_COLLECTION_SETTINGS),
>> +        )
> 
> ↑↓ wouldn't `settings show`, `settings update` be more consistent?
> 
>> +        .insert(
>> +            "update-settings",
>> +            CliCommand::new(&API_METHOD_UPDATE_COLLECTION_SETTINGS),
>> +        )

I see your point, but then a 'show' next to a 'status' also felt a bit weird, that
was the reason why I added the suffix to make it more clear. I can change it back
if you prefer.

-- 
- Lukas





More information about the pdm-devel mailing list