Skip to content

Commit

Permalink
feat: update change log
Browse files Browse the repository at this point in the history
  • Loading branch information
@JianLi-Expedia
JianLi-Expedia committed Nov 19, 2024
1 parent eea9763 commit bf83b2d
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 14 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## [7.7.0] - 2024-11-12
### Changed
- Updated the hms namespaces for metrics for both readwrite and readonly.
### Added
- Added following variables:
- `hms_ecs_metrics_readwrite_namespace`
- `hms_ecs_metrics_readonly_namespace`
- `hms_k8s_metrics_readwrite_namespace`
- `hms_k8s_metrics_readonly_namespace`
- `hms_ro_tolerations`

## [7.6.1] - 2024-10-30
### Changed
Expand Down
6 changes: 4 additions & 2 deletions VARIABLES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@
| tcp\_keepalive\_probes | Sets net.ipv4.tcp_keepalive_probes (seconds) | number | `2` | no |
| ecs\_platform\_version | ECS Service Platform Version | `string` | `"LATEST"`
| ecs\_requires\_compatibilities | ECS task definition requires compatibilities. | `list(string)` | `["EC2", "FARGATE"]` | no |
| hms\_readonly\_namespace | ECS readwrite namespace | `string` | `hms_readonly` | no |
| hms\_readwrite\_namespace | ECS readonly namespace | `string` | `hms_readwrite` | no |
| hms\_ecs\_metrics\_readonly\_namespace | ECS readwrite metrics namespace | `string` | `hmsreadonlylegacy` | no |
| hms\_ecs\_metrics\_readwrite\_namespace | ECS readonly metrics namespace | `string` | `hmsreadwritelegacy` | no |
| hms\_k8s\_metrics\_readonly\_namespace | K8s readwrite metrics namespace | `string` | `hms_readonly` | no |
| hms\_k8s\_metrics\_readwrite\_namespace | K8s readonly metrics namespace | `string` | `hms_readwrite` | no |

### apiary_assume_roles

Expand Down
2 changes: 1 addition & 1 deletion k8s-readonly.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "kubernetes_deployment_v1" "apiary_hms_readonly" {
annotations = {
"ad.datadoghq.com/${local.hms_alias}-readonly.check_names" = var.datadog_metrics_enabled ? "[\"prometheus\"]" : null
"ad.datadoghq.com/${local.hms_alias}-readonly.init_configs" = var.datadog_metrics_enabled ? "[{}]" : null
"ad.datadoghq.com/${local.hms_alias}-readonly.instances" = var.datadog_metrics_enabled ? "[{ \"prometheus_url\": \"http://%%host%%:${var.datadog_metrics_port}/actuator/prometheus\", \"namespace\": \"hms_readonly\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_hms_readwrite_readonly)}\" ] , \"type_overrides\": { \"${join("\": \"gauge\",\"", var.datadog_metrics_hms_readwrite_readonly)}\": \"gauge\"} }]" : null
"ad.datadoghq.com/${local.hms_alias}-readonly.instances" = var.datadog_metrics_enabled ? "[{ \"prometheus_url\": \"http://%%host%%:${var.datadog_metrics_port}/actuator/prometheus\", \"namespace\": \"${var.hms_k8s_metrics_readonly_namespace}\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_hms_readwrite_readonly)}\" ] , \"type_overrides\": { \"${join("\": \"gauge\",\"", var.datadog_metrics_hms_readwrite_readonly)}\": \"gauge\"} }]" : null
"iam.amazonaws.com/role" = var.oidc_provider == "" ? aws_iam_role.apiary_hms_readonly.name : null
"prometheus.io/path" = "/metrics"
"prometheus.io/port" = "8080"
Expand Down
2 changes: 1 addition & 1 deletion k8s-readwrite.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "kubernetes_deployment_v1" "apiary_hms_readwrite" {
annotations = {
"ad.datadoghq.com/${local.hms_alias}-readwrite.check_names" = var.datadog_metrics_enabled ? "[\"prometheus\"]" : null
"ad.datadoghq.com/${local.hms_alias}-readwrite.init_configs" = var.datadog_metrics_enabled ? "[{}]" : null
"ad.datadoghq.com/${local.hms_alias}-readwrite.instances" = var.datadog_metrics_enabled ? "[{ \"prometheus_url\": \"http://%%host%%:${var.datadog_metrics_port}/actuator/prometheus\", \"namespace\": \"hms_readwrite\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_hms_readwrite_readonly)}\" ] , \"type_overrides\": { \"${join("\": \"gauge\",\"", var.datadog_metrics_hms_readwrite_readonly)}\": \"gauge\"} }]" : null
"ad.datadoghq.com/${local.hms_alias}-readwrite.instances" = var.datadog_metrics_enabled ? "[{ \"prometheus_url\": \"http://%%host%%:${var.datadog_metrics_port}/actuator/prometheus\", \"namespace\": \"${var.hms_k8s_metrics_readwrite_namespace}\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_hms_readwrite_readonly)}\" ] , \"type_overrides\": { \"${join("\": \"gauge\",\"", var.datadog_metrics_hms_readwrite_readonly)}\": \"gauge\"} }]" : null
"iam.amazonaws.com/role" = var.oidc_provider == "" ? aws_iam_role.apiary_hms_readwrite.name : null
"prometheus.io/path" = "/metrics"
"prometheus.io/port" = "8080"
Expand Down
6 changes: 2 additions & 4 deletions templates.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ locals{
table_param_filter = var.enable_metadata_events ? var.table_param_filter : ""
enable_gluesync = var.enable_gluesync ? "1" : ""
gluedb_prefix = "${local.gluedb_prefix}"
hms_readwrite_namespace = "${var.hms_readwrite_namespace}"
hms_readonly_namespace = "${var.hms_readonly_namespace}"
hms_metrics_namespace = "${var.hms_ecs_metrics_readwrite_namespace}"
ranger_service_name = "${local.instance_alias}-metastore"
ranger_policy_manager_url = "${var.ranger_policy_manager_url}"
ranger_audit_solr_url = "${var.ranger_audit_solr_url}"
Expand Down Expand Up @@ -130,8 +129,7 @@ locals{
tcp_keepalive_time = var.tcp_keepalive_time
tcp_keepalive_intvl = var.tcp_keepalive_intvl
tcp_keepalive_probes = var.tcp_keepalive_probes
hms_readwrite_namespace = var.hms_readwrite_namespace
hms_readonly_namespace = var.hms_readonly_namespace
hms_metrics_namespace = "${var.hms_ecs_metrics_readonly_namespace}"
datadog_metrics_hms_readwrite_readonly = var.datadog_metrics_hms_readwrite_readonly
hms_metrics = local.hms_metrics
hms_metrics_type_overrides = local.hms_metrics_type_overrides
Expand Down
2 changes: 1 addition & 1 deletion templates/apiary-hms-readonly.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}
},
"dockerLabels": {
"com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readonly_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
"com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_metrics_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
"com.datadoghq.ad.check_names": "[\"prometheus\"]",
"com.datadoghq.ad.init_configs": "[{}]"
},
Expand Down
2 changes: 1 addition & 1 deletion templates/apiary-hms-readwrite.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}
},
"dockerLabels": {
"com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readwrite_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
"com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_metrics_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
"com.datadoghq.ad.check_names": "[\"prometheus\"]",
"com.datadoghq.ad.init_configs": "[{}]"
},
Expand Down
19 changes: 15 additions & 4 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,18 +452,29 @@ variable "hms_rw_k8s_pdb_settings" {
}
}

variable "hms_readwrite_namespace" {
variable "hms_ecs_metrics_readwrite_namespace" {
description = "ECS readwrite namespace"
type = string
default = "hms_readwrite_legacy"
default = "hmsreadwritelegacy"
}

variable "hms_readonly_namespace" {
variable "hms_ecs_metrics_readonly_namespace" {
description = "ECS readonly namespace"
type = string
default = "hms_readonly_legacy"
default = "hmsreadonlylegacy"
}

variable "hms_k8s_metrics_readwrite_namespace" {
description = "ECS readwrite namespace"
type = string
default = "hms_readwrite"
}

variable "hms_k8s_metrics_readonly_namespace" {
description = "ECS readonly namespace"
type = string
default = "hms_readonly"
}

variable "hms_rw_node_affinity" {
description = <<EOF
Expand Down

0 comments on commit bf83b2d

Please sign in to comment.