Add resource name param to diskMetrics and networkMetrics method
- Enable to add metrics of multiple disks
- Enable to add metrics of multiple network interfaces
Change-Id: I6e91d63b7a02f0d2f63fe445712a23e72d208789
diff --git a/apps/cpman/app/src/main/resources/definitions/DiskMetricsPost.json b/apps/cpman/app/src/main/resources/definitions/DiskMetricsPost.json
index fe0dab1..ea2bbd5 100644
--- a/apps/cpman/app/src/main/resources/definitions/DiskMetricsPost.json
+++ b/apps/cpman/app/src/main/resources/definitions/DiskMetricsPost.json
@@ -1,19 +1,41 @@
{
"type": "object",
+ "title": "disks",
"required": [
- "readBytes",
- "writeBytes"
+ "disks"
],
"properties": {
- "readBytes": {
- "type": "integer",
- "format": "int64",
- "example": "500"
- },
- "writeBytes": {
- "type": "integer",
- "format": "int64",
- "example": "300"
+ "disks": {
+ "type": "array",
+ "xml": {
+ "name": "disks",
+ "wrapped": true
+ },
+ "items": {
+ "type": "object",
+ "title": "disks",
+ "required": [
+ "resourceName",
+ "readBytes",
+ "writeBytes"
+ ],
+ "properties": {
+ "resourceName": {
+ "type": "string",
+ "example": "disk1"
+ },
+ "readBytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": "500"
+ },
+ "writeBytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": "300"
+ }
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/apps/cpman/app/src/main/resources/definitions/NetworkMetricsPost.json b/apps/cpman/app/src/main/resources/definitions/NetworkMetricsPost.json
index f9ad7d3..a04bdd8 100644
--- a/apps/cpman/app/src/main/resources/definitions/NetworkMetricsPost.json
+++ b/apps/cpman/app/src/main/resources/definitions/NetworkMetricsPost.json
@@ -1,31 +1,53 @@
{
"type": "object",
+ "title": "networks",
"required": [
- "incomingBytes",
- "outgoingBytes",
- "incomingPackets",
- "outgoingPackets"
+ "networks"
],
"properties": {
- "incomingBytes": {
- "type": "integer",
- "format": "int64",
- "example": "1024"
- },
- "outgoingBytes": {
- "type": "integer",
- "format": "int64",
- "example": "1024"
- },
- "incomingPackets": {
- "type": "integer",
- "format": "int64",
- "example": "1000"
- },
- "outgoingPackets": {
- "type": "integer",
- "format": "int64",
- "example": "2000"
+ "networks": {
+ "type": "array",
+ "xml": {
+ "name": "networks",
+ "wrapped": true
+ },
+ "items": {
+ "type": "object",
+ "title": "networks",
+ "required": [
+ "resourceName",
+ "incomingBytes",
+ "outgoingBytes",
+ "incomingPackets",
+ "outgoingPackets"
+ ],
+ "properties": {
+ "resourceName": {
+ "type": "string",
+ "example": "eth0"
+ },
+ "incomingBytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": "1024"
+ },
+ "outgoingBytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": "1024"
+ },
+ "incomingPackets": {
+ "type": "integer",
+ "format": "int64",
+ "example": "1000"
+ },
+ "outgoingPackets": {
+ "type": "integer",
+ "format": "int64",
+ "example": "2000"
+ }
+ }
+ }
}
}
}
\ No newline at end of file