Skip to content

Commit

Permalink
Merge branch 'main' into arc-monitoring
Browse files Browse the repository at this point in the history
  • Loading branch information
erjosito authored Oct 23, 2024
2 parents deaf7f8 + 3b294b2 commit 8536471
Show file tree
Hide file tree
Showing 377 changed files with 125,573 additions and 91,519 deletions.
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ If you wish to make a contribution, please create the proposed changes in a fork

### 1. Adding or modifying Resource Graph queries

When adding Azure Resource Graph queries to existing recommendations using the `graph` key, the query is expected to return (at least) two fields:
When adding Azure Resource Graph queries to existing recommendations using the `graph` key, the query is expected to return the following two fields at a minimum (feel free to included additional columns as needed):

* `id`: ARM ID of the resource being evaluated
* `compliant`: boolean value that indicates whether the resource is compliant or non-compliant with the recommendation
Expand All @@ -58,6 +58,10 @@ where type=='microsoft.containerservice/managedclusters' | extend compliant= isn

It is important for the query to return these two fields for the automation to work such as the bash script and automatic Azure Monitor Workbook generation.

Some tips:
- Use single quotes inside (`'`) of the ARG query string, double quotes (`"`) break the JSON syntax.
- Use the case insensitive comparison operator (`=~`) whenever possible instead of the case-sensitive one (`==`).

#### Microsoft approvers

Specific approvers (at least two individuals) for each checklist are defined in the [CODEOWNERS](./CODEOWNERS) file. Microsoft approvers should verify the correct operation of the proposed ARG query before approving the Pull Request:
Expand Down
18 changes: 9 additions & 9 deletions checklists-ext/appservicewebapps_sg_checklist.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,34 +189,34 @@
"categories": [],
"waf": [
{
"name": "security"
"name": "reliability"
},
{
"name": "Cost"
},
{
"name": "performance"
"name": "Operations"
},
{
"name": "Performance"
"name": "security"
},
{
"name": "operations"
"name": "Performance"
},
{
"name": "Reliability"
},
{
"name": "cost"
"name": "operations"
},
{
"name": "Operations"
"name": "Security"
},
{
"name": "Security"
"name": "performance"
},
{
"name": "reliability"
"name": "cost"
}
],
"yesno": [
Expand Down Expand Up @@ -253,6 +253,6 @@
"name": "App Service Web Apps Service Guide",
"waf": "all",
"state": "preview",
"timestamp": "September 15, 2024"
"timestamp": "October 20, 2024"
}
}
24 changes: 12 additions & 12 deletions checklists-ext/appservicewebapps_sg_checklist.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"waf": "Operaciones"
},
{
"description": "Evite el tiempo de inactividad y los errores. Vuelva rápidamente al último estado bueno conocido si detecta un problema después de un intercambio.",
"description": null,
"guid": "0f0b02b2-941d-45a9-973a-74a01899a16d",
"service": "App Service Web Apps",
"text": "(Plan de App Service) Valide los cambios de la aplicación en la ranura de ensayo antes de intercambiarla por la ranura de producción.",
Expand All @@ -190,7 +190,7 @@
"metadata": {
"name": "App Service Web Apps Service Guide",
"state": "preview",
"timestamp": "September 09, 2024",
"timestamp": "October 01, 2024",
"waf": "all"
},
"status": [
Expand All @@ -217,34 +217,34 @@
],
"waf": [
{
"name": "Costar"
"name": "Rendimiento"
},
{
"name": "Operaciones"
"name": "seguridad"
},
{
"name": "Operaciones"
"name": "rendimiento"
},
{
"name": "Rendimiento"
"name": "Costar"
},
{
"name": "rendimiento"
"name": "Fiabilidad"
},
{
"name": "Seguridad"
"name": "Operaciones"
},
{
"name": "fiabilidad"
"name": "Operaciones"
},
{
"name": "costar"
"name": "fiabilidad"
},
{
"name": "Fiabilidad"
"name": "Seguridad"
},
{
"name": "seguridad"
"name": "costar"
}
],
"yesno": [
Expand Down
20 changes: 10 additions & 10 deletions checklists-ext/appservicewebapps_sg_checklist.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"metadata": {
"name": "App Service Web Apps Service Guide",
"state": "preview",
"timestamp": "September 09, 2024",
"timestamp": "October 01, 2024",
"waf": "all"
},
"status": [
Expand All @@ -217,34 +217,34 @@
],
"waf": [
{
"name": "費用"
},
{
"name": "オペレーションズ"
"name": "パフォーマンス"
},
{
"name": "オペレーションズ"
"name": "安全"
},
{
"name": "パフォーマンス"
},
{
"name": "パフォーマンス"
"name": "費用"
},
{
"name": "安全"
"name": "確実"
},
{
"name": "確実"
"name": "オペレーションズ"
},
{
"name": "費用"
"name": "オペレーションズ"
},
{
"name": "確実"
},
{
"name": "安全"
},
{
"name": "費用"
}
],
"yesno": [
Expand Down
20 changes: 10 additions & 10 deletions checklists-ext/appservicewebapps_sg_checklist.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"metadata": {
"name": "App Service Web Apps Service Guide",
"state": "preview",
"timestamp": "September 09, 2024",
"timestamp": "October 01, 2024",
"waf": "all"
},
"status": [
Expand All @@ -217,34 +217,34 @@
],
"waf": [
{
"name": "비용"
},
{
"name": "작업"
"name": "공연"
},
{
"name": "작업"
"name": "안전"
},
{
"name": "공연"
},
{
"name": "공연"
"name": "비용"
},
{
"name": "안전"
"name": "신뢰도"
},
{
"name": "신뢰도"
"name": "작업"
},
{
"name": "비용"
"name": "작업"
},
{
"name": "신뢰도"
},
{
"name": "안전"
},
{
"name": "비용"
}
],
"yesno": [
Expand Down
22 changes: 11 additions & 11 deletions checklists-ext/appservicewebapps_sg_checklist.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"metadata": {
"name": "App Service Web Apps Service Guide",
"state": "preview",
"timestamp": "September 09, 2024",
"timestamp": "October 01, 2024",
"waf": "all"
},
"status": [
Expand All @@ -217,34 +217,34 @@
],
"waf": [
{
"name": "Custar"
"name": "Desempenho"
},
{
"name": "Operações"
"name": "segurança"
},
{
"name": "Operações"
"name": "desempenho"
},
{
"name": "Desempenho"
"name": "Custar"
},
{
"name": "desempenho"
"name": "Fiabilidade"
},
{
"name": "Segurança"
"name": "Operações"
},
{
"name": "fiabilidade"
"name": "Operações"
},
{
"name": "custar"
"name": "fiabilidade"
},
{
"name": "Fiabilidade"
"name": "Segurança"
},
{
"name": "segurança"
"name": "custar"
}
],
"yesno": [
Expand Down
20 changes: 10 additions & 10 deletions checklists-ext/appservicewebapps_sg_checklist.zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"metadata": {
"name": "App Service Web Apps Service Guide",
"state": "preview",
"timestamp": "September 09, 2024",
"timestamp": "October 01, 2024",
"waf": "all"
},
"status": [
Expand All @@ -217,34 +217,34 @@
],
"waf": [
{
"name": "成本"
},
{
"name": "操作"
"name": "性能"
},
{
"name": "操作"
"name": "安全"
},
{
"name": "性能"
},
{
"name": "性能"
"name": "成本"
},
{
"name": "安全"
"name": "可靠性"
},
{
"name": "可靠性"
"name": "操作"
},
{
"name": "成本"
"name": "操作"
},
{
"name": "可靠性"
},
{
"name": "安全"
},
{
"name": "成本"
}
],
"yesno": [
Expand Down
Loading

0 comments on commit 8536471

Please sign in to comment.