Merge branch '7.0-dev' into 7.2-dev

gomorpheus · Oct 23, 2024 · 6540ff9 · 6540ff9
2 parents a9a0286 + 6a692c0
commit 6540ff9
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 bundled.yaml
-bundle2.yaml
+bundle2.yaml
+.idea/
diff --git a/components/examples/applianceSettings.json b/components/examples/applianceSettings.json
@@ -1,5 +1,6 @@
 {
   "applianceSettings": {
+      "uuid": "a26caec3-f2f3-474b-adf1-d85d670ad56f",
       "applianceUrl": "https://mysite.fqdn.com/",
       "internalApplianceUrl": "http://192.168.1.14",
       "corsAllowed": "*",

diff --git a/components/examples/health.json b/components/examples/health.json
@@ -4,6 +4,7 @@
         "statusMessage": "",
         "applianceUrl": "https:/fqdn.com/",
         "buildVersion": "5.4.11",
+        "uuid": "a26caec3-f2f3-474b-adf1-d85d670ad56f",
         "setupNeeded": false,
         "date": "2022-08-22T20:17:14Z",
         "cpu": {

diff --git a/components/examples/setup.json b/components/examples/setup.json
@@ -5,5 +5,6 @@
   "lastName": "Anderson",
   "email": "[email protected]",
   "username": "tanderson",
-  "password": "QnW}cg}8}<~:P9YU"
+  "password": "QnW}cg}8}<~:P9YU",
+  "licenseKey": "LICENSE_KEY"
 }
diff --git a/components/schemas/applianceSettings.yaml b/components/schemas/applianceSettings.yaml
@@ -1,5 +1,7 @@
 type: object
 properties: 
+  uuid: 
+    type: string
   applianceUrl: 
     type: string
   internalApplianceUrl: 

diff --git a/components/schemas/backupTypeInstance.yaml b/components/schemas/backupTypeInstance.yaml
@@ -94,4 +94,14 @@ properties:
   retentionCount:
     type: integer
     format: int64
-    description: Retention Count for new job. By default the backup settings value will be used. Only applies to jobAction `new` and `clone`. 
+    description: Retention Count for new job. By default the backup settings value will be used. Only applies to jobAction `new` and `clone`.
+  backupJob:
+    type: object
+    properties:
+      syntheticFullEnabled:
+        type: boolean
+        description: Enable synthetic full backups on this backup jobAction. Only applies to `kvm` backup type.
+      syntheticFullSchedule:
+        type: integer
+        format: int64
+        description: the ID of the execute schedule for the synthetic full backup to be created. Only applies to `kvm` backup type.
diff --git a/components/schemas/health.yaml b/components/schemas/health.yaml
@@ -8,6 +8,8 @@ properties:
     type: string
   buildVersion: 
     type: string
+  uuid: 
+    type: string
   setupNeeded: 
     type: boolean
   date: 

diff --git a/components/schemas/setup.yaml b/components/schemas/setup.yaml
@@ -5,6 +5,9 @@ properties:
   buildVersion:
     type: string
     description: Morpheus build version that the server is running.
+  uuid:
+    type: string
+    description: The Appliance Unique ID that is auto generated.
   applianceUrl:
     type: string
     description: The Appliance Server URL as defined under Appliance Settings.

diff --git a/paths/[email protected] b/paths/[email protected]
@@ -66,6 +66,9 @@ post:
                     - register
                     - login
                   default: skip
+                licenseKey:
+                  type: string
+                  description: License Key to install on setup.
             - oneOf:
               - $ref: ../components/schemas/hubLoginObject.yaml
               - $ref: ../components/schemas/hubRegisterObject.yaml