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

Fix policy ksm params #569

Merged
merged 14 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all 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 @@ -8,20 +8,23 @@
},
"azureMonitorWorkspaceLocation": {
"type": "string",
"defaultValue": "",
"metadata": {
"displayName": "Location of the existing Azure Monitor Workspace",
"description": "Location of the existing Azure Monitor Workspace"
}
},
"metricLabelsAllowlist": {
"type": "string",
"defaultValue": "",
"metadata": {
"displayName": "Comma-separated list of additional Kubernetes label keys",
"description": "Comma-separated list of additional Kubernetes label keys that will be used in the resource' labels metric. By default the metric contains only name and namespace labels. To include additional labels provide a list of resource names in their plural form and Kubernetes label keys you would like to allow for them (Example: 'namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...)'. A single '*' can be provided per resource instead to allow any labels, but that has severe performance implications (Example: 'pods=[*]'). Additionally, an asterisk (*) can be provided as a key, which will resolve to all resources, i.e., assuming '--resources=deployments,pods', '*=[*]' will resolve to 'deployments=[*],pods=[*]'"
}
},
"metricAnnotationsAllowList": {
"type": "string",
"defaultValue": "",
"metadata": {
"displayName": "Comma-separated list of Kubernetes annotations keys",
"description": "Comma-separated list of Kubernetes annotations keys that will be used in the resource' annotations metric. By default no annotations are collected. To include additional annotations provide a list of resource names in their plural form and Kubernetes annotation keys you would like to allow for them (Example: 'namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...)'. A single '*' can be provided per resource instead to allow any annotations, but that has severe performance implications (Example: 'pods=[*]')"
Expand Down
6 changes: 4 additions & 2 deletions AddonPolicyTemplate/AddonPolicyMetricsProfile.rules.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@
]
},
"metricLabelsAllowlist": {
"type": "string"
"type": "string",
"defaultValue": ""
},
"metricAnnotationsAllowList": {
"type": "string"
"type": "string",
"defaultValue": ""
},
"enableWindowsRecordingRules": {
"type": "bool"
Expand Down