# HG changeset patch
# User Miloslav Zezulka <mzezulka@redhat.com>
# Date 1506948098 -7200
# Node ID 025c66961cf9b8594a49dcccfd1d6631795f1581
# Parent  abcc0226b29324bc3fdef93feada0f9e6b13b130
Update jvm-memory swagger spec to also contain resident memory

Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025253.html

diff -r abcc0226b293 -r 025c66961cf9 services/jvm-memory/src/main/resources/jvm-memory-swagger.yaml
--- a/services/jvm-memory/src/main/resources/jvm-memory-swagger.yaml	Tue Oct 03 14:20:18 2017 -0400
+++ b/services/jvm-memory/src/main/resources/jvm-memory-swagger.yaml	Mon Oct 02 14:41:38 2017 +0200
@@ -100,7 +100,9 @@
       jvmId:
         type: string
       timeStamp:
-        $ref: '#/definitions/timestamp'
+        allOf:
+          - $ref: '#/definitions/metric'
+          - description: UNIX timestamp in milliseconds
       metaspaceMaxCapacity:
         $ref: '#/definitions/metric'
       metaspaceMinCapacity:
@@ -109,6 +111,10 @@
         $ref: '#/definitions/metric'
       metaspaceUsed:
         $ref: '#/definitions/metric'
+      residentMemory:
+        allOf:
+          - $ref: '#/definitions/metric'
+          - description: Resident memory size in KB
       generations:
         type: array
         items:
@@ -168,13 +174,6 @@
     properties:
       $numberLong:
         type: string
-  timestamp:
-    description: UNIX timestamp in milliseconds
-    type: object
-    properties:
-      $numberLong:
-        type: string
-
   put-body:
     type: object
     properties: