Skip to content

Commit

Permalink
remove azure diagnostic retention settings (#39) (#40)
Browse files Browse the repository at this point in the history
* remove azure diagnostic setting resources

* don't remove the diagnostic setting, only the retention

Co-authored-by: Steven Davidovitz <[email protected]>
  • Loading branch information
Michael Fraenkel and steved authored Sep 1, 2023
1 parent cd41956 commit ff314d5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: check-merge-conflict
- id: end-of-file-fixer
Expand Down
2 changes: 1 addition & 1 deletion .tflint.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugin "azurerm" {
enabled = true
version = "0.18.0"
version = "0.24.0"
source = "github.com/terraform-linters/tflint-ruleset-azurerm"
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Please submit any feature enhancements, bug fixes, or ideas via pull requests or

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.1.2 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.56.0 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |

## Modules

Expand Down Expand Up @@ -84,7 +84,7 @@ No modules.
| <a name="input_additional_node_pools"></a> [additional\_node\_pools](#input\_additional\_node\_pools) | additional node pools | <pre>map(object({<br> enable_node_public_ip = optional(bool, false)<br> vm_size = string<br> zones = list(string)<br> node_labels = map(string)<br> node_os = optional(string, "Linux")<br> node_taints = optional(list(string), [])<br> enable_auto_scaling = optional(bool, true)<br> min_count = optional(number, 0)<br> max_count = number<br> initial_count = optional(number, 0)<br> max_pods = optional(number, 30)<br> os_disk_size_gb = optional(number, 128)<br> }))</pre> | `{}` | no |
| <a name="input_api_server_authorized_ip_ranges"></a> [api\_server\_authorized\_ip\_ranges](#input\_api\_server\_authorized\_ip\_ranges) | The IP ranges to whitelist for incoming traffic to the masters | `list(string)` | n/a | yes |
| <a name="input_cluster_sku_tier"></a> [cluster\_sku\_tier](#input\_cluster\_sku\_tier) | The Domino cluster SKU (defaults to Free) | `string` | `null` | no |
| <a name="input_containers"></a> [containers](#input\_containers) | storage containers to create | <pre>map(object({<br> container_access_type = string<br> }))</pre> | <pre>{<br> "backups": {<br> "container_access_type": "private"<br> }<br>}</pre> | no |
| <a name="input_containers"></a> [containers](#input\_containers) | storage containers to create | <pre>map(object({<br> container_access_type = string<br> }))</pre> | <pre>{<br> "backups": {<br> "container_access_type": "private"<br> },<br> "projects": {<br> "container_access_type": "private"<br> }<br>}</pre> | no |
| <a name="input_deploy_id"></a> [deploy\_id](#input\_deploy\_id) | Domino Deployment ID. | `string` | n/a | yes |
| <a name="input_kubeconfig_output_path"></a> [kubeconfig\_output\_path](#input\_kubeconfig\_output\_path) | kubeconfig path | `string` | n/a | yes |
| <a name="input_kubernetes_version"></a> [kubernetes\_version](#input\_kubernetes\_version) | Optional Kubernetes version to provision. Allows partial input (e.g. 1.18) which is then chosen from azurerm\_kubernetes\_service\_versions. | `string` | `null` | no |
Expand Down
45 changes: 0 additions & 45 deletions monitoring.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,47 +39,22 @@ resource "azurerm_monitor_diagnostic_setting" "control_plane" {

log {
category = "cloud-controller-manager"

retention_policy {
enabled = true
days = 7
}
}

log {
category = "cluster-autoscaler"

retention_policy {
enabled = true
days = 7
}
}

log {
category = "csi-azuredisk-controller"

retention_policy {
enabled = true
days = 7
}
}

log {
category = "csi-azurefile-controller"

retention_policy {
enabled = true
days = 7
}
}

log {
category = "csi-snapshot-controller"

retention_policy {
enabled = true
days = 7
}
}

log {
Expand All @@ -94,11 +69,6 @@ resource "azurerm_monitor_diagnostic_setting" "control_plane" {

log {
category = "kube-apiserver"

retention_policy {
enabled = true
days = 7
}
}


Expand All @@ -124,29 +94,14 @@ resource "azurerm_monitor_diagnostic_setting" "control_plane" {

log {
category = "kube-controller-manager"

retention_policy {
enabled = true
days = 7
}
}

log {
category = "kube-scheduler"

retention_policy {
enabled = true
days = 7
}
}

metric {
category = "AllMetrics"
enabled = false

retention_policy {
enabled = false
days = 0
}
}
}

0 comments on commit ff314d5

Please sign in to comment.