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.

Sign up for GitHub

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(k8s): phase tag #64

Merged
merged 3 commits into from
Feb 19, 2025
Merged

fix(k8s): phase tag #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1120e60
fix(k8s): phase tag
Aohzan Feb 17, 2025
1561cc7
chore: add pod_name
Aohzan Feb 17, 2025
c11d9c9
chore: add pod_name
Aohzan Feb 17, 2025
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
8 changes: 4 additions & 4 deletions caas/kubernetes/pod/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ module "datadog-monitors-caas-kubernetes-pod" {

Creates DataDog monitors with the following checks:

- Kubernetes Pod phase status failed
- Kubernetes Pod {{pod_name}} container {{kube_container_name}} killed by OOM on {{kube_cluster_name}}
- Kubernetes Pod terminated abnormally
- Kubernetes Pod waiting errors
- Kubernetes Pod {{pod_name}} phase status failed
- Kubernetes Pod {{pod_name}} terminated abnormally
- Kubernetes Pod {{pod_name}} waiting errors
- Kubernetes Pods in {{kube_replica_set}} frequently restarted on {{kube_cluster_name}}

<!-- BEGIN_TF_DOCS -->
Expand Down Expand Up @@ -96,7 +96,7 @@ Creates DataDog monitors with the following checks:
| <a name="input_pod_phase_status_message"></a> [pod\_phase\_status\_message](#input\_pod\_phase\_status\_message) | Custom message for Pod phase status monitor | `string` | `""` | no |
| <a name="input_pod_phase_status_time_aggregator"></a> [pod\_phase\_status\_time\_aggregator](#input\_pod\_phase\_status\_time\_aggregator) | Monitor aggregator for Pod phase status [available values: min, max or avg] | `string` | `"max"` | no |
| <a name="input_pod_phase_status_timeframe"></a> [pod\_phase\_status\_timeframe](#input\_pod\_phase\_status\_timeframe) | Monitor timeframe for Pod phase status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | `string` | `"last_5m"` | no |
| <a name="input_pod_status_group_by"></a> [pod\_status\_group\_by](#input\_pod\_status\_group\_by) | Select group by element on monitors (phase status) | `list` | <pre>[<br> "kube_namespace",<br> "kube_cluster_name"<br>]</pre> | no |
| <a name="input_pod_status_group_by"></a> [pod\_status\_group\_by](#input\_pod\_status\_group\_by) | Select group by element on monitors (phase status) | `list` | <pre>[<br> "pod_name",<br> "kube_namespace",<br> "kube_cluster_name"<br>]</pre> | no |
| <a name="input_prefix_slug"></a> [prefix\_slug](#input\_prefix\_slug) | Prefix string to prepend between brackets on every monitors names | `string` | `""` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Global variables | `list(string)` | <pre>[<br> "type:caas",<br> "provider:kubernetes",<br> "resource:kubernetes-pod"<br>]</pre> | no |
| <a name="input_team"></a> [team](#input\_team) | n/a | `string` | `"claranet"` | no |
Expand Down
2 changes: 1 addition & 1 deletion caas/kubernetes/pod/inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,6 @@ variable "pod_group_by" {
}

variable "pod_status_group_by" {
default = ["kube_namespace", "kube_cluster_name"]
default = ["pod_name", "kube_namespace", "kube_cluster_name"]
description = "Select group by element on monitors (phase status)"
}
2 changes: 1 addition & 1 deletion caas/kubernetes/pod/modules.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module "filter-tags-phase" {
filter_tags_custom = var.filter_tags_custom
filter_tags_custom_excluded = var.filter_tags_custom_excluded
filter_tags_separator = var.filter_tags_separator
extra_tags_excluded = ["phase:pending", "phase:running", "phase:succeeded", "phase:unknown"]
extra_tags_excluded = ["pod_phase:pending", "pod_phase:running", "pod_phase:succeeded", "pod_phase:unknown"]
}

module "filter-tags-nocontainercreating" {
Expand Down
6 changes: 3 additions & 3 deletions caas/kubernetes/pod/monitors-k8s-pod.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "datadog_monitor" "pod_phase_status" {
count = var.pod_phase_status_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod phase status failed"
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} phase status failed"
message = coalesce(var.pod_phase_status_message, var.message)
type = "metric alert"

Expand Down Expand Up @@ -29,7 +29,7 @@ EOQ

resource "datadog_monitor" "error" {
count = var.error_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod waiting errors"
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} waiting errors"
message = coalesce(var.error_message, var.message)
type = "query alert"

Expand Down Expand Up @@ -59,7 +59,7 @@ EOQ

resource "datadog_monitor" "terminated" {
count = var.terminated_enabled == "true" ? 1 : 0
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod terminated abnormally"
name = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} terminated abnormally"
message = coalesce(var.terminated_message, var.message)
type = "query alert"

Expand Down
Loading