Skip to content

Commit

Permalink
fix: remove useless transformations (#567)
Browse files Browse the repository at this point in the history
Co-authored-by: Florent DELAHAYE <florent.delahaye@fr.clara.net>
Co-authored-by: Jean-Baptiste Simillon <jb.simillon@fr.clara.net>
  • Loading branch information
3 people authored Sep 12, 2024
1 parent 1d85e70 commit 283b655
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module: AWS Elasticsearch
name: JVM Memory Pressure

transformation: ".min(over='15m')"
aggregation: true
filtering: "filter('namespace', 'AWS/ES') and filter('stat', 'upper') and filter('NodeId', '*')"
value_unit: "%"
Expand All @@ -15,7 +14,9 @@ rules:
critical:
threshold: 90
comparator: ">"
lasting_duration: "15m"
major:
threshold: 80
comparator: ">"
dependency: critical
lasting_duration: "15m"
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module: AWS Elasticsearch
name: Cluster status

aggregation: ".min(over='15m')"
filtering: "filter('namespace', 'AWS/ES') and filter('stat', 'upper')"

signals:
Expand All @@ -18,8 +17,10 @@ rules:
comparator: ">="
description: "is red"
signal: red
lasting_duration: "15m"
major:
threshold: 1
comparator: ">="
description: "is yellow"
signal: yellow
lasting_duration: "15m"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module: AWS Elasticsearch
id: "cluster_cpu"
name: "CPU utilization"

transformation: ".min(over='45m')"
aggregation: ""
filtering: "filter('namespace', 'AWS/ES') and filter('stat', 'upper') and filter('NodeId', '*')"

Expand All @@ -20,6 +19,8 @@ rules:
threshold: 80
comparator: ">"
dependency: critical
lasting_duration: "45m"
critical:
threshold: 90
comparator: ">"
lasting_duration: "45m"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module: AWS Elasticsearch
id: "master_cpu"
name: "Master CPU utilization"

transformation: ".min(over='20m')"
aggregation: ""
filtering: "filter('namespace', 'AWS/ES') and filter('stat', 'upper') and filter('NodeId', '*')"

Expand All @@ -15,6 +14,8 @@ rules:
threshold: 60
comparator: ">"
dependency: critical
lasting_duration: "20m"
critical:
threshold: 70
comparator: ">"
lasting_duration: "20m"
24 changes: 12 additions & 12 deletions modules/integration_aws-elasticsearch/variables-gen.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ variable "jvm_memory_pressure_aggregation_function" {
variable "jvm_memory_pressure_transformation_function" {
description = "Transformation function for jvm_memory_pressure detector (i.e. \".mean(over='5m')\")"
type = string
default = ".min(over='15m')"
default = ""
}

variable "jvm_memory_pressure_max_delay" {
Expand Down Expand Up @@ -109,7 +109,7 @@ variable "jvm_memory_pressure_threshold_critical" {
variable "jvm_memory_pressure_lasting_duration_critical" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "15m"
}

variable "jvm_memory_pressure_at_least_percentage_critical" {
Expand All @@ -126,7 +126,7 @@ variable "jvm_memory_pressure_threshold_major" {
variable "jvm_memory_pressure_lasting_duration_major" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "15m"
}

variable "jvm_memory_pressure_at_least_percentage_major" {
Expand Down Expand Up @@ -467,7 +467,7 @@ variable "cluster_status_notifications" {
variable "cluster_status_aggregation_function" {
description = "Aggregation function and group by for cluster_status detector (i.e. \".mean(by=['host'])\")"
type = string
default = ".min(over='15m')"
default = ""
}

variable "cluster_status_transformation_function" {
Expand Down Expand Up @@ -521,7 +521,7 @@ variable "cluster_status_threshold_critical" {
variable "cluster_status_lasting_duration_critical" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "15m"
}

variable "cluster_status_at_least_percentage_critical" {
Expand All @@ -538,7 +538,7 @@ variable "cluster_status_threshold_major" {
variable "cluster_status_lasting_duration_major" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "15m"
}

variable "cluster_status_at_least_percentage_major" {
Expand Down Expand Up @@ -725,7 +725,7 @@ variable "cluster_cpu_notifications" {
variable "cluster_cpu_transformation_function" {
description = "Transformation function for cluster_cpu detector (i.e. \".mean(over='5m')\")"
type = string
default = ".min(over='45m')"
default = ""
}

variable "cluster_cpu_max_delay" {
Expand Down Expand Up @@ -773,7 +773,7 @@ variable "cluster_cpu_threshold_major" {
variable "cluster_cpu_lasting_duration_major" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "45m"
}

variable "cluster_cpu_at_least_percentage_major" {
Expand All @@ -790,7 +790,7 @@ variable "cluster_cpu_threshold_critical" {
variable "cluster_cpu_lasting_duration_critical" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "45m"
}

variable "cluster_cpu_at_least_percentage_critical" {
Expand All @@ -809,7 +809,7 @@ variable "master_cpu_notifications" {
variable "master_cpu_transformation_function" {
description = "Transformation function for master_cpu detector (i.e. \".mean(over='5m')\")"
type = string
default = ".min(over='20m')"
default = ""
}

variable "master_cpu_max_delay" {
Expand Down Expand Up @@ -857,7 +857,7 @@ variable "master_cpu_threshold_major" {
variable "master_cpu_lasting_duration_major" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "20m"
}

variable "master_cpu_at_least_percentage_major" {
Expand All @@ -874,7 +874,7 @@ variable "master_cpu_threshold_critical" {
variable "master_cpu_lasting_duration_critical" {
description = "Minimum duration that conditions must be true before raising alert"
type = string
default = null
default = "20m"
}

variable "master_cpu_at_least_percentage_critical" {
Expand Down

0 comments on commit 283b655

Please sign in to comment.