From 74fc3c7681ca5d8081cf549be72456d0f46d3569 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 31 Jul 2024 16:27:37 +0200 Subject: [PATCH] update static/schema information Signed-off-by: Thomas Lamprecht --- api-viewer/apidata.js | 199 ++++++++++++++++++++++++++++++++++++---- pveum.1-synopsis.adoc | 24 +++-- qm.1-synopsis.adoc | 6 +- qm.conf.5-opts.adoc | 6 +- vzdump.1-synopsis.adoc | 8 ++ vzdump.conf.5-opts.adoc | 4 + 6 files changed, 211 insertions(+), 36 deletions(-) diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js index aff69c6..8ba94e4 100644 --- a/api-viewer/apidata.js +++ b/api-viewer/apidata.js @@ -741,6 +741,117 @@ const apiSchema = [ }, { "children" : [ + { + "info" : { + "GET" : { + "allowtoken" : 1, + "description" : "Returns known notification metadata fields", + "method" : "GET", + "name" : "get_matcher_fields", + "parameters" : { + "additionalProperties" : 0 + }, + "permissions" : { + "check" : [ + "or", + [ + "perm", + "/mapping/notifications", + [ + "Mapping.Modify" + ] + ], + [ + "perm", + "/mapping/notifications", + [ + "Mapping.Audit" + ] + ] + ] + }, + "protected" : 0, + "returns" : { + "items" : { + "properties" : { + "name" : { + "description" : "Name of the field.", + "type" : "string" + } + }, + "type" : "object" + }, + "links" : [ + { + "href" : "{name}", + "rel" : "child" + } + ], + "type" : "array" + } + } + }, + "leaf" : 1, + "path" : "/cluster/notifications/matcher-fields", + "text" : "matcher-fields" + }, + { + "info" : { + "GET" : { + "allowtoken" : 1, + "description" : "Returns known notification metadata fields and their known values", + "method" : "GET", + "name" : "get_matcher_field_values", + "parameters" : { + "additionalProperties" : 0 + }, + "permissions" : { + "check" : [ + "or", + [ + "perm", + "/mapping/notifications", + [ + "Mapping.Modify" + ] + ], + [ + "perm", + "/mapping/notifications", + [ + "Mapping.Audit" + ] + ] + ] + }, + "protected" : 1, + "returns" : { + "items" : { + "properties" : { + "comment" : { + "description" : "Additional comment for this value.", + "optional" : 1, + "type" : "string" + }, + "field" : { + "description" : "Field this value belongs to.", + "type" : "string" + }, + "value" : { + "description" : "Notification metadata value known by the system.", + "type" : "string" + } + }, + "type" : "object" + }, + "type" : "array" + } + } + }, + "leaf" : 1, + "path" : "/cluster/notifications/matcher-field-values", + "text" : "matcher-field-values" + }, { "children" : [ { @@ -5678,6 +5789,16 @@ const apiSchema = [ "type" : "string", "typetext" : "" }, + "pbs-change-detection-mode" : { + "description" : "PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups.", + "enum" : [ + "legacy", + "data", + "metadata" + ], + "optional" : 1, + "type" : "string" + }, "performance" : { "description" : "Other performance-related settings.", "format" : "backup-performance", @@ -6057,6 +6178,16 @@ const apiSchema = [ "type" : "string", "typetext" : "" }, + "pbs-change-detection-mode" : { + "description" : "PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups.", + "enum" : [ + "legacy", + "data", + "metadata" + ], + "optional" : 1, + "type" : "string" + }, "performance" : { "description" : "Other performance-related settings.", "format" : "backup-performance", @@ -17277,7 +17408,7 @@ const apiSchema = [ }, "migrate_downtime" : { "default" : 0.1, - "description" : "Set maximum tolerated downtime (in seconds) for migrations.", + "description" : "Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge.", "minimum" : 0, "optional" : 1, "type" : "number" @@ -18373,7 +18504,7 @@ const apiSchema = [ "type" : "string" }, "version" : { - "default" : "v2.0", + "default" : "v1.2", "description" : "The TPM interface version. v2.0 is newer and should be preferred. Note that this cannot be changed later on.", "enum" : [ "v1.2", @@ -18462,7 +18593,7 @@ const apiSchema = [ "type" : { "default" : "std", "default_key" : 1, - "description" : "Select the VGA type.", + "description" : "Select the VGA type. Using type 'cirrus' is not recommended.", "enum" : [ "cirrus", "qxl", @@ -19655,7 +19786,7 @@ const apiSchema = [ }, "migrate_downtime" : { "default" : 0.1, - "description" : "Set maximum tolerated downtime (in seconds) for migrations.", + "description" : "Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge.", "minimum" : 0, "optional" : 1, "type" : "number", @@ -20815,7 +20946,7 @@ const apiSchema = [ "type" : "string" }, "version" : { - "default" : "v2.0", + "default" : "v1.2", "description" : "The TPM interface version. v2.0 is newer and should be preferred. Note that this cannot be changed later on.", "enum" : [ "v1.2", @@ -20908,7 +21039,7 @@ const apiSchema = [ "type" : { "default" : "std", "default_key" : 1, - "description" : "Select the VGA type.", + "description" : "Select the VGA type. Using type 'cirrus' is not recommended.", "enum" : [ "cirrus", "qxl", @@ -22135,7 +22266,7 @@ const apiSchema = [ }, "migrate_downtime" : { "default" : 0.1, - "description" : "Set maximum tolerated downtime (in seconds) for migrations.", + "description" : "Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge.", "minimum" : 0, "optional" : 1, "type" : "number", @@ -23295,7 +23426,7 @@ const apiSchema = [ "type" : "string" }, "version" : { - "default" : "v2.0", + "default" : "v1.2", "description" : "The TPM interface version. v2.0 is newer and should be preferred. Note that this cannot be changed later on.", "enum" : [ "v1.2", @@ -23388,7 +23519,7 @@ const apiSchema = [ "type" : { "default" : "std", "default_key" : 1, - "description" : "Select the VGA type.", + "description" : "Select the VGA type. Using type 'cirrus' is not recommended.", "enum" : [ "cirrus", "qxl", @@ -28298,7 +28429,7 @@ const apiSchema = [ }, "migrate_downtime" : { "default" : 0.1, - "description" : "Set maximum tolerated downtime (in seconds) for migrations.", + "description" : "Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge.", "minimum" : 0, "optional" : 1, "type" : "number", @@ -29467,7 +29598,7 @@ const apiSchema = [ "type" : "string" }, "version" : { - "default" : "v2.0", + "default" : "v1.2", "description" : "The TPM interface version. v2.0 is newer and should be preferred. Note that this cannot be changed later on.", "enum" : [ "v1.2", @@ -29567,7 +29698,7 @@ const apiSchema = [ "type" : { "default" : "std", "default_key" : 1, - "description" : "Select the VGA type.", + "description" : "Select the VGA type. Using type 'cirrus' is not recommended.", "enum" : [ "cirrus", "qxl", @@ -40238,6 +40369,16 @@ const apiSchema = [ "optional" : 1, "type" : "string" }, + "pbs-change-detection-mode" : { + "description" : "PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups.", + "enum" : [ + "legacy", + "data", + "metadata" + ], + "optional" : 1, + "type" : "string" + }, "performance" : { "description" : "Other performance-related settings.", "format" : "backup-performance", @@ -40451,6 +40592,14 @@ const apiSchema = [ "type" : "integer", "typetext" : " (0 - 8)" }, + "job-id" : { + "description" : "The ID of the backup job. If set, the 'backup-job' metadata field of the backup notification will be set to this value. Only root@pam can set this parameter.", + "format" : "pve-configid", + "maxLength" : 256, + "optional" : 1, + "type" : "string", + "typetext" : "" + }, "lockwait" : { "default" : 180, "description" : "Maximal time to wait for the global lock (minutes).", @@ -40538,6 +40687,16 @@ const apiSchema = [ "type" : "string", "typetext" : "" }, + "pbs-change-detection-mode" : { + "description" : "PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups.", + "enum" : [ + "legacy", + "data", + "metadata" + ], + "optional" : 1, + "type" : "string" + }, "performance" : { "description" : "Other performance-related settings.", "format" : "backup-performance", @@ -40652,7 +40811,7 @@ const apiSchema = [ } }, "permissions" : { - "description" : "The user needs 'VM.Backup' permissions on any VM, and 'Datastore.AllocateSpace' on the backup storage (and fleecing storage when fleecing is used). The 'tmpdir', 'dumpdir' and 'script' parameters are restricted to the 'root@pam' user. The 'maxfiles' and 'prune-backups' settings require 'Datastore.Allocate' on the backup storage. The 'bwlimit', 'performance' and 'ionice' parameters require 'Sys.Modify' on '/'.", + "description" : "The user needs 'VM.Backup' permissions on any VM, and 'Datastore.AllocateSpace' on the backup storage (and fleecing storage when fleecing is used). The 'tmpdir', 'dumpdir', 'script' and 'job-id' parameters are restricted to the 'root@pam' user. The 'maxfiles' and 'prune-backups' settings require 'Datastore.Allocate' on the backup storage. The 'bwlimit', 'performance' and 'ionice' parameters require 'Sys.Modify' on '/'.", "user" : "all" }, "protected" : 1, @@ -49039,7 +49198,7 @@ const apiSchema = [ "type" : "object" }, "current-kernel" : { - "description" : "The uptime of the system in seconds.", + "description" : "Meta-information about the currently booted kernel of this node.", "properties" : { "machine" : { "description" : "Hardware (architecture) type", @@ -49527,9 +49686,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login (requires 'root@pam')", "enum" : [ - "upgrade", + "login", "ceph_install", - "login" + "upgrade" ], "optional" : 1, "type" : "string" @@ -49622,9 +49781,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login (requires 'root@pam')", "enum" : [ - "upgrade", + "login", "ceph_install", - "login" + "upgrade" ], "optional" : 1, "type" : "string" @@ -49747,9 +49906,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login (requires 'root@pam')", "enum" : [ - "upgrade", + "login", "ceph_install", - "login" + "upgrade" ], "optional" : 1, "type" : "string" diff --git a/pveum.1-synopsis.adoc b/pveum.1-synopsis.adoc index 0b60d7c..905b27f 100644 --- a/pveum.1-synopsis.adoc +++ b/pveum.1-synopsis.adoc @@ -825,6 +825,18 @@ API token expiration date (seconds since epoch). '0' means no expiration date. Restrict API token privileges with separate ACLs (default), or give full privileges of corresponding user. +*pveum user token delete* ` ` `[FORMAT_OPTIONS]` + +Remove API token for a specific user. + +``: `` :: + +Full User ID, in the `name@realm` format. + +``: `(?^:[A-Za-z][A-Za-z0-9\.\-_]+)` :: + +User-specific token identifier. + *pveum user token list* `` `[FORMAT_OPTIONS]` Get user API tokens. @@ -873,17 +885,9 @@ User-specific token identifier. Only dump this specific path, not the whole tree. -*pveum user token remove* ` ` `[FORMAT_OPTIONS]` +*pveum user token remove* -Remove API token for a specific user. - -``: `` :: - -Full User ID, in the `name@realm` format. - -``: `(?^:[A-Za-z][A-Za-z0-9\.\-_]+)` :: - -User-specific token identifier. +An alias for 'pveum user token delete'. *pveum useradd* diff --git a/qm.1-synopsis.adoc b/qm.1-synopsis.adoc index adc713e..4010439 100644 --- a/qm.1-synopsis.adoc +++ b/qm.1-synopsis.adoc @@ -305,7 +305,7 @@ Memory properties. `--migrate_downtime` ` (0 - N)` ('default =' `0.1`):: -Set maximum tolerated downtime (in seconds) for migrations. +Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge. `--migrate_speed` ` (0 - N)` ('default =' `0`):: @@ -902,7 +902,7 @@ Memory properties. `--migrate_downtime` ` (0 - N)` ('default =' `0.1`):: -Set maximum tolerated downtime (in seconds) for migrations. +Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge. `--migrate_speed` ` (0 - N)` ('default =' `0`):: @@ -1486,7 +1486,7 @@ Memory properties. `--migrate_downtime` ` (0 - N)` ('default =' `0.1`):: -Set maximum tolerated downtime (in seconds) for migrations. +Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge. `--migrate_speed` ` (0 - N)` ('default =' `0`):: diff --git a/qm.conf.5-opts.adoc b/qm.conf.5-opts.adoc index da30554..f382aaf 100644 --- a/qm.conf.5-opts.adoc +++ b/qm.conf.5-opts.adoc @@ -547,7 +547,7 @@ Current amount of online RAM for the VM in MiB. This is the maximum available me `migrate_downtime`: ` (0 - N)` ('default =' `0.1`):: -Set maximum tolerated downtime (in seconds) for migrations. +Set maximum tolerated downtime (in seconds) for migrations. Should the migration not be able to converge in the very end, because too much newly dirtied RAM needs to be transferred, the limit will be increased automatically step-by-step until migration can converge. `migrate_speed`: ` (0 - N)` ('default =' `0`):: @@ -1190,7 +1190,7 @@ The drive's backing volume. Disk size. This is purely informational and has no effect. -`version`=`` ('default =' `v2.0`);; +`version`=`` ('default =' `v1.2`);; The TPM interface version. v2.0 is newer and should be preferred. Note that this cannot be changed later on. @@ -1250,7 +1250,7 @@ Sets the VGA memory (in MiB). Has no effect with serial display. `type`=`` ('default =' `std`);; -Select the VGA type. +Select the VGA type. Using type 'cirrus' is not recommended. `virtio[n]`: `[file=] [,aio=] [,backup=<1|0>] [,bps=] [,bps_max_length=] [,bps_rd=] [,bps_rd_max_length=] [,bps_wr=] [,bps_wr_max_length=] [,cache=] [,cyls=] [,detect_zeroes=<1|0>] [,discard=] [,format=] [,heads=] [,iops=] [,iops_max=] [,iops_max_length=] [,iops_rd=] [,iops_rd_max=] [,iops_rd_max_length=] [,iops_wr=] [,iops_wr_max=] [,iops_wr_max_length=] [,iothread=<1|0>] [,mbps=] [,mbps_max=] [,mbps_rd=] [,mbps_rd_max=] [,mbps_wr=] [,mbps_wr_max=] [,media=] [,replicate=<1|0>] [,rerror=] [,ro=<1|0>] [,secs=] [,serial=] [,shared=<1|0>] [,size=] [,snapshot=<1|0>] [,trans=] [,werror=]` :: diff --git a/vzdump.1-synopsis.adoc b/vzdump.1-synopsis.adoc index 375d23a..78d118d 100644 --- a/vzdump.1-synopsis.adoc +++ b/vzdump.1-synopsis.adoc @@ -40,6 +40,10 @@ Options for backup fleecing (VM only). Set IO priority when using the BFQ scheduler. For snapshot and suspend mode backups of VMs, this only affects the compressor. A value of 8 means the idle priority is used, otherwise the best-effort priority is used with the specified value. +`--job-id` `` :: + +The ID of the backup job. If set, the 'backup-job' metadata field of the backup notification will be set to this value. Only root@pam can set this parameter. + `--lockwait` ` (0 - N)` ('default =' `180`):: Maximal time to wait for the global lock (minutes). @@ -82,6 +86,10 @@ Deprecated: Do not use Deprecated: Do not use +`--pbs-change-detection-mode` `` :: + +PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups. + `--performance` `[max-workers=] [,pbs-entries-max=]` :: Other performance-related settings. diff --git a/vzdump.conf.5-opts.adoc b/vzdump.conf.5-opts.adoc index eef13d9..6ad897d 100644 --- a/vzdump.conf.5-opts.adoc +++ b/vzdump.conf.5-opts.adoc @@ -68,6 +68,10 @@ Deprecated: Do not use Deprecated: Do not use +`pbs-change-detection-mode`: `` :: + +PBS mode used to detect file changes and switch encoding. NOTE: `data` and `metadata` modes are experimental. format for container backups. + `performance`: `[max-workers=] [,pbs-entries-max=]` :: Other performance-related settings.