Skip to content

Commit 4729117

Browse files
JuliehzlJuliehzl
authored
Add new feature GPU and job diagnostics to 2024-03-01 (#27875)
* fix * fix
1 parent 95f2bba commit 4729117

File tree

6 files changed

+331
-0
lines changed

6 files changed

+331
-0
lines changed

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/AvailableWorkloadProfiles.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@
100100
"format": "int32",
101101
"description": "Memory in GiB."
102102
},
103+
"gpus": {
104+
"type": "integer",
105+
"format": "int32",
106+
"description": "Number of GPUs."
107+
},
103108
"displayName": {
104109
"type": "string",
105110
"description": "The everyday name of the workload profile."

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/Diagnostics.json

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,157 @@
432432
}
433433
}
434434
}
435+
},
436+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectors": {
437+
"get": {
438+
"tags": [
439+
"Jobs",
440+
"Diagnostics"
441+
],
442+
"summary": "Get the list of diagnostics for a given Container App Job.",
443+
"description": "Get the list of diagnostics for a Container App Job.",
444+
"operationId": "Jobs_ListDetectors",
445+
"parameters": [
446+
{
447+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
448+
},
449+
{
450+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
451+
},
452+
{
453+
"$ref": "./Jobs.json#/parameters/JobNameParameter"
454+
},
455+
{
456+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
457+
}
458+
],
459+
"responses": {
460+
"200": {
461+
"description": "OK",
462+
"schema": {
463+
"$ref": "#/definitions/DiagnosticsCollection"
464+
}
465+
},
466+
"default": {
467+
"description": "Common error response.",
468+
"schema": {
469+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
470+
}
471+
}
472+
},
473+
"x-ms-examples": {
474+
"Get the list of available diagnostic data for a Container App Job": {
475+
"$ref": "./examples/Job_ListDetectors.json"
476+
}
477+
},
478+
"x-ms-pageable": {
479+
"nextLinkName": "nextLink"
480+
}
481+
}
482+
},
483+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectors/{detectorName}": {
484+
"get": {
485+
"tags": [
486+
"Jobs",
487+
"Diagnostics"
488+
],
489+
"summary": "Get the diagnostics data for a given Container App Job.",
490+
"description": "Get the diagnostics data for a Container App Job.",
491+
"operationId": "Jobs_GetDetector",
492+
"parameters": [
493+
{
494+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
495+
},
496+
{
497+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
498+
},
499+
{
500+
"$ref": "./Jobs.json#/parameters/JobNameParameter"
501+
},
502+
{
503+
"name": "detectorName",
504+
"in": "path",
505+
"description": "Name of the Container App Job detector.",
506+
"required": true,
507+
"type": "string",
508+
"pattern": "^[-\\w\\._\\(\\)]+$"
509+
},
510+
{
511+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
512+
}
513+
],
514+
"responses": {
515+
"200": {
516+
"description": "OK",
517+
"schema": {
518+
"$ref": "#/definitions/Diagnostics"
519+
}
520+
},
521+
"default": {
522+
"description": "Common error response.",
523+
"schema": {
524+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
525+
}
526+
}
527+
},
528+
"x-ms-examples": {
529+
"Get diagnostic data for a Container App Job": {
530+
"$ref": "./examples/Job_GetDetector.json"
531+
}
532+
}
533+
}
534+
},
535+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/{apiName}": {
536+
"get": {
537+
"tags": [
538+
"Jobs",
539+
"Diagnostics"
540+
],
541+
"summary": "Get the properties of a Container App Job.",
542+
"description": "Get the properties of a Container App Job.",
543+
"operationId": "Jobs_ProxyGet",
544+
"parameters": [
545+
{
546+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter"
547+
},
548+
{
549+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
550+
},
551+
{
552+
"$ref": "./Jobs.json#/parameters/JobNameParameter"
553+
},
554+
{
555+
"name": "apiName",
556+
"in": "path",
557+
"description": "Proxy API Name for Container App Job.",
558+
"required": true,
559+
"type": "string",
560+
"pattern": "^[-\\w\\._]+$"
561+
},
562+
{
563+
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
564+
}
565+
],
566+
"responses": {
567+
"200": {
568+
"description": "OK",
569+
"schema": {
570+
"$ref": "./Jobs.json#/definitions/Job"
571+
}
572+
},
573+
"default": {
574+
"description": "Common error response.",
575+
"schema": {
576+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
577+
}
578+
}
579+
},
580+
"x-ms-examples": {
581+
"Get Container App Job by name": {
582+
"$ref": "./examples/Job_ProxyGet.json"
583+
}
584+
}
585+
}
435586
}
436587
},
437588
"definitions": {

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/examples/AvailableWorkloadProfiles_Get.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,20 @@
125125
"name": "Dedicated-F16",
126126
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
127127
},
128+
{
129+
"location": "East US",
130+
"properties": {
131+
"displayName": "Dedicated-NC48-A100",
132+
"category": "GPU-NC-A100",
133+
"applicability": "Custom",
134+
"cores": 48,
135+
"memoryGiB": 440,
136+
"gpus": 2
137+
},
138+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes/NC48-A100",
139+
"name": "NC48-A100",
140+
"type": "Microsoft.App/availableManagedEnvironmentsWorkloadProfileTypes"
141+
},
128142
{
129143
"location": "East US",
130144
"properties": {

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/examples/Job_GetDetector.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "f07f3711-b45e-40fe-a941-4e6d93f851e6",
4+
"resourceGroupName": "mikono-workerapp-test-rg",
5+
"jobName": "mikonojob1",
6+
"detectorName": "containerappjobnetworkIO",
7+
"api-version": "2024-03-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"id": "/subscriptions/f07f3711-b45e-40fe-a941-4e6d93f851e6/resourceGroups/mikono-workerapp-test-rg/providers/Microsoft.App/jobs/mikonojob1/detectors/containerappjobnetworkIO",
14+
"name": "containerappjobnetworkIO",
15+
"type": "Microsoft.App/jobs/detectors",
16+
"properties": {
17+
"metadata": {
18+
"id": "containerappjobnetworkIO",
19+
"name": "Container App Job Network Inbound and Outbound",
20+
"description": "This detector shows the Container App Job Network Inbound and Outbound.",
21+
"author": "",
22+
"category": "Availability and Performance",
23+
"supportTopicList": [],
24+
"type": "Detector",
25+
"score": 0
26+
},
27+
"dataset": [
28+
{
29+
"table": {
30+
"tableName": "",
31+
"columns": [
32+
{
33+
"columnName": "TimeStamp",
34+
"dataType": "DateTime"
35+
},
36+
{
37+
"columnName": "Metric",
38+
"dataType": "String"
39+
},
40+
{
41+
"columnName": "Average",
42+
"dataType": "Double"
43+
}
44+
],
45+
"rows": [
46+
[
47+
"2022-03-15T21:35:00",
48+
"RxBytes",
49+
0
50+
]
51+
]
52+
},
53+
"renderingProperties": {
54+
"type": 8,
55+
"title": "Container App Job Network Inbound ",
56+
"description": "",
57+
"isVisible": true
58+
}
59+
}
60+
],
61+
"status": {
62+
"statusId": 3
63+
}
64+
}
65+
}
66+
}
67+
}
68+
}

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/examples/Job_ListDetectors.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "f07f3711-b45e-40fe-a941-4e6d93f851e6",
4+
"resourceGroupName": "mikono-workerapp-test-rg",
5+
"jobName": "mikonojob1",
6+
"api-version": "2024-03-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {},
11+
"body": {
12+
"value": [
13+
{
14+
"id": "/subscriptions/f07f3711-b45e-40fe-a941-4e6d93f851e6/resourceGroups/mikono-workerapp-test-rg/providers/Microsoft.App/jobs/mikonojob1/detectors/cappjobContainerAppAvailabilityMetrics",
15+
"name": "cappjobContainerAppAvailabilityMetrics",
16+
"type": "Microsoft.App/containerapps/detectors",
17+
"properties": {
18+
"metadata": {
19+
"id": "cappjobContainerAppAvailabilityMetrics",
20+
"name": "Availability Metrics for Container App Jobs",
21+
"author": "",
22+
"category": "Availability and Performance",
23+
"supportTopicList": [],
24+
"type": "Analysis",
25+
"score": 0
26+
},
27+
"dataset": [],
28+
"status": {
29+
"statusId": 4
30+
}
31+
}
32+
}
33+
],
34+
"nextLink": null
35+
}
36+
}
37+
}
38+
}

‎specification/app/resource-manager/Microsoft.App/stable/2024-03-01/examples/Job_ProxyGet.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "rg",
5+
"jobName": "testcontainerappsjob0",
6+
"apiName": "rootApi",
7+
"api-version": "2024-03-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/jobs/testcontainerappsjob0/detectorproperties/rootApi",
14+
"name": "testcontainerappsjob0",
15+
"type": "Microsoft.App/jobs",
16+
"location": "East US",
17+
"properties": {
18+
"provisioningState": "Succeeded",
19+
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
20+
"configuration": {
21+
"replicaTimeout": 10,
22+
"replicaRetryLimit": 10,
23+
"manualTriggerConfig": {
24+
"replicaCompletionCount": 1,
25+
"parallelism": 4
26+
},
27+
"triggerType": "Manual"
28+
},
29+
"template": {
30+
"containers": [
31+
{
32+
"image": "repo/testcontainerappsjob0:v4",
33+
"name": "testcontainerappsjob0",
34+
"resources": {
35+
"cpu": 0.5,
36+
"memory": "1Gi"
37+
}
38+
}
39+
],
40+
"initContainers": [
41+
{
42+
"image": "repo/testcontainerappsjob0:v4",
43+
"name": "testinitcontainerAppsJob0",
44+
"resources": {
45+
"cpu": 0.5,
46+
"memory": "1Gi"
47+
}
48+
}
49+
]
50+
}
51+
}
52+
}
53+
}
54+
}
55+
}

0 commit comments

Comments
 (0)