Skip to content

Commit 2ce850e

Browse files
authored
Fix s360 kpis for 2020-03-01. (#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.
1 parent a4e2481 commit 2ce850e

File tree

7 files changed

+292
-1
lines changed

7 files changed

+292
-1
lines changed

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/AscOperations_Get.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
},
88
"responses": {
99
"200": {
10-
"headers": {},
1110
"body": {
1211
"id": "/subscriptions/id/locations/westus/ascOperations/testoperationid",
1312
"name": "testoperationid",

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Caches_CreateOrUpdate.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,43 @@
1919
}
2020
},
2121
"responses": {
22+
"202": {
23+
"body": {
24+
"tags": {
25+
"Dept": "ContosoAds"
26+
},
27+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1",
28+
"location": "westus",
29+
"name": "sc1",
30+
"type": "Microsoft.StorageCache/Cache",
31+
"properties": {
32+
"cacheSizeGB": 3072,
33+
"health": {
34+
"state": "Transitioning",
35+
"statusDescription": "Cache is being created."
36+
},
37+
"mountAddresses": [
38+
"192.168.1.1",
39+
"192.168.1.2"
40+
],
41+
"provisioningState": "Succeeded",
42+
"subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1",
43+
"upgradeStatus": {
44+
"currentFirmwareVersion": "5.3.23",
45+
"firmwareUpdateStatus": "available",
46+
"firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z",
47+
"lastFirmwareUpdate": "2019-01-21T18:25:43.511Z",
48+
"pendingFirmwareVersion": "5.3.24"
49+
},
50+
"networkSettings": {
51+
"mtu": 1500
52+
}
53+
},
54+
"sku": {
55+
"name": "Standard_2G"
56+
}
57+
}
58+
},
2259
"201": {
2360
"body": {
2461
"tags": {

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/Operations_List.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,49 @@
2727
"provider": "Azure Storage Cache",
2828
"resource": "Caches"
2929
}
30+
},
31+
{
32+
"origin": "system",
33+
"name": "Microsoft.StorageCache/caches/providers/Microsoft.Insights/metricDefinitions/read",
34+
"isDataAction": false,
35+
"display": {
36+
"operation": "Get Cache Metric Definitions",
37+
"provider": "Microsoft Azure HPC Cache",
38+
"resource": "StorageCache Metric Definitions",
39+
"description": "Reads Cache Metric Definitions."
40+
},
41+
"properties": {
42+
"serviceSpecification": {
43+
"metricSpecifications": [
44+
{
45+
"name": "ClientIOPS",
46+
"displayName": "Total Client IOPS",
47+
"displayDescription": "The rate of client file operations processed by the Cache.",
48+
"unit": "Count",
49+
"aggregationType": "Average",
50+
"supportedAggregationTypes": [
51+
"Minimum",
52+
"Maximum",
53+
"Average"
54+
],
55+
"metricClass": "Transactions"
56+
},
57+
{
58+
"name": "ClientLatency",
59+
"displayName": "Average Client Latency",
60+
"displayDescription": "Average latency of client file operations to the Cache.",
61+
"unit": "Milliseconds",
62+
"aggregationType": "Average",
63+
"supportedAggregationTypes": [
64+
"Minimum",
65+
"Maximum",
66+
"Average"
67+
],
68+
"metricClass": "Latency"
69+
}
70+
]
71+
}
72+
}
3073
}
3174
]
3275
}

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_CreateOrUpdate.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
"name": "st1",
3434
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
3535
"type": "Microsoft.StorageCache/Cache/StorageTarget",
36+
"systemData": {
37+
"createdBy": "user1",
38+
"createdByType": "User",
39+
"createdAt": "2020-01-01T17:18:19.1234567Z",
40+
"lastModifiedBy": "user2",
41+
"lastModifiedByType": "User",
42+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
43+
},
3644
"properties": {
3745
"junctions": [
3846
{
@@ -59,6 +67,48 @@
5967
"name": "st1",
6068
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
6169
"type": "Microsoft.StorageCache/Cache/StorageTarget",
70+
"systemData": {
71+
"createdBy": "user1",
72+
"createdByType": "User",
73+
"createdAt": "2020-01-01T17:18:19.1234567Z",
74+
"lastModifiedBy": "user2",
75+
"lastModifiedByType": "User",
76+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
77+
},
78+
"properties": {
79+
"junctions": [
80+
{
81+
"namespacePath": "/path/on/cache",
82+
"targetPath": "/path/on/exp1",
83+
"nfsExport": "exp1"
84+
},
85+
{
86+
"namespacePath": "/path2/on/cache",
87+
"targetPath": "/path2/on/exp2",
88+
"nfsExport": "exp2"
89+
}
90+
],
91+
"targetType": "nfs3",
92+
"nfs3": {
93+
"target": "10.0.44.44",
94+
"usageModel": "READ_HEAVY_INFREQ"
95+
}
96+
}
97+
}
98+
},
99+
"202": {
100+
"body": {
101+
"name": "st1",
102+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
103+
"type": "Microsoft.StorageCache/Cache/StorageTarget",
104+
"systemData": {
105+
"createdBy": "user1",
106+
"createdByType": "User",
107+
"createdAt": "2020-01-01T17:18:19.1234567Z",
108+
"lastModifiedBy": "user2",
109+
"lastModifiedByType": "User",
110+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
111+
},
62112
"properties": {
63113
"junctions": [
64114
{

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_Get.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
"name": "st1",
1313
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
1414
"type": "Microsoft.StorageCache/Cache/StorageTarget",
15+
"systemData": {
16+
"createdBy": "user1",
17+
"createdByType": "User",
18+
"createdAt": "2020-01-01T17:18:19.1234567Z",
19+
"lastModifiedBy": "user2",
20+
"lastModifiedByType": "User",
21+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
22+
},
1523
"properties": {
1624
"junctions": [
1725
{

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/examples/StorageTargets_ListByCache.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
"name": "st1",
1414
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1",
1515
"type": "Microsoft.StorageCache/Cache/StorageTarget",
16+
"systemData": {
17+
"createdBy": "user1",
18+
"createdByType": "User",
19+
"createdAt": "2020-01-01T17:18:19.1234567Z",
20+
"lastModifiedBy": "user2",
21+
"lastModifiedByType": "User",
22+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
23+
},
1624
"properties": {
1725
"junctions": [
1826
{
@@ -37,6 +45,14 @@
3745
"name": "st2",
3846
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st2",
3947
"type": "Microsoft.StorageCache/Cache/StorageTarget",
48+
"systemData": {
49+
"createdBy": "user1",
50+
"createdByType": "User",
51+
"createdAt": "2020-01-01T17:18:19.1234567Z",
52+
"lastModifiedBy": "user2",
53+
"lastModifiedByType": "User",
54+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
55+
},
4056
"properties": {
4157
"junctions": [
4258
{

specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/storagecache.json

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,12 @@
465465
"$ref": "#/definitions/Cache"
466466
}
467467
},
468+
"202": {
469+
"description": "Cache creation or update has been initiated. Poll the new Cache's provisioningState property to monitor creation progress.",
470+
"schema": {
471+
"$ref": "#/definitions/Cache"
472+
}
473+
},
468474
"default": {
469475
"description": "Error response describing why the operation failed.",
470476
"schema": {
@@ -984,6 +990,12 @@
984990
"$ref": "#/definitions/StorageTarget"
985991
}
986992
},
993+
"202": {
994+
"description": "Storage Target creation or update has been initiated. Poll the new Storage Target's provisioningState property to monitor creation progress.",
995+
"schema": {
996+
"$ref": "#/definitions/StorageTarget"
997+
}
998+
},
987999
"default": {
9881000
"description": "Error response describing why the operation failed.",
9891001
"schema": {
@@ -1087,12 +1099,44 @@
10871099
"resource": {
10881100
"description": "Resource on which the operation is performed: Cache, etc.",
10891101
"type": "string"
1102+
},
1103+
"description": {
1104+
"description": "The description of the operation",
1105+
"type": "string"
10901106
}
10911107
}
10921108
},
1109+
"origin": {
1110+
"description": "Origin of the operation.",
1111+
"type": "string"
1112+
},
1113+
"isDataAction": {
1114+
"description": "The flag that indicates whether the operation applies to data plane.",
1115+
"type": "boolean"
1116+
},
10931117
"name": {
10941118
"description": "Operation name: {provider}/{resource}/{operation}",
10951119
"type": "string"
1120+
},
1121+
"properties": {
1122+
"x-ms-client-flatten": true,
1123+
"description": "Additional details about an operation.",
1124+
"type": "object",
1125+
"properties": {
1126+
"serviceSpecification": {
1127+
"type": "object",
1128+
"description": "Specification of the all the metrics provided for a resource type.",
1129+
"properties": {
1130+
"metricSpecifications": {
1131+
"description": "Details about operations related to metrics.",
1132+
"type": "array",
1133+
"items": {
1134+
"$ref": "#/definitions/MetricSpecification"
1135+
}
1136+
}
1137+
}
1138+
}
1139+
}
10961140
}
10971141
},
10981142
"type": "object"
@@ -1225,6 +1269,11 @@
12251269
"$ref": "#/definitions/CacheIdentity",
12261270
"description": "The identity of the cache, if configured."
12271271
},
1272+
"systemData": {
1273+
"readOnly": true,
1274+
"description": "The system meta data relating to this resource.",
1275+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
1276+
},
12281277
"properties": {
12291278
"x-ms-client-flatten": true,
12301279
"description": "Properties of the Cache.",
@@ -1513,6 +1562,16 @@
15131562
"description": "Type of the Storage Target; Microsoft.StorageCache/Cache/StorageTarget",
15141563
"readOnly": true,
15151564
"type": "string"
1565+
},
1566+
"location": {
1567+
"description": "Region name string.",
1568+
"readOnly": true,
1569+
"type": "string"
1570+
},
1571+
"systemData": {
1572+
"readOnly": true,
1573+
"description": "The system meta data relating to this resource.",
1574+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
15161575
}
15171576
},
15181577
"x-ms-azure-resource": true
@@ -1843,6 +1902,85 @@
18431902
}
18441903
},
18451904
"type": "object"
1905+
},
1906+
"MetricSpecification": {
1907+
"type": "object",
1908+
"description": "Details about operation related to metrics.",
1909+
"properties": {
1910+
"name": {
1911+
"type": "string",
1912+
"description": "The name of the metric."
1913+
},
1914+
"displayName": {
1915+
"type": "string",
1916+
"description": "Localized display name of the metric."
1917+
},
1918+
"displayDescription": {
1919+
"type": "string",
1920+
"description": "The description of the metric."
1921+
},
1922+
"unit": {
1923+
"type": "string",
1924+
"description": "The unit that the metric is measured in."
1925+
},
1926+
"aggregationType": {
1927+
"type": "string",
1928+
"description": "The type of metric aggregation."
1929+
},
1930+
"supportedAggregationTypes": {
1931+
"description": "Support metric aggregation type.",
1932+
"type": "array",
1933+
"items": {
1934+
"enum": [
1935+
"NotSpecified",
1936+
"None",
1937+
"Average",
1938+
"Minimum",
1939+
"Maximum",
1940+
"Total",
1941+
"Count"
1942+
],
1943+
"type": "string",
1944+
"x-ms-enum": {
1945+
"name": "MetricAggregationType",
1946+
"modelAsString": true
1947+
}
1948+
}
1949+
},
1950+
"metricClass": {
1951+
"description": "Type of metrics.",
1952+
"type": "string"
1953+
},
1954+
"dimensions": {
1955+
"description": "Dimensions of the metric",
1956+
"type": "array",
1957+
"items": {
1958+
"$ref": "#/definitions/MetricDimension"
1959+
}
1960+
}
1961+
}
1962+
},
1963+
"MetricDimension": {
1964+
"type": "object",
1965+
"description": "Specifications of the Dimension of metrics.",
1966+
"properties": {
1967+
"name": {
1968+
"type": "string",
1969+
"description": "Name of the dimension"
1970+
},
1971+
"displayName": {
1972+
"type": "string",
1973+
"description": "Localized friendly display name of the dimension"
1974+
},
1975+
"internalName": {
1976+
"type": "string",
1977+
"description": "Internal name of the dimension."
1978+
},
1979+
"toBeExportedForShoebox": {
1980+
"description": "To be exported to shoe box.",
1981+
"type": "boolean"
1982+
}
1983+
}
18461984
}
18471985
},
18481986
"parameters": {

0 commit comments

Comments
 (0)