Merge branch '7.0-dev' into 8.0-dev

gomorpheus · Nov 25, 2024 · 9df67bd · 9df67bd
2 parents 3f76949 + f4bf422
commit 9df67bd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/components/examples/applianceSettings.json b/components/examples/applianceSettings.json
@@ -12,12 +12,16 @@
       "clusterSyncIntervalSeconds": null,
       "usageRetainmentPeriod": null,
       "invoiceRetainmentPeriod": null,
+      "incidentRetainmentPeriod": "30",
       "reportsRetainmentPeriod": "90",
       "httpBlacklistHosts": null,
       "httpApprovelistHosts": null,
+      "exchangeUrl": "https://share.morpheusdata.com",
       "noAgent": false,
       "agentSSLVerify": false,
+      "disableSSHPasswordAuth": false,
       "defaultLocale": "en-GB",
+      "defaultVdiGateway": null,
       "maxOptionListSize": "2000",
       "passwordMinLength": "8",
       "passwordMinUpperCase": "1",

diff --git a/components/schemas/applianceSettingsUpdate.yaml b/components/schemas/applianceSettingsUpdate.yaml
@@ -153,6 +153,10 @@ properties:
     type: integer
     format: int64
     description: Invoice Retainment (Days)
+  incidentRetainmentPeriod:
+    type: integer
+    format: int64
+    description: Incident Retainment (Days)
   statsRetainmentPeriod:
     type: integer
     format: int64
@@ -173,10 +177,20 @@ properties:
   agentSSLVerify:
     type: boolean
     description: Enable/Disable SSL Verification of Agent
+  disableSSHPasswordAuth:
+    type: boolean
+    description: Enable/Disable SSH Password Authentication for the Appliance
   defaultLocale:
     type: string
     description: Default appliance Locale. Setting a default locale for the application will override user browser preferences.
+  defaultVdiGateway:
+    type: integer
+    format: int64
+    description: ID of the VDI gateway.
   maxOptionListSize:
     type: integer
     format: int64
-    description: Max option list size. Units are x10^3 (thousand). Increasing this value can adversely affect Morpheus performance. Increase with caution.
+    description: Max option list size. Units are x10^3 (thousand). Increasing this value can adversely affect Morpheus performance. Increase with caution.
+  exchangeUrl:
+    type: string
+    description: The url used for checking if there is an update for plugins. Default https\://share.morpheusdata.com