Skip to content

Commit 837c399

Browse files
ToddKingMSFTToddKingMSFT
authored
[Hub Generated] Review request for Microsoft.Insights to add version stable/2018-01-01 (#14009)
* Fix swagger correctness issues with 2017-05-01-preview metricdefinitions * Fix swagger correctness issues with 2017-05-01-preview metrics API * Fix swagger correctness issues with 2017-12-01-preview metricNamespaces API * Update 2017-12-01-preview metricNamespaces example * Fix swagger correctness issues with 2016-09-01 metricDefinitions API * Fix swagger correctness issues with 2016-09-01 metrics API * Add additional 2018-01-01 metricDefinitions API example Shows additional metric properties like category. * Fix swagger correctness issues with 2018-01-01 metricDefinitions API Fix swagger correctness issues with 2018-01-01 metricDefinitions API Also add an extra example * Fix swagger correctness issues with 2018-01-01 metrics API * Remove extra forward slash from 2016-03-01 metricDefinitions example * Remove extra forward slash from 2016-03-01 metricDefinitions filtered example * Remove forward slash from 2016-09-01 metrics example * Remove forward slash from 2016-09-01 metrics filtered example * Update 2017-05-01-preview example with current values * Update 2017-05-01-preview metric metadata example * Remove isMetadataCustom property from example * Clarified some comments in 2018-01-01 metrics API * Fix example in 2018-01-01 metrics metadata API * Fix example and comments in 2017-05-01-preview metrics API * Update 2017-05-01-preview get metric metradata example * Fix formatting issues with 2017-05-01-preview metrics API * Fix formatting issues with 2017-12-01-preview metricNamespaces API * Fix formatting issues with 2018-01-01 metrics API * Add displayDescription to 2018-01-01 metrics API example
1 parent 5734717 commit 837c399

File tree

17 files changed

+2172
-66
lines changed

17 files changed

+2172
-66
lines changed

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/examples/GetMetric.json‎

Lines changed: 100 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,75 @@
11
{
22
"parameters": {
3-
"resourceUri": "subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default",
4-
"timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
3+
"resourceUri": "d69f0a10-6508-4026-98b0-eff8f6faaade/resourceGroups/quickpulse-int/providers/Microsoft.Storage/storageAccounts/quickpulseintusscdiag/blobServices/default",
4+
"timespan": "2021-04-16T01:00:00.000Z/2021-04-17T02:00:00.000Z",
55
"metric": "BlobCapacity",
66
"$filter": "BlobType eq '*'",
77
"top": "3",
8-
"orderby": "Average asc",
9-
"aggregation": "Average,count",
10-
"interval": "PT1M",
8+
"orderby": "Average desc",
9+
"aggregation": "average,minimum,maximum",
10+
"interval": "PT6H",
1111
"api-version": "2017-05-01-preview"
1212
},
1313
"responses": {
1414
"200": {
1515
"body": {
16-
"cost": 0,
17-
"timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
18-
"interval": "PT1M",
16+
"cost": 1499,
17+
"timespan": "2021-04-16T01:00:00Z/2021-04-17T02:00:00Z",
18+
"interval": "PT6H",
1919
"value": [
2020
{
21-
"id": "/subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity",
21+
"id": "/subscriptions/d69f0a10-6508-4026-98b0-eff8f6faaade/resourceGroups/quickpulse-int/providers/Microsoft.Storage/storageAccounts/quickpulseintusscdiag/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity",
2222
"type": "Microsoft.Insights/metrics",
2323
"name": {
2424
"value": "BlobCapacity",
2525
"localizedValue": "Blob Capacity"
2626
},
27+
"displayDescription": "The amount of storage used by the storage account’s Blob service in bytes.",
2728
"unit": "Bytes",
2829
"timeseries": [
30+
{
31+
"metadatavalues": [
32+
{
33+
"name": {
34+
"value": "blobtype",
35+
"localizedValue": "blobtype"
36+
},
37+
"value": "BlockBlob"
38+
}
39+
],
40+
"data": [
41+
{
42+
"timeStamp": "2021-04-16T01:00:00Z",
43+
"average": 35492299169.0,
44+
"minimum": 35492299169.0,
45+
"maximum": 35492299169.0
46+
},
47+
{
48+
"timeStamp": "2021-04-16T07:00:00Z",
49+
"average": 35492299169.0,
50+
"minimum": 35492299169.0,
51+
"maximum": 35492299169.0
52+
},
53+
{
54+
"timeStamp": "2021-04-16T13:00:00Z",
55+
"average": 35492299169.0,
56+
"minimum": 35492299169.0,
57+
"maximum": 35492299169.0
58+
},
59+
{
60+
"timeStamp": "2021-04-16T19:00:00Z",
61+
"average": 35492299169.0,
62+
"minimum": 35492299169.0,
63+
"maximum": 35492299169.0
64+
},
65+
{
66+
"timeStamp": "2021-04-17T01:00:00Z",
67+
"average": 35492299169.0,
68+
"minimum": 35492299169.0,
69+
"maximum": 35492299169.0
70+
}
71+
]
72+
},
2973
{
3074
"metadatavalues": [
3175
{
@@ -38,21 +82,34 @@
3882
],
3983
"data": [
4084
{
41-
"timeStamp": "2017-04-14T02:20:00Z",
42-
"count": 0.0
85+
"timeStamp": "2021-04-16T01:00:00Z",
86+
"average": 0.0,
87+
"minimum": 0.0,
88+
"maximum": 0.0
89+
},
90+
{
91+
"timeStamp": "2021-04-16T07:00:00Z",
92+
"average": 0.0,
93+
"minimum": 0.0,
94+
"maximum": 0.0
4395
},
4496
{
45-
"timeStamp": "2017-04-14T02:21:00Z",
46-
"count": 0.0
97+
"timeStamp": "2021-04-16T13:00:00Z",
98+
"average": 0.0,
99+
"minimum": 0.0,
100+
"maximum": 0.0
47101
},
48102
{
49-
"timeStamp": "2017-04-14T02:22:00Z",
50-
"count": 0.0
103+
"timeStamp": "2021-04-16T19:00:00Z",
104+
"average": 0.0,
105+
"minimum": 0.0,
106+
"maximum": 0.0
51107
},
52108
{
53-
"timeStamp": "2017-04-14T02:23:00Z",
54-
"count": 1.0,
55-
"average": 0.0
109+
"timeStamp": "2021-04-17T01:00:00Z",
110+
"average": 0.0,
111+
"minimum": 0.0,
112+
"maximum": 0.0
56113
}
57114
]
58115
},
@@ -63,30 +120,44 @@
63120
"value": "blobtype",
64121
"localizedValue": "blobtype"
65122
},
66-
"value": "BlockBlob"
123+
"value": "Azure Data Lake Storage"
67124
}
68125
],
69126
"data": [
70127
{
71-
"timeStamp": "2017-04-14T02:20:00Z",
72-
"count": 0.0
128+
"timeStamp": "2021-04-16T01:00:00Z",
129+
"average": 0.0,
130+
"minimum": 0.0,
131+
"maximum": 0.0
132+
},
133+
{
134+
"timeStamp": "2021-04-16T07:00:00Z",
135+
"average": 0.0,
136+
"minimum": 0.0,
137+
"maximum": 0.0
73138
},
74139
{
75-
"timeStamp": "2017-04-14T02:21:00Z",
76-
"count": 0.0
140+
"timeStamp": "2021-04-16T13:00:00Z",
141+
"average": 0.0,
142+
"minimum": 0.0,
143+
"maximum": 0.0
77144
},
78145
{
79-
"timeStamp": "2017-04-14T02:22:00Z",
80-
"count": 0.0
146+
"timeStamp": "2021-04-16T19:00:00Z",
147+
"average": 0.0,
148+
"minimum": 0.0,
149+
"maximum": 0.0
81150
},
82151
{
83-
"timeStamp": "2017-04-14T02:23:00Z",
84-
"count": 1.0,
85-
"average": 245.0
152+
"timeStamp": "2021-04-17T01:00:00Z",
153+
"average": 0.0,
154+
"minimum": 0.0,
155+
"maximum": 0.0
86156
}
87157
]
88158
}
89-
]
159+
],
160+
"errorCode": "Success"
90161
}
91162
]
92163
}

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/examples/GetMetricMetadata.json‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
{
22
"parameters": {
3-
"timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
4-
"metric": "BlobCapacity",
3+
"timespan": "2021-04-18T22:14:26.647Z/2021-04-19T22:14:26.647Z",
4+
"metric": "BlobCount",
55
"$filter": "BlobType eq '*'",
6-
"top": "3",
7-
"orderby": "Average asc",
8-
"aggregation": "Average,count",
9-
"interval": "PT1M",
106
"resulttype": "metadata",
11-
"resourceUri": "subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default",
7+
"resourceUri": "subscriptions/1f3fa6d2-851c-4a91-9087-1a050f3a9c38/resourceGroups/todking/providers/Microsoft.Storage/storageAccounts/tkfileserv/blobServices/default",
128
"api-version": "2017-05-01-preview"
139
},
1410
"responses": {
1511
"200": {
1612
"body": {
17-
"timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
13+
"timespan": "2021-04-18T22:14:26Z/2021-04-19T22:14:26Z",
14+
"interval": "PT1H",
1815
"value": [
1916
{
20-
"id": "/subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity",
17+
"id": "/subscriptions/1f3fa6d2-851c-4a91-9087-1a050f3a9c38/resourceGroups/todking/providers/Microsoft.Storage/storageAccounts/tkfileserv/blobServices/default/providers/Microsoft.Insights/metrics/BlobCount",
2118
"type": "Microsoft.Insights/metrics",
2219
"name": {
23-
"value": "BlobCapacity",
24-
"localizedValue": "Blob Capacity"
20+
"value": "BlobCount",
21+
"localizedValue": "Blob Count"
2522
},
26-
"unit": "Bytes",
23+
"displayDescription": "The number of blob objects stored in the storage account.",
24+
"unit": "Count",
2725
"timeseries": [
2826
{
2927
"metadatavalues": [
@@ -46,6 +44,17 @@
4644
"value": "PageBlob"
4745
}
4846
]
47+
},
48+
{
49+
"metadatavalues": [
50+
{
51+
"name": {
52+
"value": "blobtype",
53+
"localizedValue": "blobtype"
54+
},
55+
"value": "Azure Data Lake Storage"
56+
}
57+
]
4958
}
5059
]
5160
}

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/metricDefinitions_API.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
},
198198
"Unit": {
199199
"type": "string",
200-
"description": "the unit of the metric.",
200+
"description": "The unit of the metric.",
201201
"enum": [
202202
"Count",
203203
"Bytes",
@@ -207,7 +207,11 @@
207207
"Percent",
208208
"MilliSeconds",
209209
"ByteSeconds",
210-
"Unspecified"
210+
"Unspecified",
211+
"Cores",
212+
"MilliCores",
213+
"NanoCores",
214+
"BitsPerSecond"
211215
],
212216
"x-ms-enum": {
213217
"name": "Unit",
@@ -228,6 +232,14 @@
228232
"$ref": "#/definitions/LocalizableString",
229233
"description": "the name and the display name of the metric, i.e. it is a localizable string."
230234
},
235+
"displayDescription": {
236+
"type": "string",
237+
"description": "Detailed description of this metric."
238+
},
239+
"category": {
240+
"type": "string",
241+
"description": "Custom category name for this metric."
242+
},
231243
"unit": {
232244
"$ref": "#/definitions/Unit",
233245
"description": "the unit of the metric."

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/metrics_API.json‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"value": "CpuTime",
105105
"localizedValue": "CPU Time"
106106
},
107+
"displayDescription": "CPU Time",
107108
"unit": "Seconds",
108109
"timeseries": [
109110
{
@@ -177,7 +178,7 @@
177178
},
178179
"Unit": {
179180
"type": "string",
180-
"description": "the unit of the metric.",
181+
"description": "The unit of the metric.",
181182
"enum": [
182183
"Count",
183184
"Bytes",
@@ -187,7 +188,11 @@
187188
"Percent",
188189
"MilliSeconds",
189190
"ByteSeconds",
190-
"Unspecified"
191+
"Unspecified",
192+
"Cores",
193+
"MilliCores",
194+
"NanoCores",
195+
"BitsPerSecond"
191196
],
192197
"x-ms-enum": {
193198
"name": "Unit",
@@ -266,7 +271,7 @@
266271
"type": "number",
267272
"format": "int32",
268273
"minimum": 0,
269-
"description": "The integer value representing the cost of the query, for data case."
274+
"description": "The integer value representing the relative cost of the query."
270275
},
271276
"timespan": {
272277
"type": "string",
@@ -306,6 +311,14 @@
306311
"$ref": "#/definitions/LocalizableString",
307312
"description": "the name and the display name of the metric, i.e. it is localizable string."
308313
},
314+
"displayDescription": {
315+
"type": "string",
316+
"description": "Detailed description of this metric."
317+
},
318+
"errorCode": {
319+
"type": "string",
320+
"description": "'Success' or the error details on query failures for this metric."
321+
},
309322
"unit": {
310323
"$ref": "#/definitions/Unit",
311324
"description": "the unit of the metric."
@@ -322,6 +335,7 @@
322335
"id",
323336
"type",
324337
"name",
338+
"displayDescription",
325339
"unit",
326340
"timeseries"
327341
],

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2017-12-01-preview/examples/GetMetricNamespaces.json‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
{
22
"parameters": {
3-
"resourceUri": "subscriptions/a252e87d-ec06-45b1-8901-57e613be91b0/resourceGroups/larrytest/providers/Microsoft.DocumentDB/databaseAccounts/larrytestdocdb",
4-
"startTime": "2018-08-31T15:53:00Z",
3+
"resourceUri": "subscriptions/182c901a-129a-4f5d-86e4-cc6b294590a2/resourceGroups/hyr-log/providers/microsoft.insights/components/f1-bill",
4+
"startTime": "2020-08-31T15:53:00Z",
55
"api-version": "2017-12-01-preview"
66
},
77
"responses": {
88
"200": {
99
"body": {
1010
"value": [
1111
{
12-
"id": "/subscriptions/a252e87d-ec06-45b1-8901-57e613be91b0/resourceGroups/larrytest/providers/Microsoft.DocumentDB/databaseAccounts/larrytestdocdb/providers/microsoft.insights/metricNamespaces/Microsoft.DocumentDB-databaseAccounts",
13-
"name": "Microsoft.DocumentDB-databaseAccounts",
12+
"id": "/subscriptions/182c901a-129a-4f5d-86e4-cc6b294590a2/resourceGroups/hyr-log/providers/microsoft.insights/components/f1-bill/providers/microsoft.insights/metricNamespaces/Azure.ApplicationInsights",
13+
"name": "Azure.ApplicationInsights",
1414
"type": "Microsoft.Insights/metricNamespaces",
15+
"classification": "Custom",
1516
"properties": {
16-
"metricNamespaceName": "Microsoft.DocumentDB/databaseAccounts"
17+
"metricNamespaceName": "Azure.ApplicationInsights"
18+
}
19+
},
20+
{
21+
"id": "/subscriptions/182c901a-129a-4f5d-86e4-cc6b294590a2/resourceGroups/hyr-log/providers/microsoft.insights/components/f1-bill/providers/microsoft.insights/metricNamespaces/microsoft.insights-components",
22+
"name": "microsoft.insights-components",
23+
"type": "Microsoft.Insights/metricNamespaces",
24+
"classification": "Platform",
25+
"properties": {
26+
"metricNamespaceName": "microsoft.insights/components"
1727
}
1828
}
1929
]

0 commit comments

Comments
 (0)