diff --git a/terraform/monitoring/panels/app/publishing_workers_count.libsonnet b/terraform/monitoring/panels/app/publishing_workers_count.libsonnet index c24aa8ba..e0fdab78 100644 --- a/terraform/monitoring/panels/app/publishing_workers_count.libsonnet +++ b/terraform/monitoring/panels/app/publishing_workers_count.libsonnet @@ -12,9 +12,8 @@ local targets = grafana.targets; ) .configure(defaults.configuration.timeseries) .addTarget(targets.prometheus( - datasource = ds.prometheus, - expr = 'publishing_workers_count', - legendFormat = 'Running workers', - refId = "pub_workers_count", + datasource = ds.prometheus, + expr = 'publishing_workers_count', + legendFormat = 'r{{aws_ecs_task_revision}}', )) } diff --git a/terraform/monitoring/panels/app/publishing_workers_errors.libsonnet b/terraform/monitoring/panels/app/publishing_workers_errors.libsonnet index dc5eb347..5c604372 100644 --- a/terraform/monitoring/panels/app/publishing_workers_errors.libsonnet +++ b/terraform/monitoring/panels/app/publishing_workers_errors.libsonnet @@ -12,8 +12,8 @@ local targets = grafana.targets; ) .configure(defaults.configuration.timeseries) .addTarget(targets.prometheus( - datasource = ds.prometheus, - expr = 'sum(rate(publishing_workers_errors_total{}[$__rate_interval]))', - refId = "availability", + datasource = ds.prometheus, + expr = 'rate(publishing_workers_errors_total{}[$__rate_interval])', + legendFormat = 'r{{aws_ecs_task_revision}}', )) } diff --git a/terraform/monitoring/panels/app/publishing_workers_processing_size.libsonnet b/terraform/monitoring/panels/app/publishing_workers_processing_size.libsonnet index dee86a9f..b88addf4 100644 --- a/terraform/monitoring/panels/app/publishing_workers_processing_size.libsonnet +++ b/terraform/monitoring/panels/app/publishing_workers_processing_size.libsonnet @@ -12,8 +12,8 @@ local targets = grafana.targets; ) .configure(defaults.configuration.timeseries) .addTarget(targets.prometheus( - datasource = ds.prometheus, - expr = 'sum(publishing_queue_processing_size{})', - refId = "pub_processing_size", + datasource = ds.prometheus, + expr = 'publishing_queue_processing_size', + legendFormat = "r{{aws_ecs_task_revision}}" )) } diff --git a/terraform/monitoring/panels/app/publishing_workers_published_count.libsonnet b/terraform/monitoring/panels/app/publishing_workers_published_count.libsonnet index 0f880ea2..6ca021e1 100644 --- a/terraform/monitoring/panels/app/publishing_workers_published_count.libsonnet +++ b/terraform/monitoring/panels/app/publishing_workers_published_count.libsonnet @@ -12,8 +12,8 @@ local targets = grafana.targets; ) .configure(defaults.configuration.timeseries) .addTarget(targets.prometheus( - datasource = ds.prometheus, - expr = 'sum(rate(publishing_queue_published_count_total{}[$__rate_interval]))', - refId = "pub_published_count", + datasource = ds.prometheus, + expr = 'rate(publishing_queue_published_count_total{}[$__rate_interval])', + legendFormat = "r{{aws_ecs_task_revision}}" )) } diff --git a/terraform/monitoring/panels/app/publishing_workers_queued_size.libsonnet b/terraform/monitoring/panels/app/publishing_workers_queued_size.libsonnet index a1fb1621..0f9a2af9 100644 --- a/terraform/monitoring/panels/app/publishing_workers_queued_size.libsonnet +++ b/terraform/monitoring/panels/app/publishing_workers_queued_size.libsonnet @@ -12,8 +12,8 @@ local targets = grafana.targets; ) .configure(defaults.configuration.timeseries) .addTarget(targets.prometheus( - datasource = ds.prometheus, - expr = 'sum(publishing_queue_queued_size{})', - refId = "pub_msgs_queue_size", + datasource = ds.prometheus, + expr = 'publishing_queue_queued_size', + legendFormat = "r{{aws_ecs_task_revision}}" )) }