diff --git a/.drone.yml b/.drone.yml index ca606ae..646ec71 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,7 +55,7 @@ steps: path: /shared commands: - cp /shared/vctp-linux-amd64 ./build/vctp-linux-amd64 - #- find . + - find . - nfpm package --config vctp-service.yml --packager rpm --target ./build/ - ls -lah ./build/ diff --git a/server/router/docs/docs.go b/server/router/docs/docs.go index 152cc14..76d4e5f 100644 --- a/server/router/docs/docs.go +++ b/server/router/docs/docs.go @@ -896,7 +896,7 @@ const docTemplate = `{ }, "/vcenters/totals": { "get": { - "description": "Shows per-snapshot totals for a vCenter.", + "description": "Redirect-style handler for compatibility; use /vcenters/totals/daily or /vcenters/totals/hourly.", "produces": [ "text/html" ], @@ -914,13 +914,13 @@ const docTemplate = `{ }, { "type": "string", - "description": "hourly|daily|monthly (default: hourly)", + "description": "hourly|daily|monthly", "name": "type", "in": "query" }, { "type": "integer", - "description": "Limit results (default 200)", + "description": "Limit results", "name": "limit", "in": "query" } @@ -941,6 +941,82 @@ const docTemplate = `{ } } }, + "/vcenters/totals/daily": { + "get": { + "description": "Shows daily aggregated VM count/vCPU/RAM totals for a vCenter.", + "produces": [ + "text/html" + ], + "tags": [ + "vcenters" + ], + "summary": "vCenter daily totals", + "parameters": [ + { + "type": "string", + "description": "vCenter URL", + "name": "vcenter", + "in": "query", + "required": true + }, + { + "type": "integer", + "description": "Limit results (default 400)", + "name": "limit", + "in": "query" + } + ], + "responses": { + "200": { + "description": "HTML page", + "schema": { + "type": "string" + } + }, + "400": { + "description": "Missing vcenter", + "schema": { + "type": "string" + } + } + } + } + }, + "/vcenters/totals/hourly": { + "get": { + "description": "Shows detailed hourly VM count/vCPU/RAM totals for the latest 45 days.", + "produces": [ + "text/html" + ], + "tags": [ + "vcenters" + ], + "summary": "vCenter hourly totals (45 days)", + "parameters": [ + { + "type": "string", + "description": "vCenter URL", + "name": "vcenter", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "HTML page", + "schema": { + "type": "string" + } + }, + "400": { + "description": "Missing vcenter", + "schema": { + "type": "string" + } + } + } + } + }, "/vm/trace": { "get": { "description": "Shows VM resource history across snapshots, with chart and table.", diff --git a/server/router/docs/swagger.json b/server/router/docs/swagger.json index 557d428..62ccec3 100644 --- a/server/router/docs/swagger.json +++ b/server/router/docs/swagger.json @@ -885,7 +885,7 @@ }, "/vcenters/totals": { "get": { - "description": "Shows per-snapshot totals for a vCenter.", + "description": "Redirect-style handler for compatibility; use /vcenters/totals/daily or /vcenters/totals/hourly.", "produces": [ "text/html" ], @@ -903,13 +903,13 @@ }, { "type": "string", - "description": "hourly|daily|monthly (default: hourly)", + "description": "hourly|daily|monthly", "name": "type", "in": "query" }, { "type": "integer", - "description": "Limit results (default 200)", + "description": "Limit results", "name": "limit", "in": "query" } @@ -930,6 +930,82 @@ } } }, + "/vcenters/totals/daily": { + "get": { + "description": "Shows daily aggregated VM count/vCPU/RAM totals for a vCenter.", + "produces": [ + "text/html" + ], + "tags": [ + "vcenters" + ], + "summary": "vCenter daily totals", + "parameters": [ + { + "type": "string", + "description": "vCenter URL", + "name": "vcenter", + "in": "query", + "required": true + }, + { + "type": "integer", + "description": "Limit results (default 400)", + "name": "limit", + "in": "query" + } + ], + "responses": { + "200": { + "description": "HTML page", + "schema": { + "type": "string" + } + }, + "400": { + "description": "Missing vcenter", + "schema": { + "type": "string" + } + } + } + } + }, + "/vcenters/totals/hourly": { + "get": { + "description": "Shows detailed hourly VM count/vCPU/RAM totals for the latest 45 days.", + "produces": [ + "text/html" + ], + "tags": [ + "vcenters" + ], + "summary": "vCenter hourly totals (45 days)", + "parameters": [ + { + "type": "string", + "description": "vCenter URL", + "name": "vcenter", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "HTML page", + "schema": { + "type": "string" + } + }, + "400": { + "description": "Missing vcenter", + "schema": { + "type": "string" + } + } + } + } + }, "/vm/trace": { "get": { "description": "Shows VM resource history across snapshots, with chart and table.", diff --git a/server/router/docs/swagger.yaml b/server/router/docs/swagger.yaml index 1b30baa..6763ef8 100644 --- a/server/router/docs/swagger.yaml +++ b/server/router/docs/swagger.yaml @@ -884,18 +884,19 @@ paths: - vcenters /vcenters/totals: get: - description: Shows per-snapshot totals for a vCenter. + description: Redirect-style handler for compatibility; use /vcenters/totals/daily + or /vcenters/totals/hourly. parameters: - description: vCenter URL in: query name: vcenter required: true type: string - - description: 'hourly|daily|monthly (default: hourly)' + - description: hourly|daily|monthly in: query name: type type: string - - description: Limit results (default 200) + - description: Limit results in: query name: limit type: integer @@ -913,6 +914,57 @@ paths: summary: vCenter totals tags: - vcenters + /vcenters/totals/daily: + get: + description: Shows daily aggregated VM count/vCPU/RAM totals for a vCenter. + parameters: + - description: vCenter URL + in: query + name: vcenter + required: true + type: string + - description: Limit results (default 400) + in: query + name: limit + type: integer + produces: + - text/html + responses: + "200": + description: HTML page + schema: + type: string + "400": + description: Missing vcenter + schema: + type: string + summary: vCenter daily totals + tags: + - vcenters + /vcenters/totals/hourly: + get: + description: Shows detailed hourly VM count/vCPU/RAM totals for the latest 45 + days. + parameters: + - description: vCenter URL + in: query + name: vcenter + required: true + type: string + produces: + - text/html + responses: + "200": + description: HTML page + schema: + type: string + "400": + description: Missing vcenter + schema: + type: string + summary: vCenter hourly totals (45 days) + tags: + - vcenters /vm/trace: get: description: Shows VM resource history across snapshots, with chart and table.