Convert integration AWS ES to gen (+ improve rules in gen format)

docs/severity.md

@@ -266,7 +266,7 @@
 |AWS ElastiCache evictions|X|X|-|-|-|
 |AWS ElastiCache connections over max allowed|X|-|-|-|-|
 |AWS ElastiCache current connections|X|-|-|-|-|
-|AWS ElastiCache swap|X|X|-|-|-|
+|AWS ElastiCache swap usage|X|X|-|-|-|
 |AWS ElastiCache freeable memory|-|X|X|-|-|
 |AWS ElastiCache evictions changing rate grows|X|X|-|-|-|
 
@@ -294,16 +294,16 @@
 
 |Detector|Critical|Major|Minor|Warning|Info|
 |---|---|---|---|---|---|
-|AWS ElasticSearch heartbeat|X|-|-|-|-|
-|AWS ElasticSearch cluster status|X|X|-|-|-|
-|AWS ElasticSearch cluster free storage space|X|X|-|-|-|
-|AWS ElasticSearch cluster UltraWarm free storage space|X|X|-|-|-|
-|AWS ElasticSearch cluster CPU|X|X|-|-|-|
-|AWS ElasticSearch cluster Master nodes CPU|X|X|-|-|-|
+|AWS Elasticsearch heartbeat|X|-|-|-|-|
 |AWS Elasticsearch jvm memory pressure|X|X|-|-|-|
 |AWS Elasticsearch 4xx http response|X|X|-|-|-|
 |AWS Elasticsearch 5xx http response|X|X|-|-|-|
 |AWS Elasticsearch shard count|X|X|-|-|-|
+|AWS Elasticsearch cluster status|X|X|-|-|-|
+|AWS Elasticsearch free storage space|X|X|-|-|-|
+|AWS Elasticsearch ultrawarm free storage space|X|X|-|-|-|
+|AWS Elasticsearch cpu utilization|X|X|-|-|-|
+|AWS Elasticsearch master cpu utilization|X|X|-|-|-|
 
 
 ## integration_aws-elb

modules/integration_aws-elasticache-common/README.md

@@ -57,7 +57,7 @@ Note the following parameters:
 
 These 3 parameters along with all variables defined in [common-variables.tf](common-variables.tf) are common to all
 [modules](../) in this repository. Other variables, specific to this module, are available in
-[variables.tf](variables.tf).
+[variables-gen.tf](variables-gen.tf).
 In general, the default configuration "works" but all of these Terraform
 [variables](https://www.terraform.io/language/values/variables) make it possible to
 customize the detectors behavior to better fit your needs.
@@ -79,7 +79,7 @@ This module creates the following SignalFx detectors which could contain one or
 |AWS ElastiCache evictions|X|X|-|-|-|
 |AWS ElastiCache connections over max allowed|X|-|-|-|-|
 |AWS ElastiCache current connections|X|-|-|-|-|
-|AWS ElastiCache swap|X|X|-|-|-|
+|AWS ElastiCache swap usage|X|X|-|-|-|
 |AWS ElastiCache freeable memory|-|X|X|-|-|
 |AWS ElastiCache evictions changing rate grows|X|X|-|-|-|
 

modules/integration_aws-elasticache-common/conf/00-heartbeat.yaml

@@ -0,0 +1,12 @@
+module: AWS ElastiCache
+name: heartbeat
+
+transformation: false
+aggregation: ".mean(by=['CacheClusterId'])"
+filtering: "filter('stat', 'mean') and filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: CPUUtilization
+rules:
+ critical:

modules/integration_aws-elasticache-common/conf/01-evictions.yaml

@@ -0,0 +1,21 @@
+module: AWS ElastiCache
+name: "Evictions"
+
+transformation: ".sum(over='15m')"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "Evictions"
+ filter: "filter('stat', 'mean') and filter('CacheNodeId', '*')"
+
+rules:
+ major:
+ threshold: 0
+ comparator: ">"
+ dependency: critical
+ critical:
+ threshold: 30
+ comparator: ">"

modules/integration_aws-elasticache-common/conf/02-max-connection.yaml

@@ -0,0 +1,18 @@
+module: AWS ElastiCache
+id: "max_connection"
+name: "Connections over max allowed"
+
+transformation: ".max(over='5m')"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "CurrConnections"
+ filter: "filter('stat', 'upper') and filter('CacheNodeId', '*')"
+
+rules:
+ critical:
+ threshold: 64999
+ comparator: ">"

modules/integration_aws-elasticache-common/conf/03-current-connection.yaml

@@ -0,0 +1,18 @@
+module: AWS ElastiCache
+id: "no_connection"
+name: "Current connections"
+
+transformation: ".min(over='5m')"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "CurrConnections"
+ filter: "filter('stat', 'lower') and filter('CacheNodeId', '*')"
+
+rules:
+ critical:
+ threshold: 0
+ comparator: "<="

modules/integration_aws-elasticache-common/conf/04-swap.yaml

@@ -0,0 +1,22 @@
+module: AWS ElastiCache
+id: "swap"
+name: "Swap usage"
+
+transformation: ".min(over='5m')"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "SwapUsage"
+ filter: "filter('stat', 'upper') and filter('CacheNodeId', '*')"
+
+rules:
+ major:
+ threshold: 0
+ comparator: ">"
+ dependency: critical
+ critical:
+ threshold: 50000000
+ comparator: ">"

modules/integration_aws-elasticache-common/conf/05-free-memory.yaml

@@ -0,0 +1,22 @@
+module: AWS ElastiCache
+id: "free_memory"
+name: "Freeable memory"
+
+transformation: ".rateofchange().mean(over='15m')"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "FreeableMemory"
+ filter: "filter('stat', 'lower') and filter('CacheNodeId', '*')"
+
+rules:
+ minor:
+ threshold: -50
+ comparator: "<"
+ dependency: major
+ major:
+ threshold: -70
+ comparator: "<"

modules/integration_aws-elasticache-common/conf/06-evictions-growing.yaml

@@ -0,0 +1,22 @@
+module: AWS ElastiCache
+id: "evictions_growing"
+name: "Evictions changing rate grows"
+
+transformation: ".mean(over='5m').rateofchange().scale(100)"
+aggregation: true
+
+filtering: "filter('namespace', 'AWS/ElastiCache')"
+
+signals:
+ signal:
+ metric: "Evictions"
+ filter: "filter('stat', 'mean') and filter('CacheNodeId', '*')"
+
+rules:
+ major:
+ threshold: 10
+ comparator: ">"
+ dependency: critical
+ critical:
+ threshold: 30
+ comparator: ">"