Merge branch '7.0-dev' into 8.0-dev

components/examples/applianceSettings.json

@@ -8,6 +8,23 @@
       "defaultRoleId": "4",
       "defaultUserRoleId": null,
       "dockerPrivilegedMode": false,
+      "cloudSyncIntervalSeconds": "600",
+      "clusterSyncIntervalSeconds": null,
+      "usageRetainmentPeriod": null,
+      "invoiceRetainmentPeriod": null,
+      "reportsRetainmentPeriod": "90",
+      "httpBlacklistHosts": null,
+      "httpApprovelistHosts": null,
+      "noAgent": false,
+      "agentSSLVerify": false,
+      "defaultLocale": "en-GB",
+      "maxOptionListSize": "2000",
+      "passwordMinLength": "8",
+      "passwordMinUpperCase": "1",
+      "passwordMinNumbers": "1",
+      "passwordMinSymbols": "1",
+      "userBrowserSessionTimeout": "200",
+      "userBrowserSessionWarning": "15",
       "expirePwdDays": null,
       "disableAfterAttempts": null,
       "disableAfterDaysInactive": null,
@@ -20,6 +37,9 @@
       "smtpUser": "[email protected]",
       "smtpPassword": "********",
       "smtpPasswordHash": "945b02b487b4bb7",
+      "twilioAccountSid": null,
+      "twilioSmsFrom": null,
+      "twilioAuthToken": null,
       "proxyHost": null,
       "proxyPort": null,
       "proxyUser": null,

components/schemas/applianceSettingsUpdate.yaml

@@ -128,3 +128,55 @@ properties:
   disableAllZoneTypes: 
     type: boolean
     description: Set all cloud types enabled status off, can be used in conjunction with enableZoneTypes
+  twilioAccountSid:
+    type: string
+    description: Twilio SMS Account SID
+  twilioSmsFrom:
+    type: string
+    description: Twilio SMS From
+  twilioAuthToken:
+    type: string
+    description: Twilio SMS Auth Token
+  cloudSyncIntervalSeconds:
+    type: integer
+    format: int64
+    description: Cloud Sync Interval (Seconds)
+  clusterSyncIntervalSeconds:
+    type: integer
+    format: int64
+    description: Cluster Sync Interval (Seconds)
+  usageRetainmentPeriod:
+    type: integer
+    format: int64
+    description: Usage Retainment (Days)
+  invoiceRetainmentPeriod:
+    type: integer
+    format: int64
+    description: Invoice Retainment (Days)
+  statsRetainmentPeriod:
+    type: integer
+    format: int64
+    description: The number of days stats will be retained. (30, 60 or 90)
+  reportsRetainmentPeriod:
+    type: integer
+    format: int64
+    description: The number of days reports will be retained.
+  httpBlacklistHosts:
+    type: string
+    description: Provide a comma delimited list of ips/hostnames to be blocked when using HTTP Task Types or REST Datasource Option Lists
+  httpApprovelistHosts:
+    type: string
+    description: Provide a comma delimited list of ips/hostnames to be allowed when using HTTP Task Types or REST Datasource Option Lists. If not specified, only deny list is filtered out.
+  noAgent:
+    type: boolean
+    description: If true, disables Agent installation globally.
+  agentSSLVerify:
+    type: boolean
+    description: Enable/Disable SSL Verification of Agent
+  defaultLocale:
+    type: string
+    description: Default appliance Locale. Setting a default locale for the application will override user browser preferences.
+  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.