Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for unified azuremonitorprofile in Microsoft.ContainerService #25063

Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7839,6 +7839,9 @@
"properties": {
"metrics": {
"$ref": "#/definitions/ManagedClusterAzureMonitorProfileMetrics"
},
"logs": {
"ref": "#/definitions/ManagedClusterAzureMonitorProfileLogs"
jatakiajanvi12 marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand Down Expand Up @@ -7866,6 +7869,9 @@
},
"kubeStateMetrics": {
"$ref": "#/definitions/ManagedClusterAzureMonitorProfileKubeStateMetrics"
},
"appMonitoringOpenTelemetryMetrics": {
"ref": "#/definitions/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics"
jatakiajanvi12 marked this conversation as resolved.
Show resolved Hide resolved
}
},
"required": [
Expand Down Expand Up @@ -8309,6 +8315,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": {
Expand Down