[Monitor] Add two missing "by subscription" operations for completene…

…ss and compliance (#3285)
Azure · Jun 25, 2018 · d077470 · d077470
1 parent 37ca9e7
commit d077470
Show file tree

Hide file tree

Showing 19 changed files with 327 additions and 1,532 deletions.
diff --git a/...ager/microsoft.insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json b/...ager/microsoft.insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
@@ -65,19 +65,6 @@
             "description": "Successful request to get more information about diagnostic setting category",
             "schema": {
               "$ref": "#/definitions/DiagnosticSettingsCategoryResource"
-            },
-            "examples": {
-              "application/json": 
-                {
-                  "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowRuntime",
-                  "type":"microsoft.insights/diagnosticSettingsCategories",
-                  "name":"WorkflowRuntime",
-                  "location":"eastus",
-                  "tags":null,
-                  "properties": {
-                    "categoryType":"Logs"
-                  }
-                }
             }
           }
         },
@@ -114,32 +101,6 @@
             "description": "Successful request to get more information about diagnostic setting category",
             "schema": {
               "$ref": "#/definitions/DiagnosticSettingsCategoryResourceCollection"
-            },
-            "examples": {
-              "application/json": {
-                "value": [
-                  {
-                    "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowRuntime",
-                    "type":"microsoft.insights/diagnosticSettingsCategories",
-                    "name":"WorkflowRuntime",
-                    "location":"eastus",
-                    "tags":null,
-                    "properties": {
-                      "categoryType":"Logs"
-                    }
-                  },
-                  {
-                    "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowMetric",
-                    "type":"microsoft.insights/diagnosticSettingsCategories",
-                    "name":"WorkflowMetric",
-                    "location":"eastus",
-                    "tags":null,
-                    "properties": {
-                      "categoryType":"Metrics"
-                    }
-                  }
-                ]
-              }
             }
           }
         },
@@ -197,7 +158,8 @@
       "properties": {
         "properties": {
           "x-ms-client-flatten": true,
-          "$ref": "#/definitions/DiagnosticSettingsCategory"
+          "$ref": "#/definitions/DiagnosticSettingsCategory",
+          "description": "The properties of a Diagnostic Settings Category."
         }
       },
       "description": "The diagnostic settings category resource."

diff --git a/...source-manager/microsoft.insights/preview/2017-05-01-preview/diagnosticsSettings_API.json b/...source-manager/microsoft.insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
@@ -65,40 +65,6 @@
             "description": "Successful request to get more information about diagnostic setting",
             "schema": {
               "$ref": "#/definitions/DiagnosticSettingsResource"
-            },
-            "examples": {
-              "application/json": {
-                "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting",
-                "type":"microsoft.logic/workflows",
-                "name":"mysetting",
-                "location":"eastus",
-                "tags":null,
-                "properties": {
-                  "storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
-                  "eventHubAuthorizationRuleId":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
-                  "workspaceId":"",
-                  "metrics": [
-                    {
-                      "category":"WorkflowMetrics",
-                      "enabled":true,
-                      "retentionPolicy": {
-                        "enabled":false,
-                        "days":0
-                      }
-                    }
-                  ],
-                  "logs": [
-                    {
-                      "category":"WorkflowRuntime",
-                      "enabled":true,
-                      "retentionPolicy": {
-                        "enabled":false,
-                        "days":0
-                      }
-                    }
-                  ]
-                }
-              }
             }
           }
         },
@@ -145,40 +111,6 @@
             "description": "Successful request to create a diagnostic setting",
             "schema": {
               "$ref": "#/definitions/DiagnosticSettingsResource"
-            },
-            "examples": {
-              "application/json": {
-                "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting",
-                "type":"microsoft.logic/workflows",
-                "name":"mysetting",
-                "location":"eastus",
-                "tags":null,
-                "properties": {
-                  "storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
-                  "eventHubAuthorizationRuleId":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
-                  "workspaceId":"",
-                  "metrics": [
-                    {
-                      "category":"WorkflowMetrics",
-                      "enabled":true,
-                      "retentionPolicy": {
-                        "enabled":false,
-                        "days":0
-                      }
-                    }
-                  ],
-                  "logs": [
-                    {
-                      "category":"WorkflowRuntime",
-                      "enabled":true,
-                      "retentionPolicy": {
-                        "enabled":false,
-                        "days":0
-                      }
-                    }
-                  ]
-                }
-              }
             }
           }
         },
@@ -252,44 +184,6 @@
             "description": "Successful request to get more information about diagnostic setting",
             "schema": {
               "$ref": "#/definitions/DiagnosticSettingsResourceCollection"
-            },
-            "examples": {
-              "application/json": {
-                "value": [ 
-                  {
-                    "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting",
-                    "type":"microsoft.logic/workflows",
-                    "name":"mysetting",
-                    "location":"eastus",
-                    "tags":null,
-                    "properties": {
-                      "storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
-                      "eventHubAuthorizationRuleId":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
-                      "workspaceId":"",
-                      "metrics": [
-                        {
-                          "category":"WorkflowMetrics",
-                          "enabled":true,
-                          "retentionPolicy": {
-                            "enabled":false,
-                            "days":0
-                          }
-                        }
-                      ],
-                      "logs": [
-                        {
-                          "category":"WorkflowRuntime",
-                          "enabled":true,
-                          "retentionPolicy": {
-                            "enabled":false,
-                            "days":0
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
             }
           }
         },
@@ -386,6 +280,10 @@
           "type": "string",
           "description": "The resource ID of the storage account to which you would like to send Diagnostic Logs."
         },
+        "serviceBusRuleId": {
+          "type": "string",
+          "description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility."
+        },
         "eventHubAuthorizationRuleId": {
           "type": "string",
           "description": "The resource Id for the event hub authorization rule."
@@ -425,7 +323,8 @@
       "properties": {
         "properties": {
           "x-ms-client-flatten": true,
-          "$ref": "#/definitions/DiagnosticSettings"
+          "$ref": "#/definitions/DiagnosticSettings",
+          "description": "Properties of a Diagnostic Settings Resource."
         }
       },
       "description": "The diagnostic setting resource."

diff --git a/...crosoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json b/...crosoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "resourceUri": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri": "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "name": "mysetting",
     "api-version": "2017-05-01-preview",
     "parameters": {

diff --git a/...nager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json b/...nager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json
@@ -1,6 +1,6 @@
 {
     "parameters" : {
-    "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "name": "mysetting",
     "api-version" : "2017-05-01-preview"
   },

diff --git a/...-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json b/...-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "name": "mysetting",
     "api-version" : "2017-05-01-preview"
   },

diff --git a/...microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json b/...microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "name": "WorkflowRuntime",
     "api-version" : "2017-05-01-preview"
   },

diff --git a/...anager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json b/...anager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "api-version" : "2017-05-01-preview"
   },
   "responses" : {

diff --git a/...rosoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json b/...rosoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
+    "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
     "api-version" : "2017-05-01-preview"
   },
   "responses" : {

diff --git a/.../monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json b/.../monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json
@@ -80,48 +80,6 @@
               "description": "Successful request to get the list of metric values.",
               "schema": {
                 "$ref": "#/definitions/BaselineResponse"
-              },
-              "examples": {
-                "application/json": {
-                  "id": "/subscriptions/b368ca2f-e298-46b7-b0ab-012281956afa/resourceGroups/vms/providers/Microsoft.Compute/virtualMachines/vm1/providers/Microsoft.Insights/baseline/PercentageCpu",
-                  "type": "Microsoft.Insights/baseline",
-                  "name": {
-                    "value": "PercentageCpu"
-                  },
-                  "properties": {
-                    "timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
-                    "aggregation": "Average",
-                    "interval": "PT1H",
-                    "timestamps": [
-                      "2017-04-14T02:20:00Z",
-                      "2017-04-14T03:20:00Z"
-                    ],
-                    "baseline": [
-                      {
-                        "sensitivity": "Low",
-                        "lowThresholds": [
-                          30.0,
-                          31.1
-                        ],
-                        "highThresholds": [
-                          90.3453,
-                          91.3453
-                        ]
-                      },
-                      {
-                        "sensitivity": "Medium",
-                        "lowThresholds": [
-                          50.0,
-                          51.1
-                        ],
-                        "highThresholds": [
-                          70.3453,
-                          71.3453
-                        ]
-                      }
-                    ]
-                  }                                    
-                }
               }
             }
           },

diff --git a/...resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json b/...resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json
@@ -71,39 +71,6 @@
               "description": "Successful request to get the list of metric values.",
               "schema": {
                 "$ref": "#/definitions/CalculateBaselineResponse"
-              },
-              "examples": {
-                "application/json": {
-                  "type": "Microsoft.Insights/calculatebaseline",
-                  "timestamps": [
-                    "2017-04-14T02:20:00Z",
-                    "2017-04-14T03:20:00Z"
-                  ],
-                  "baseline": [
-                    {
-                      "sensitivity": "Low",
-                      "lowThresholds": [
-                        30.0,
-                        31.1
-                      ],
-                      "highThresholds": [
-                        90.3453,
-                        91.3453
-                      ]
-                    },
-                    {
-                      "sensitivity": "Medium",
-                      "lowThresholds": [
-                        50.0,
-                        51.1
-                      ],
-                      "highThresholds": [
-                        70.3453,
-                        71.3453
-                      ]
-                    }
-                  ]                  
-                }
               }
             }
           },