From 739d4d64c2b193e81e5680352f18850a20c7e5ff Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 18 Sep 2020 16:34:51 +0200 Subject: [PATCH] update static and schema information Signed-off-by: Thomas Lamprecht --- api-viewer/apidata.js | 225 +++++++++++++++++++++++++++++++++++++++- pct.1-synopsis.adoc | 16 +++ pct.conf.5-opts.adoc | 4 + pveceph.1-synopsis.adoc | 4 + pvesm.1-synopsis.adoc | 36 ++++++- vzdump.1-synopsis.adoc | 4 + vzdump.conf.5-opts.adoc | 28 +++++ 7 files changed, 313 insertions(+), 4 deletions(-) diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js index 819802e..a438090 100644 --- a/api-viewer/apidata.js +++ b/api-viewer/apidata.js @@ -3207,6 +3207,13 @@ var pveapi = [ "type" : "string", "typetext" : "" }, + "prune-backups" : { + "description" : "Use these retention options instead of those from the storage configuration.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -3495,6 +3502,13 @@ var pveapi = [ "type" : "string", "typetext" : "" }, + "prune-backups" : { + "description" : "Use these retention options instead of those from the storage configuration.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -22392,6 +22406,12 @@ var pveapi = [ "optional" : 1, "type" : "integer" }, + "debug" : { + "default" : 0, + "description" : "Try to be more verbose. For now this only enables debug log-level on start.", + "optional" : 1, + "type" : "boolean" + }, "description" : { "description" : "Container description. Only used on the configuration web interface.", "optional" : 1, @@ -22881,6 +22901,13 @@ var pveapi = [ "type" : "integer", "typetext" : " (0 - 500000)" }, + "debug" : { + "default" : 0, + "description" : "Try to be more verbose. For now this only enables debug log-level on start.", + "optional" : 1, + "type" : "boolean", + "typetext" : "" + }, "delete" : { "description" : "A list of settings you want to delete.", "format" : "pve-configid-list", @@ -23490,6 +23517,13 @@ var pveapi = [ "parameters" : { "additionalProperties" : 0, "properties" : { + "debug" : { + "default" : 0, + "description" : "If set, enables very verbose debug log-level on start.", + "optional" : 1, + "type" : "boolean", + "typetext" : "" + }, "node" : { "description" : "The cluster node name.", "format" : "pve-node", @@ -27803,6 +27837,13 @@ var pveapi = [ "type" : "integer", "typetext" : " (0 - 500000)" }, + "debug" : { + "default" : 0, + "description" : "Try to be more verbose. For now this only enables debug log-level on start.", + "optional" : 1, + "type" : "boolean", + "typetext" : "" + }, "description" : { "description" : "Container description. Only used on the configuration web interface.", "optional" : 1, @@ -28551,6 +28592,12 @@ var pveapi = [ "parameters" : { "additionalProperties" : 0, "properties" : { + "crush-device-class" : { + "description" : "Set the device class of the OSD in crush.", + "optional" : 1, + "type" : "string", + "typetext" : "" + }, "db_dev" : { "description" : "Block device name for block.db.", "optional" : 1, @@ -30418,6 +30465,13 @@ var pveapi = [ "type" : "string", "typetext" : "" }, + "prune-backups" : { + "description" : "Use these retention options instead of those from the storage configuration.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -30706,7 +30760,7 @@ var pveapi = [ "info" : { "POST" : { "allowtoken" : 1, - "description" : "Restart service.", + "description" : "Hard restart service. Use reload if you want to reduce interruptions.", "method" : "POST", "name" : "service_restart", "parameters" : { @@ -30766,7 +30820,7 @@ var pveapi = [ "info" : { "POST" : { "allowtoken" : 1, - "description" : "Reload service.", + "description" : "Reload service. Falls back to restart if service cannot be reloaded.", "method" : "POST", "name" : "service_reload", "parameters" : { @@ -32915,6 +32969,159 @@ var pveapi = [ "children" : [ { "children" : [ + { + "info" : { + "DELETE" : { + "allowtoken" : 1, + "description" : "Prune backups. Only those using the standard naming scheme are considered.", + "method" : "DELETE", + "name" : "delete", + "parameters" : { + "additionalProperties" : 0, + "properties" : { + "node" : { + "description" : "The cluster node name.", + "format" : "pve-node", + "type" : "string", + "typetext" : "" + }, + "prune-backups" : { + "description" : "Use these retention options instead of those from the storage configuration.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, + "storage" : { + "description" : "The storage identifier.", + "format" : "pve-storage-id", + "type" : "string", + "typetext" : "" + }, + "type" : { + "description" : "Either 'qemu' or 'lxc'. Only consider backups for guests of this type.", + "enum" : [ + "qemu", + "lxc" + ], + "optional" : 1, + "type" : "string" + }, + "vmid" : { + "description" : "Only prune backups for this VM.", + "format" : "pve-vmid", + "minimum" : 1, + "optional" : 1, + "type" : "integer", + "typetext" : " (1 - N)" + } + } + }, + "permissions" : { + "description" : "You need the 'Datastore.Allocate' privilege on the storage (or if a VM ID is specified, 'Datastore.AllocateSpace' and 'VM.Backup' for the VM).", + "user" : "all" + }, + "protected" : 1, + "proxyto" : "node", + "returns" : { + "type" : "string" + } + }, + "GET" : { + "allowtoken" : 1, + "description" : "Get prune information for backups. NOTE: this is only a preview and might not be exactly what a subsequent prune call does, if the hour changes or if backups are removed/added in the meantime.", + "method" : "GET", + "name" : "dryrun", + "parameters" : { + "additionalProperties" : 0, + "properties" : { + "node" : { + "description" : "The cluster node name.", + "format" : "pve-node", + "type" : "string", + "typetext" : "" + }, + "prune-backups" : { + "description" : "Use these retention options instead of those from the storage configuration.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, + "storage" : { + "description" : "The storage identifier.", + "format" : "pve-storage-id", + "type" : "string", + "typetext" : "" + }, + "type" : { + "description" : "Either 'qemu' or 'lxc'. Only consider backups for guests of this type.", + "enum" : [ + "qemu", + "lxc" + ], + "optional" : 1, + "type" : "string" + }, + "vmid" : { + "description" : "Only consider backups for this guest.", + "format" : "pve-vmid", + "minimum" : 1, + "optional" : 1, + "type" : "integer", + "typetext" : " (1 - N)" + } + } + }, + "permissions" : { + "check" : [ + "perm", + "/storage/{storage}", + [ + "Datastore.Audit", + "Datastore.AllocateSpace" + ], + "any", + 1 + ] + }, + "protected" : 1, + "proxyto" : "node", + "returns" : { + "items" : { + "properties" : { + "ctime" : { + "description" : "Creation time of the backup (seconds since the UNIX epoch).", + "type" : "integer" + }, + "mark" : { + "description" : "Whether the backup would be kept or removed. For backups that don't use the standard naming scheme, it's 'protected'.", + "type" : "string" + }, + "type" : { + "description" : "One of 'qemu', 'lxc', 'openvz' or 'unknown'.", + "type" : "string" + }, + "vmid" : { + "description" : "The VM the backup belongs to.", + "optional" : 1, + "type" : "integer" + }, + "volid" : { + "description" : "Backup volume ID.", + "type" : "string" + } + }, + "type" : "object" + }, + "type" : "array" + } + } + }, + "leaf" : 1, + "path" : "/nodes/{node}/storage/{storage}/prunebackups", + "text" : "prunebackups" + }, { "children" : [ { @@ -38728,6 +38935,13 @@ var pveapi = [ "type" : "string", "typetext" : "" }, + "prune-backups" : { + "description" : "The retention options with shorter intervals are processed first with --keep-last being the very first one. Each option covers a specific period of time. We say that backups within this period are covered by this option. The next option does not take care of already covered backups and only considers older backups.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, "redundancy" : { "default" : 2, "description" : "The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.", @@ -39138,6 +39352,13 @@ var pveapi = [ "type" : "string", "typetext" : "" }, + "prune-backups" : { + "description" : "The retention options with shorter intervals are processed first with --keep-last being the very first one. Each option covers a specific period of time. We say that backups within this period are covered by this option. The next option does not take care of already covered backups and only considers older backups.", + "format" : "prune-backups", + "optional" : 1, + "type" : "string", + "typetext" : "[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]" + }, "redundancy" : { "default" : 2, "description" : "The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.", diff --git a/pct.1-synopsis.adoc b/pct.1-synopsis.adoc index 014a655..c3862db 100644 --- a/pct.1-synopsis.adoc +++ b/pct.1-synopsis.adoc @@ -120,6 +120,10 @@ CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger t + NOTE: You can disable fair-scheduler configuration by setting this to 0. +`--debug` `` ('default =' `0`):: + +Try to be more verbose. For now this only enables debug log-level on start. + `--description` `` :: Container description. Only used on the configuration web interface. @@ -577,6 +581,10 @@ CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger t + NOTE: You can disable fair-scheduler configuration by setting this to 0. +`--debug` `` ('default =' `0`):: + +Try to be more verbose. For now this only enables debug log-level on start. + `--description` `` :: Container description. Only used on the configuration web interface. @@ -755,6 +763,10 @@ CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger t + NOTE: You can disable fair-scheduler configuration by setting this to 0. +`--debug` `` ('default =' `0`):: + +Try to be more verbose. For now this only enables debug log-level on start. + `--delete` `` :: A list of settings you want to delete. @@ -896,6 +908,10 @@ Start the container. The (unique) ID of the VM. +`--debug` `` ('default =' `0`):: + +If set, enables very verbose debug log-level on start. + `--skiplock` `` :: Ignore locks - only root is allowed to use this option. diff --git a/pct.conf.5-opts.adoc b/pct.conf.5-opts.adoc index 09aca49..9102c6a 100644 --- a/pct.conf.5-opts.adoc +++ b/pct.conf.5-opts.adoc @@ -26,6 +26,10 @@ CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger t + NOTE: You can disable fair-scheduler configuration by setting this to 0. +`debug`: `` ('default =' `0`):: + +Try to be more verbose. For now this only enables debug log-level on start. + `description`: `` :: Container description. Only used on the configuration web interface. diff --git a/pveceph.1-synopsis.adoc b/pveceph.1-synopsis.adoc index 817c489..6d15c85 100644 --- a/pveceph.1-synopsis.adoc +++ b/pveceph.1-synopsis.adoc @@ -174,6 +174,10 @@ Create OSD Block device name. +`--crush-device-class` `` :: + +Set the device class of the OSD in crush. + `--db_dev` `` :: Block device name for block.db. diff --git a/pvesm.1-synopsis.adoc b/pvesm.1-synopsis.adoc index ebfd676..af25db2 100644 --- a/pvesm.1-synopsis.adoc +++ b/pvesm.1-synopsis.adoc @@ -54,7 +54,7 @@ Flag to disable the storage. CIFS domain. -`--encryption-key` `` :: +`--encryption-key` `a file containing an encryption key, or the special value "autogen"` :: Encryption key. Use 'autogen' to generate one automatically without passphrase. @@ -134,6 +134,10 @@ Pool. iSCSI portal (IP or DNS name with optional port). +`--prune-backups` `[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]` :: + +The retention options with shorter intervals are processed first with --keep-last being the very first one. Each option covers a specific period of time. We say that backups within this period are covered by this option. The next option does not take care of already covered backups and only considers older backups. + `--redundancy` ` (1 - 16)` ('default =' `2`):: The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster. @@ -378,6 +382,30 @@ Get filesystem path for specified volume Volume identifier +*pvesm prune-backups* `` `[OPTIONS]` + +Prune backups. This is only a wrapper for the proper API endpoints. + +``: `` :: + +The storage identifier. + +`--dry-run` `` :: + +Only show what would be pruned, don't delete anything. + +`--prune-backups` `[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]` :: + +Use these retention options instead of those from the storage configuration. + +`--type` `` :: + +Either 'qemu' or 'lxc'. Only consider backups for guests of this type. + +`--vmid` ` (1 - N)` :: + +Only consider backups for this guest. + *pvesm remove* `` Delete storage configuration. @@ -492,7 +520,7 @@ Flag to disable the storage. CIFS domain. -`--encryption-key` `` :: +`--encryption-key` `a file containing an encryption key, or the special value "autogen"` :: Encryption key. Use 'autogen' to generate one automatically without passphrase. @@ -556,6 +584,10 @@ Password for accessing the share/datastore. Pool. +`--prune-backups` `[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]` :: + +The retention options with shorter intervals are processed first with --keep-last being the very first one. Each option covers a specific period of time. We say that backups within this period are covered by this option. The next option does not take care of already covered backups and only considers older backups. + `--redundancy` ` (1 - 16)` ('default =' `2`):: The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster. diff --git a/vzdump.1-synopsis.adoc b/vzdump.1-synopsis.adoc index 7f6b9e4..7458711 100644 --- a/vzdump.1-synopsis.adoc +++ b/vzdump.1-synopsis.adoc @@ -68,6 +68,10 @@ Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread Backup all known guest systems included in the specified pool. +`--prune-backups` `[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]` :: + +Use these retention options instead of those from the storage configuration. + `--quiet` `` ('default =' `0`):: Be quiet. diff --git a/vzdump.conf.5-opts.adoc b/vzdump.conf.5-opts.adoc index 42588df..b262499 100644 --- a/vzdump.conf.5-opts.adoc +++ b/vzdump.conf.5-opts.adoc @@ -46,6 +46,34 @@ Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread Backup all known guest systems included in the specified pool. +`prune-backups`: `[keep-daily=] [,keep-hourly=] [,keep-last=] [,keep-monthly=] [,keep-weekly=] [,keep-yearly=]` :: + +Use these retention options instead of those from the storage configuration. + +`keep-daily`=`` ;; + +Keep backups for the last different days. If there is morethan one backup for a single day, only the latest one is kept. + +`keep-hourly`=`` ;; + +Keep backups for the last different hours. If there is morethan one backup for a single hour, only the latest one is kept. + +`keep-last`=`` ;; + +Keep the last backups. + +`keep-monthly`=`` ;; + +Keep backups for the last different months. If there is morethan one backup for a single month, only the latest one is kept. + +`keep-weekly`=`` ;; + +Keep backups for the last different weeks. If there is morethan one backup for a single week, only the latest one is kept. + +`keep-yearly`=`` ;; + +Keep backups for the last different years. If there is morethan one backup for a single year, only the latest one is kept. + `remove`: `` ('default =' `1`):: Remove old backup files if there are more than 'maxfiles' backup files. -- 2.39.2