CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Changed VM ID from string to int (#10068)

This commit is contained in:
atetevoortwis 2021-11-09 23:29:36 +01:00 committed by GitHub
parent ce46506e19
commit 8a3ba85419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/inputs/proxmox/proxmox.go
View File

@ -163,8 +163,8 @@ func gatherVMData(px *Proxmox, acc telegraf.Accumulator, rt ResourceType) {
}
}
func getCurrentVMStatus(px *Proxmox, rt ResourceType, id string) (VMStat, error) {
apiURL := "/nodes/" + px.NodeName + "/" + string(rt) + "/" + id + "/status/current"
func getCurrentVMStatus(px *Proxmox, rt ResourceType, id json.Number) (VMStat, error) {
apiURL := "/nodes/" + px.NodeName + "/" + string(rt) + "/" + string(id) + "/status/current"
jsonData, err := px.requestFunction(px, apiURL, http.MethodGet, nil)
if err != nil {
@ -196,8 +196,8 @@ func getVMStats(px *Proxmox, rt ResourceType) (VMStats, error) {
return vmStats, nil
}
func getVMConfig(px *Proxmox, vmID string, rt ResourceType) (VMConfig, error) {
apiURL := "/nodes/" + px.NodeName + "/" + string(rt) + "/" + vmID + "/config"
func getVMConfig(px *Proxmox, vmID json.Number, rt ResourceType) (VMConfig, error) {
apiURL := "/nodes/" + px.NodeName + "/" + string(rt) + "/" + string(vmID) + "/config"
jsonData, err := px.requestFunction(px, apiURL, http.MethodGet, nil)
if err != nil {
return VMConfig{}, err

2
plugins/inputs/proxmox/proxmox_test.go
View File

@ -13,7 +13,7 @@ import (
var nodeSearchDomainTestData = `{"data":{"search":"test.example.com","dns1":"1.0.0.1"}}`
var qemuTestData = `{"data":[{"name":"qemu1","status":"running","maxdisk":10737418240,"cpu":0.029336643550795,"vmid":"113","uptime":2159739,"disk":0,"maxmem":2147483648,"mem":1722451796}]}`
var qemuConfigTestData = `{"data":{"hostname":"qemu1","searchdomain":"test.example.com"}}`
var lxcTestData = `{"data":[{"vmid":"111","type":"lxc","uptime":2078164,"swap":9412608,"disk":"744189952","maxmem":536870912,"mem":98500608,"maxswap":536870912,"cpu":0.00371567669193613,"status":"running","maxdisk":"5217320960","name":"container1"}]}`
var lxcTestData = `{"data":[{"vmid":"111","type":"lxc","uptime":2078164,"swap":9412608,"disk":"744189952","maxmem":536870912,"mem":98500608,"maxswap":536870912,"cpu":0.00371567669193613,"status":"running","maxdisk":"5217320960","name":"container1"},{"vmid":112,"type":"lxc","uptime":2078164,"swap":9412608,"disk":"744189952","maxmem":536870912,"mem":98500608,"maxswap":536870912,"cpu":0.00371567669193613,"status":"running","maxdisk":"5217320960","name":"container2"}]}`
var lxcConfigTestData = `{"data":{"hostname":"container1","searchdomain":"test.example.com"}}`
var lxcCurrentStatusTestData = `{"data":{"vmid":"111","type":"lxc","uptime":2078164,"swap":9412608,"disk":"744189952","maxmem":536870912,"mem":98500608,"maxswap":536870912,"cpu":0.00371567669193613,"status":"running","maxdisk":"5217320960","name":"container1"}}`
var qemuCurrentStatusTestData = `{"data":{"name":"qemu1","status":"running","maxdisk":10737418240,"cpu":0.029336643550795,"vmid":"113","uptime":2159739,"disk":0,"maxmem":2147483648,"mem":1722451796}}`

2
plugins/inputs/proxmox/structs.go
View File

@ -41,7 +41,7 @@ type VMCurrentStats struct {
}
type VMStat struct {
ID string `json:"vmid"`
ID json.Number `json:"vmid"`
Name string `json:"name"`
Status string `json:"status"`
UsedMem json.Number `json:"mem"`