Sql auditing swagger - add queueDelayMs property (Azure#7759)

AsrOneSdk · Dec 11, 2019 · 6973f3b · 6973f3b
1 parent fba3c7e
commit 6973f3b
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 28 deletions.
diff --git a/...ification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json b/...ification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json
@@ -192,7 +192,7 @@
           }
         },
         "storageEndpoint": {
-          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required.",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required.",
           "type": "string"
         },
         "storageAccountAccessKey": {
@@ -227,6 +227,11 @@
         "isAzureMonitorTargetEnabled": {
           "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
           "type": "boolean"
+        },
+        "queueDelayMs": {
+          "format": "int32",
+          "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.",
+          "type": "integer"
         }
       }
     },

diff --git a/...rosoft.Sql/preview/2015-05-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json b/...rosoft.Sql/preview/2015-05-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json
@@ -23,7 +23,6 @@
         "properties": {
           "state": "Enabled",
           "isAzureMonitorTargetEnabled": true,
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,
@@ -44,7 +43,6 @@
         "properties": {
           "state": "Enabled",
           "isAzureMonitorTargetEnabled": true,
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,

diff --git a/...ager/Microsoft.Sql/preview/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json b/...ager/Microsoft.Sql/preview/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json
@@ -14,6 +14,7 @@
         "retentionDays": 6,
         "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
         "isStorageSecondaryKeyInUse": false,
+        "queueDelayMs": 4000,
         "auditActionsAndGroups": [
           "DATABASE_LOGOUT_GROUP",
           "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
@@ -33,15 +34,11 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
           "isStorageSecondaryKeyInUse": false,
-          "auditActionsAndGroups": [
-            "DATABASE_LOGOUT_GROUP",
-            "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
-            "UPDATE on database::TestDatabaseName by public"
-          ],
+          "queueDelayMs": 4000,
+          "auditActionsAndGroups": [ "DATABASE_LOGOUT_GROUP", "DATABASE_ROLE_MEMBER_CHANGE_GROUP", "UPDATE on database::TestDatabaseName by public" ],
           "isAzureMonitorTargetEnabled": true
         }
       }
@@ -55,15 +52,11 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
           "isStorageSecondaryKeyInUse": false,
-          "auditActionsAndGroups": [
-            "DATABASE_LOGOUT_GROUP",
-            "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
-            "UPDATE on database::TestDatabaseName by public"
-          ],
+          "queueDelayMs": 4000,
+          "auditActionsAndGroups": [ "DATABASE_LOGOUT_GROUP", "DATABASE_ROLE_MEMBER_CHANGE_GROUP", "UPDATE on database::TestDatabaseName by public" ],
           "isAzureMonitorTargetEnabled": true
         }
       }

diff --git a/...ager/Microsoft.Sql/preview/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json b/...ager/Microsoft.Sql/preview/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json
@@ -24,7 +24,6 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,
@@ -46,7 +45,6 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,

diff --git a/...ification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json b/...ification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json
@@ -543,7 +543,7 @@
           }
         },
         "storageEndpoint": {
-          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required.",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required.",
           "type": "string"
         },
         "storageAccountAccessKey": {
@@ -578,6 +578,11 @@
         "isAzureMonitorTargetEnabled": {
           "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
           "type": "boolean"
+        },
+        "queueDelayMs": {
+          "format": "int32",
+          "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.",
+          "type": "integer"
         }
       }
     },
@@ -621,7 +626,7 @@
           }
         },
         "storageEndpoint": {
-          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required.",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required.",
           "type": "string"
         },
         "storageAccountAccessKey": {
@@ -656,6 +661,11 @@
         "isAzureMonitorTargetEnabled": {
           "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
           "type": "boolean"
+        },
+        "queueDelayMs": {
+          "format": "int32",
+          "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.",
+          "type": "integer"
         }
       }
     },
@@ -695,7 +705,7 @@
           }
         },
         "storageEndpoint": {
-          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required.",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required.",
           "type": "string"
         },
         "storageAccountAccessKey": {
@@ -730,6 +740,11 @@
         "isAzureMonitorTargetEnabled": {
           "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
           "type": "boolean"
+        },
+        "queueDelayMs": {
+          "format": "int32",
+          "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.",
+          "type": "integer"
         }
       }
     },
@@ -788,7 +803,7 @@
           }
         },
         "storageEndpoint": {
-          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required.",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required.",
           "type": "string"
         },
         "storageAccountAccessKey": {
@@ -823,6 +838,11 @@
         "isAzureMonitorTargetEnabled": {
           "description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
           "type": "boolean"
+        },
+        "queueDelayMs": {
+          "format": "int32",
+          "description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647.",
+          "type": "integer"
         }
       }
     },

diff --git a/...rosoft.Sql/preview/2017-03-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json b/...rosoft.Sql/preview/2017-03-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json
@@ -23,7 +23,6 @@
         "properties": {
           "state": "Enabled",
           "isAzureMonitorTargetEnabled": true,
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,
@@ -44,7 +43,6 @@
         "properties": {
           "state": "Enabled",
           "isAzureMonitorTargetEnabled": true,
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,

diff --git a/...ager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseBlobAuditingCreateMax.json b/...ager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseBlobAuditingCreateMax.json
@@ -14,6 +14,7 @@
         "retentionDays": 6,
         "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
         "isStorageSecondaryKeyInUse": false,
+        "queueDelayMs": 4000,
         "auditActionsAndGroups": [
           "DATABASE_LOGOUT_GROUP",
           "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
@@ -33,10 +34,10 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
           "isStorageSecondaryKeyInUse": false,
+          "queueDelayMs": 4000,
           "auditActionsAndGroups": [
             "DATABASE_LOGOUT_GROUP",
             "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
@@ -55,15 +56,15 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
           "isStorageSecondaryKeyInUse": false,
+          "queueDelayMs": 4000,
           "auditActionsAndGroups": [
             "DATABASE_LOGOUT_GROUP",
             "DATABASE_ROLE_MEMBER_CHANGE_GROUP",
             "UPDATE on database::TestDatabaseName by public"
-          ],
+           ],
           "isAzureMonitorTargetEnabled": true
         }
       }

diff --git a/...ager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseBlobAuditingCreateMin.json b/...ager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseBlobAuditingCreateMin.json
@@ -24,7 +24,6 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,
@@ -46,7 +45,6 @@
         "properties": {
           "state": "Enabled",
           "storageEndpoint": "https://mystorage.blob.core.windows.net",
-          "storageAccountAccessKey": "",
           "retentionDays": 0,
           "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
           "isStorageSecondaryKeyInUse": false,

diff --git a/...anager/Microsoft.Sql/preview/2017-03-01-preview/examples/ServerBlobAuditingCreateMax.json b/...anager/Microsoft.Sql/preview/2017-03-01-preview/examples/ServerBlobAuditingCreateMax.json
@@ -13,6 +13,7 @@
         "retentionDays": 6,
         "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
         "isStorageSecondaryKeyInUse": false,
+        "queueDelayMs": 4000,
         "auditActionsAndGroups": [
           "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP",
           "FAILED_DATABASE_AUTHENTICATION_GROUP",
@@ -34,6 +35,7 @@
           "retentionDays": 6,
           "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000",
           "isStorageSecondaryKeyInUse": false,
+          "queueDelayMs": 4000,
           "auditActionsAndGroups": [
             "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP",
             "FAILED_DATABASE_AUTHENTICATION_GROUP",