Revision 32389d91 src/Ganeti/Query/Node.hs

b/src/Ganeti/Query/Node.hs
61 61
     "Number of physical CPU sockets (if exported by hypervisor)")
62 62
  , ("ctotal", "CTotal", QFTNumber, "cpu_total",
63 63
     "Number of logical processors")
64
  , ("dfree", "DFree", QFTUnit, "vg_free",
65
     "Available disk space in volume group")
66
  , ("dtotal", "DTotal", QFTUnit, "vg_size",
67
     "Total disk space in volume group used for instance disk allocation")
64
  , ("dfree", "DFree", QFTUnit, "storage_free",
65
     "Available storage space on storage unit")
66
  , ("dtotal", "DTotal", QFTUnit, "storage_size",
67
     "Total storage space on storage unit for instance disk allocation")
68 68
  , ("spfree", "SpFree", QFTNumber, "spindles_free",
69 69
     "Available spindles in volume group (exclusive storage only)")
70 70
  , ("sptotal", "SpTotal", QFTNumber, "spindles_total",
......
89 89
nodeLiveFieldExtract "ctotal" res =
90 90
  jsonHead (rpcResNodeInfoHvInfo res) hvInfoCpuTotal
91 91
nodeLiveFieldExtract "dfree" res =
92
  getMaybeJsonHead (rpcResNodeInfoVgInfo res) vgInfoVgFree
92
  getMaybeJsonHead (rpcResNodeInfoStorageInfo res) storageInfoStorageFree
93 93
nodeLiveFieldExtract "dtotal" res =
94
  getMaybeJsonHead (rpcResNodeInfoVgInfo res) vgInfoVgSize
94
  getMaybeJsonHead (rpcResNodeInfoStorageInfo res) storageInfoStorageSize
95 95
nodeLiveFieldExtract "spfree" res =
96
  getMaybeJsonElem (rpcResNodeInfoVgInfo res) 1 vgInfoVgFree
96
  getMaybeJsonElem (rpcResNodeInfoStorageInfo res) 1 storageInfoStorageFree
97 97
nodeLiveFieldExtract "sptotal" res =
98
  getMaybeJsonElem (rpcResNodeInfoVgInfo res) 1 vgInfoVgSize
98
  getMaybeJsonElem (rpcResNodeInfoStorageInfo res) 1 storageInfoStorageSize
99 99
nodeLiveFieldExtract "mfree" res =
100 100
  jsonHead (rpcResNodeInfoHvInfo res) hvInfoMemoryFree
101 101
nodeLiveFieldExtract "mnode" res =

Also available in: Unified diff