Fix s360 kpis for 2020-03-01. (Azure#11593)

* Fix s360 kpis for 2020-03-01. * Delete Caches_Delete.json.bak Remove backup file that was accidentally pushed. * Delete Caches_Flush.json.bak Remove backup file that was accidentally pushed. * Delete Caches_Start.json.bak Remove backup file that was accidentally pushed. * Delete Caches_Stop.json.bak Remove backup file that was accidentally pushed. * Delete Caches_UpgradeFirmware.json.bak Remove backup file that was accidentally pushed. * Delete StorageTargets_Delete.json.bak Remove backup file that was accidentally pushed.
giromm2ms · Dec 20, 2020 · 844fc5f · 844fc5f
1 parent e68b7ee
commit 844fc5f
Show file tree

Hide file tree

Showing 7 changed files with 292 additions and 1 deletion.
diff --git a/...resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/AscOperations_Get.json b/...resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/AscOperations_Get.json
@@ -7,7 +7,6 @@
   },
   "responses": {
     "200": {
-      "headers": {},
       "body": {
         "id": "/subscriptions/id/locations/westus/ascOperations/testoperationid",
         "name": "testoperationid",

diff --git a/...urce-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Caches_CreateOrUpdate.json b/...urce-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Caches_CreateOrUpdate.json
@@ -19,6 +19,43 @@
     }
   },
   "responses": {
+    "202": {
+      "body": {
+        "tags": {
+          "Dept": "ContosoAds"
+        },
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1",
+        "location": "westus",
+        "name": "sc1",
+        "type": "Microsoft.StorageCache/Cache",
+        "properties": {
+          "cacheSizeGB": 3072,
+          "health": {
+            "state": "Transitioning",
+            "statusDescription": "Cache is being created."
+          },
+          "mountAddresses": [
+            "192.168.1.1",
+            "192.168.1.2"
+          ],
+          "provisioningState": "Succeeded",
+          "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1",
+          "upgradeStatus": {
+            "currentFirmwareVersion": "5.3.23",
+            "firmwareUpdateStatus": "available",
+            "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z",
+            "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z",
+            "pendingFirmwareVersion": "5.3.24"
+          },
+          "networkSettings": {
+            "mtu": 1500
+          }
+        },
+        "sku": {
+          "name": "Standard_2G"
+        }
+      }
+    },
     "201": {
       "body": {
         "tags": {

diff --git a/...e/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Operations_List.json b/...e/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Operations_List.json
@@ -27,6 +27,49 @@
               "provider": "Azure Storage Cache",
               "resource": "Caches"
             }
+          },
+          {
+            "origin": "system",
+            "name": "Microsoft.StorageCache/caches/providers/Microsoft.Insights/metricDefinitions/read",
+            "isDataAction": false,
+            "display": {
+              "operation": "Get Cache Metric Definitions",
+              "provider": "Microsoft Azure HPC Cache",
+              "resource": "StorageCache Metric Definitions",
+              "description": "Reads Cache Metric Definitions."
+            },
+            "properties": {
+              "serviceSpecification": {
+                "metricSpecifications": [
+                  {
+                    "name": "ClientIOPS",
+                    "displayName": "Total Client IOPS",
+                    "displayDescription": "The rate of client file operations processed by the Cache.",
+                    "unit": "Count",
+                    "aggregationType": "Average",
+                    "supportedAggregationTypes": [
+                      "Minimum",
+                      "Maximum",
+                      "Average"
+                    ],
+                    "metricClass": "Transactions"
+                  },
+                  {
+                    "name": "ClientLatency",
+                    "displayName": "Average Client Latency",
+                    "displayDescription": "Average latency of client file operations to the Cache.",
+                    "unit": "Milliseconds",
+                    "aggregationType": "Average",
+                    "supportedAggregationTypes": [
+                      "Minimum",
+                      "Maximum",
+                      "Average"
+                    ],
+                    "metricClass": "Latency"
+                  }
+                ]
+              }
+            }
           }
         ]
       }

diff --git a/...ager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_CreateOrUpdate.json b/...ager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_CreateOrUpdate.json
@@ -33,6 +33,14 @@
         "name": "st1",
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
         "type": "Microsoft.StorageCache/Cache/StorageTarget",
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+        },
         "properties": {
           "junctions": [
             {
@@ -59,6 +67,48 @@
         "name": "st1",
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
         "type": "Microsoft.StorageCache/Cache/StorageTarget",
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+        },
+        "properties": {
+          "junctions": [
+            {
+              "namespacePath": "/path/on/cache",
+              "targetPath": "/path/on/exp1",
+              "nfsExport": "exp1"
+            },
+            {
+              "namespacePath": "/path2/on/cache",
+              "targetPath": "/path2/on/exp2",
+              "nfsExport": "exp2"
+            }
+          ],
+          "targetType": "nfs3",
+          "nfs3": {
+            "target": "10.0.44.44",
+            "usageModel": "READ_HEAVY_INFREQ"
+          }
+        }
+      }
+    },
+    "202": {
+      "body": {
+        "name": "st1",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
+        "type": "Microsoft.StorageCache/Cache/StorageTarget",
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+        },
         "properties": {
           "junctions": [
             {

diff --git a/...esource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_Get.json b/...esource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_Get.json
@@ -12,6 +12,14 @@
         "name": "st1",
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
         "type": "Microsoft.StorageCache/Cache/StorageTarget",
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+        },
         "properties": {
           "junctions": [
             {

diff --git a/...manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_ListByCache.json b/...manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_ListByCache.json
@@ -13,6 +13,14 @@
             "name": "st1",
             "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
             "type": "Microsoft.StorageCache/Cache/StorageTarget",
+            "systemData": {
+              "createdBy": "user1",
+              "createdByType": "User",
+              "createdAt": "2020-01-01T17:18:19.1234567Z",
+              "lastModifiedBy": "user2",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+            },
             "properties": {
               "junctions": [
                 {
@@ -37,6 +45,14 @@
             "name": "st2",
             "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st2",
             "type": "Microsoft.StorageCache/Cache/StorageTarget",
+            "systemData": {
+              "createdBy": "user1",
+              "createdByType": "User",
+              "createdAt": "2020-01-01T17:18:19.1234567Z",
+              "lastModifiedBy": "user2",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
+            },
             "properties": {
               "junctions": [
                 {

diff --git a/.../storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/storagecache.json b/.../storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/storagecache.json
@@ -465,6 +465,12 @@
               "$ref": "#/definitions/Cache"
             }
           },
+          "202": {
+            "description": "Cache creation or update has been initiated. Poll the new Cache's provisioningState property to monitor creation progress.",
+            "schema": {
+              "$ref": "#/definitions/Cache"
+            }
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -984,6 +990,12 @@
               "$ref": "#/definitions/StorageTarget"
             }
           },
+          "202": {
+            "description": "Storage Target creation or update has been initiated. Poll the new Storage Target's provisioningState property to monitor creation progress.",
+            "schema": {
+              "$ref": "#/definitions/StorageTarget"
+            }
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -1087,12 +1099,44 @@
             "resource": {
               "description": "Resource on which the operation is performed: Cache, etc.",
               "type": "string"
+            },
+            "description": {
+              "description": "The description of the operation",
+              "type": "string"
             }
           }
         },
+        "origin": {
+          "description": "Origin of the operation.",
+          "type": "string"
+        },
+        "isDataAction": {
+          "description": "The flag that indicates whether the operation applies to data plane.",
+          "type": "boolean"
+        },
         "name": {
           "description": "Operation name: {provider}/{resource}/{operation}",
           "type": "string"
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "description": "Additional details about an operation.",
+          "type": "object",
+          "properties": {
+            "serviceSpecification": {
+              "type": "object",
+              "description": "Specification of the all the metrics provided for a resource type.",
+              "properties": {
+                "metricSpecifications": {
+                  "description": "Details about operations related to metrics.",
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/definitions/MetricSpecification"
+                  }
+                }
+              }
+            }
+          }
         }
       },
       "type": "object"
@@ -1225,6 +1269,11 @@
           "$ref": "#/definitions/CacheIdentity",
           "description": "The identity of the cache, if configured."
         },
+        "systemData": {
+          "readOnly": true,
+          "description": "The system meta data relating to this resource.",
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "description": "Properties of the Cache.",
@@ -1513,6 +1562,16 @@
           "description": "Type of the Storage Target; Microsoft.StorageCache/Cache/StorageTarget",
           "readOnly": true,
           "type": "string"
+        },
+        "location": {
+          "description": "Region name string.",
+          "readOnly": true,
+          "type": "string"
+        },
+        "systemData": {
+          "readOnly": true,
+          "description": "The system meta data relating to this resource.",
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
         }
       },
       "x-ms-azure-resource": true
@@ -1843,6 +1902,85 @@
         }
       },
       "type": "object"
+    },
+    "MetricSpecification": {
+      "type": "object",
+      "description": "Details about operation related to metrics.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the metric."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Localized display name of the metric."
+        },
+        "displayDescription": {
+          "type": "string",
+          "description": "The description of the metric."
+        },
+        "unit": {
+          "type": "string",
+          "description": "The unit that the metric is measured in."
+        },
+        "aggregationType": {
+          "type": "string",
+          "description": "The type of metric aggregation."
+        },
+        "supportedAggregationTypes": {
+          "description": "Support metric aggregation type.",
+          "type": "array",
+          "items": {
+            "enum": [
+              "NotSpecified",
+              "None",
+              "Average",
+              "Minimum",
+              "Maximum",
+              "Total",
+              "Count"
+            ],
+            "type": "string",
+            "x-ms-enum": {
+              "name": "MetricAggregationType",
+              "modelAsString": true
+            }
+          }
+        },
+        "metricClass": {
+          "description": "Type of metrics.",
+          "type": "string"
+        },
+        "dimensions": {
+          "description": "Dimensions of the metric",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MetricDimension"
+          }
+        }
+      }
+    },
+    "MetricDimension": {
+      "type": "object",
+      "description": "Specifications of the Dimension of metrics.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the dimension"
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Localized friendly display name of the dimension"
+        },
+        "internalName": {
+          "type": "string",
+          "description": "Internal name of the dimension."
+        },
+        "toBeExportedForShoebox": {
+          "description": "To be exported to shoe box.",
+          "type": "boolean"
+        }
+      }
     }
   },
   "parameters": {