Merge branch 'master' into docs/fix-typos-in-readme-template

claranet · Nov 13, 2023 · c6f322f · c6f322f
2 parents 8e26630 + ab31981
commit c6f322f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/modules/integration_aws-elb/conf/01-latency.yaml b/modules/integration_aws-elb/conf/01-latency.yaml
@@ -3,7 +3,7 @@ name: backend latency
 
 transformation: true
 aggregation: true
-filtering: "filter('namespace', 'AWS/ApplicationELB')"
+filtering: "filter('namespace', 'AWS/ELB')"
 value_unit: "Second"
 
 signals:

diff --git a/modules/integration_aws-elb/detectors-gen.tf b/modules/integration_aws-elb/detectors-gen.tf
@@ -40,7 +40,7 @@ resource "signalfx_detector" "backend_latency" {
   }
 
   program_text = <<-EOF
-    base_filtering = filter('namespace', 'AWS/ApplicationELB')
+    base_filtering = filter('namespace', 'AWS/ELB')
     signal = data('Latency', filter=base_filtering and filter('stat', 'mean') and (not filter('AvailabilityZone', '*')) and filter('LoadBalancerName', '*') and ${module.filtering.signalflow}, rollup='average', extrapolation='zero')${var.backend_latency_aggregation_function}${var.backend_latency_transformation_function}.publish('signal')
     detect(when(signal > ${var.backend_latency_threshold_critical}, lasting=%{if var.backend_latency_lasting_duration_critical == null}None%{else}'${var.backend_latency_lasting_duration_critical}'%{endif}, at_least=${var.backend_latency_at_least_percentage_critical})).publish('CRIT')
     detect(when(signal > ${var.backend_latency_threshold_major}, lasting=%{if var.backend_latency_lasting_duration_major == null}None%{else}'${var.backend_latency_lasting_duration_major}'%{endif}, at_least=${var.backend_latency_at_least_percentage_major}) and (not when(signal > ${var.backend_latency_threshold_critical}, lasting=%{if var.backend_latency_lasting_duration_critical == null}None%{else}'${var.backend_latency_lasting_duration_critical}'%{endif}, at_least=${var.backend_latency_at_least_percentage_critical}))).publish('MAJOR')

diff --git a/modules/smart-agent_rabbitmq-queue/README.md b/modules/smart-agent_rabbitmq-queue/README.md
@@ -133,6 +133,7 @@ monitors:
       - gauge.queue.messages_unacknowledged
       - counter.queue.message_stats.ack
       - gauge.queue.consumer_utilisation
+      - gauge.queue.messages
 ```
 
 
@@ -148,7 +149,7 @@ parameter to the corresponding monitor configuration:
       - metricNames:
         - '*'
         - '!counter.queue.message_stats.ack'
-        - '!gauge.queue.consumer_use'
+        - '!gauge.queue.consumer_utilisation'
         - '!gauge.queue.messages'
         - '!gauge.queue.messages_ready'
         - '!gauge.queue.messages_unacknowledged'

diff --git a/modules/smart-agent_rabbitmq-queue/conf/04-consumer-use.yaml b/modules/smart-agent_rabbitmq-queue/conf/04-consumer-use.yaml
@@ -10,7 +10,7 @@ signals:
   msg:
     metric: gauge.queue.messages
   signal:
-    metric: gauge.queue.consumer_use
+    metric: gauge.queue.consumer_utilisation
 
 rules:
   critical:

diff --git a/modules/smart-agent_rabbitmq-queue/conf/readme.yaml b/modules/smart-agent_rabbitmq-queue/conf/readme.yaml
@@ -33,6 +33,7 @@ source_doc: |
         - gauge.queue.messages_unacknowledged
         - counter.queue.message_stats.ack
         - gauge.queue.consumer_utilisation
+        - gauge.queue.messages
   ```
 
 notes: |

diff --git a/modules/smart-agent_rabbitmq-queue/detectors-gen.tf b/modules/smart-agent_rabbitmq-queue/detectors-gen.tf
@@ -132,7 +132,7 @@ resource "signalfx_detector" "consumer_use" {
   program_text = <<-EOF
     base_filtering = filter('plugin', 'rabbitmq')
     msg = data('gauge.queue.messages', filter=base_filtering and ${module.filtering.signalflow})${var.consumer_use_aggregation_function}${var.consumer_use_transformation_function}
-    signal = data('gauge.queue.consumer_use', filter=base_filtering and ${module.filtering.signalflow})${var.consumer_use_aggregation_function}${var.consumer_use_transformation_function}.publish('signal')
+    signal = data('gauge.queue.consumer_utilisation', filter=base_filtering and ${module.filtering.signalflow})${var.consumer_use_aggregation_function}${var.consumer_use_transformation_function}.publish('signal')
     detect(when(signal < ${var.consumer_use_threshold_critical}, lasting=%{if var.consumer_use_lasting_duration_critical == null}None%{else}'${var.consumer_use_lasting_duration_critical}'%{endif}, at_least=${var.consumer_use_at_least_percentage_critical}) and when(msg > 0)).publish('CRIT')
     detect(when(signal < ${var.consumer_use_threshold_major}, lasting=%{if var.consumer_use_lasting_duration_major == null}None%{else}'${var.consumer_use_lasting_duration_major}'%{endif}, at_least=${var.consumer_use_at_least_percentage_major}) and when(msg > 0) and (not when(signal < ${var.consumer_use_threshold_critical}, lasting=%{if var.consumer_use_lasting_duration_critical == null}None%{else}'${var.consumer_use_lasting_duration_critical}'%{endif}, at_least=${var.consumer_use_at_least_percentage_critical}) and when(msg > 0))).publish('MAJOR')
 EOF

diff --git a/modules/smart-agent_redis/conf/10-hitrate.yaml b/modules/smart-agent_redis/conf/10-hitrate.yaml
@@ -8,7 +8,7 @@ signals:
     metric: '${var.use_otel_receiver ? "redis.keyspace.hits" : "derive.keyspace_hits"}'
     rollup: delta
   B:
-    metric: '${var.use_otel_receiver ? "redis.keyspace.hits" : "derive.keyspace_hits"}'
+    metric: '${var.use_otel_receiver ? "redis.keyspace.misses" : "derive.keyspace_misses"}'
     rollup: delta
   signal:
     formula: (A/(A+B)).scale(100)

diff --git a/modules/smart-agent_redis/detectors-gen.tf b/modules/smart-agent_redis/detectors-gen.tf
@@ -421,7 +421,7 @@ resource "signalfx_detector" "hitrate" {
 
   program_text = <<-EOF
     A = data('${var.use_otel_receiver ? "redis.keyspace.hits" : "derive.keyspace_hits"}', filter=${module.filtering.signalflow}, rollup='delta')${var.hitrate_aggregation_function}${var.hitrate_transformation_function}
-    B = data('${var.use_otel_receiver ? "redis.keyspace.hits" : "derive.keyspace_hits"}', filter=${module.filtering.signalflow}, rollup='delta')${var.hitrate_aggregation_function}${var.hitrate_transformation_function}
+    B = data('${var.use_otel_receiver ? "redis.keyspace.misses" : "derive.keyspace_misses"}', filter=${module.filtering.signalflow}, rollup='delta')${var.hitrate_aggregation_function}${var.hitrate_transformation_function}
     signal = (A/(A+B)).scale(100).publish('signal')
     detect(when(signal < ${var.hitrate_threshold_critical}, lasting=%{if var.hitrate_lasting_duration_critical == null}None%{else}'${var.hitrate_lasting_duration_critical}'%{endif}, at_least=${var.hitrate_at_least_percentage_critical})).publish('CRIT')
     detect(when(signal < ${var.hitrate_threshold_major}, lasting=%{if var.hitrate_lasting_duration_major == null}None%{else}'${var.hitrate_lasting_duration_major}'%{endif}, at_least=${var.hitrate_at_least_percentage_major}) and (not when(signal < ${var.hitrate_threshold_critical}, lasting=%{if var.hitrate_lasting_duration_critical == null}None%{else}'${var.hitrate_lasting_duration_critical}'%{endif}, at_least=${var.hitrate_at_least_percentage_critical}))).publish('MAJOR')