From c2973b5a115df53f1e6a608b038e1dd00c1c1468 Mon Sep 17 00:00:00 2001 From: Janvi Jatakia Date: Tue, 1 Aug 2023 21:05:13 -0700 Subject: [PATCH] Changes for unified azuremonitorprofile in Microsoft.ContainerService (#25063) * Changes for unified azuremonitorprofile * Update prettier changes * Update specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json Co-authored-by: FumingZhang <81607949+FumingZhang@users.noreply.github.com> * Update specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json Co-authored-by: FumingZhang <81607949+FumingZhang@users.noreply.github.com> --------- Co-authored-by: Janvi Jatakia (from Dev Box) Co-authored-by: FumingZhang <81607949+FumingZhang@users.noreply.github.com> --- .../2023-07-02-preview/managedClusters.json | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json index 694db2de8391..efaa35a56009 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json @@ -7855,6 +7855,9 @@ "properties": { "metrics": { "$ref": "#/definitions/ManagedClusterAzureMonitorProfileMetrics" + }, + "logs": { + "$ref": "#/definitions/ManagedClusterAzureMonitorProfileLogs" } } }, @@ -7882,6 +7885,9 @@ }, "kubeStateMetrics": { "$ref": "#/definitions/ManagedClusterAzureMonitorProfileKubeStateMetrics" + }, + "appMonitoringOpenTelemetryMetrics": { + "$ref": "#/definitions/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics" } }, "required": [ @@ -8324,6 +8330,73 @@ "description": "Array of AKS supported Kubernetes versions." } } + }, + "ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics": { + "type": "object", + "description": "Application Monitoring Open Telemetry Metrics Profile for Kubernetes Application Container Metrics. Collects OpenTelemetry metrics through auto-instrumentation of the application using Azure Monitor OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.", + "properties": { + "enabled": { + "type": "boolean", + "description": "Indicates if Application Monitoring Open Telemetry Metrics is enabled or not." + } + } + }, + "ManagedClusterAzureMonitorProfileLogs": { + "type": "object", + "description": "Logs profile for the Azure Monitor Infrastructure and Application Logs. Collect out-of-the-box Kubernetes infrastructure & application logs to send to Azure Monitor. See aka.ms/AzureMonitorContainerInsights for an overview.", + "properties": { + "containerInsights": { + "$ref": "#/definitions/ManagedClusterAzureMonitorProfileContainerInsights" + }, + "appMonitoring": { + "$ref": "#/definitions/ManagedClusterAzureMonitorProfileAppMonitoring" + } + } + }, + "ManagedClusterAzureMonitorProfileContainerInsights": { + "type": "object", + "description": "Azure Monitor Container Insights Profile for Kubernetes Events, Inventory and Container stdout & stderr logs etc. See aka.ms/AzureMonitorContainerInsights for an overview.", + "properties": { + "enabled": { + "type": "boolean", + "description": "Indicates if Azure Monitor Container Insights Logs Addon is enabled or not." + }, + "logAnalyticsWorkspaceResourceId": { + "type": "string", + "format": "arm-id", + "x-ms-arm-id-details": { + "allowedResources": [ + { + "type": "Microsoft.OperationalInsights/workspaces" + } + ] + }, + "description": "Fully Qualified ARM Resource Id of Azure Log Analytics Workspace for storing Azure Monitor Container Insights Logs." + }, + "windowsHostLogs": { + "$ref": "#/definitions/ManagedClusterAzureMonitorProfileWindowsHostLogs" + } + } + }, + "ManagedClusterAzureMonitorProfileAppMonitoring": { + "type": "object", + "description": "Application Monitoring Profile for Kubernetes Application Container. Collects application logs, metrics and traces through auto-instrumentation of the application using Azure Monitor OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.", + "properties": { + "enabled": { + "type": "boolean", + "description": "Indicates if Application Monitoring enabled or not." + } + } + }, + "ManagedClusterAzureMonitorProfileWindowsHostLogs": { + "type": "object", + "description": "Windows Host Logs Profile for Kubernetes Windows Nodes Log Collection. Collects ETW, Event Logs and Text logs etc. See aka.ms/AzureMonitorContainerInsights for an overview.", + "properties": { + "enabled": { + "type": "boolean", + "description": "Indicates if Windows Host Log Collection is enabled or not for Azure Monitor Container Insights Logs Addon." + } + } } }, "parameters": {