Merge branch 'main' into fix-app-svc-ing

tembo-io · Dec 19, 2024 · e5353a5 · e5353a5
2 parents 37d82d9 + c83326f
commit e5353a5
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 14 deletions.
diff --git a/conductor/metrics.yml b/conductor/metrics.yml
@@ -37,3 +37,21 @@ metrics:
     sum by (server_name) (
         count_over_time({namespace="traefik"} |= `Connection logging` | json | event = `Connection logging` [1m])
     )
+- name: storage_usage_pct
+  server: prometheus
+  query: |
+    100 * sum by (instance_id, pod) (
+      label_replace(
+        kubelet_volume_stats_used_bytes * on(namespace) group_left(label_tembo_io_instance_id)
+        kube_namespace_labels{label_tembo_io_instance_id!=""},
+        "instance_id", "$1", "label_tembo_io_instance_id", "(.*)"
+      )
+    ) / (
+      sum by (instance_id, pod) (
+        label_replace(
+          kubelet_volume_stats_capacity_bytes * on(namespace) group_left(label_tembo_io_instance_id)
+          kube_namespace_labels{label_tembo_io_instance_id!=""},
+          "instance_id", "$1", "label_tembo_io_instance_id", "(.*)"
+        )
+      )
+    )
diff --git a/conductor/src/metrics_reporter.rs b/conductor/src/metrics_reporter.rs
@@ -181,3 +181,13 @@ impl Client {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::load_metric_queries;
+
+    #[test]
+    fn deserializes_metrics_yaml() {
+        load_metric_queries().unwrap();
+    }
+}
diff --git a/tembo-stacks/Cargo.lock b/tembo-stacks/Cargo.lock
diff --git a/tembo-stacks/Cargo.toml b/tembo-stacks/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tembo-stacks"
 description = "Tembo Stacks for Postgres"
-version = "0.22.0"
+version = "0.22.1"
 authors = ["tembo.io"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/tembo-stacks/src/apps/embeddings.yaml b/tembo-stacks/src/apps/embeddings.yaml
@@ -57,7 +57,7 @@ trunk_installs:
   - name: pg_cron
     version: 1.6.2
   - name: pgmq
-    version: 1.4.2
+    version: 1.5.0
   - name: pgvector
     version: 0.7.4
   - name: vectorize
@@ -74,7 +74,7 @@ extensions:
     locations:
       - database: postgres
         enabled: true
-        version: 1.4.2
+        version: 1.5.0
   - name: vector
     locations:
       - database: postgres

diff --git a/tembo-stacks/src/stacks/specs/machine_learning.yaml b/tembo-stacks/src/stacks/specs/machine_learning.yaml
@@ -32,7 +32,7 @@ trunk_installs:
   - name: pg_cron
     version: 1.6.2
   - name: pgmq
-    version: 1.4.4
+    version: 1.5.0
   - name: vectorize
     version: 0.18.2
   - name: pg_later
@@ -63,7 +63,7 @@ extensions:
     locations:
     - database: postgres
       enabled: true
-      version: 1.4.4
+      version: 1.5.0
   - name: vectorize
     locations:
     - database: postgres

diff --git a/tembo-stacks/src/stacks/specs/message_queue.yaml b/tembo-stacks/src/stacks/specs/message_queue.yaml
@@ -52,7 +52,7 @@ appServices:
         memory: 100Mi
 trunk_installs:
   - name: pgmq
-    version: 1.4.4
+    version: 1.5.0
   - name: pg_partman
     version: 5.0.1
   - name: parquet_s3_fdw
@@ -64,13 +64,13 @@ extensions:
     locations:
       - database: postgres
         enabled: true
-        version: 1.4.4
+        version: 1.5.0
       - database: app
         enabled: true
-        version: 1.4.4
+        version: 1.5.0
       - database: template1
         enabled: true
-        version: 1.4.4
+        version: 1.5.0
   - name: pg_partman
     locations:
       - database: postgres

diff --git a/tembo-stacks/src/stacks/specs/paradedb.yaml b/tembo-stacks/src/stacks/specs/paradedb.yaml
@@ -34,7 +34,7 @@ trunk_installs:
   - name: pg_analytics
     version: 0.2.1
   - name: pg_search
-    version: 0.13.0
+    version: 0.13.2
   - name: pg_cron
     version: 1.6.2
   - name: pgvector
@@ -51,7 +51,7 @@ extensions:
     locations:
       - database: postgres
         enabled: true
-        version: 0.13.0
+        version: 0.13.2
   - name: vector
     locations:
       - database: postgres

diff --git a/tembo-stacks/src/stacks/specs/vectordb.yaml b/tembo-stacks/src/stacks/specs/vectordb.yaml
@@ -64,7 +64,7 @@ appServices:
         initialDelaySeconds: 10
 trunk_installs:
   - name: pgmq
-    version: 1.4.4
+    version: 1.5.0
   - name: vectorize
     version: 0.19.1
   - name: pgvector
@@ -88,7 +88,7 @@ extensions:
     locations:
     - database: postgres
       enabled: true
-      version: 1.4.4
+      version: 1.5.0
   - name: vectorize
     locations:
     - database: postgres