Update MQ Stack Metrics

tembo-stacks/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tembo-stacks"
 description = "Tembo Stacks for Postgres"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["tembo.io"]
 edition = "2021"
 license = "Apache-2.0"

tembo-stacks/src/stacks/specs/message_queue.yaml

@@ -60,14 +60,20 @@ extensions:
       - database: postgres
         enabled: true
         version: 1.1.1
+      - database: app
+        enabled: true
+        version: 1.1.1
+      - database: template1
+        enabled: true
+        version: 1.1.1
   - name: pg_partman
     locations:
       - database: postgres
         enabled: true
         version: 4.7.4
 postgres_metrics:
   pgmq:
-      query: select queue_name, queue_length, oldest_msg_age_sec, newest_msg_age_sec, total_messages from pgmq.metrics_all()
+      query: select queue_name, queue_length, oldest_msg_age_sec, newest_msg_age_sec, total_messages, current_database() as datname from pgmq.metrics_all()
       master: true
       metrics:
         - queue_name:
@@ -85,7 +91,11 @@ postgres_metrics:
         - total_messages:
             usage: GAUGE
             description: Total number of messages that have passed into the queue.
+        - datname:
+            usage: "LABEL"
+            description: "Name of current database"
       target_databases:
+        - "*"
         - "postgres"
 postgres_config_engine: mq
 postgres_config:

tembo-stacks/src/stacks/types.rs

@@ -266,7 +266,7 @@ mod tests {
         assert_eq!(mq_metrics.queries.len(), 1);
         assert!(mq_metrics.queries.contains_key("pgmq"));
         assert!(mq_metrics.queries["pgmq"].master);
-        assert_eq!(mq_metrics.queries["pgmq"].metrics.len(), 5);
+        assert_eq!(mq_metrics.queries["pgmq"].metrics.len(), 6);
 
         let mut std = get_stack(StackType::Standard);
         let infra = Infrastructure {