nucliadb 6.8.0.post4923__py3-none-any.whl → 6.8.0.post4925__py3-none-any.whl

nucliadb/metrics_exporter.py

@@ -37,6 +37,9 @@ MIGRATION_COUNT = metrics.Gauge("nucliadb_migration", labels={"type": "", "versi
 
 PENDING_RESOURCE_COUNT = metrics.Gauge("nucliadb_pending_resources_count")
 
+KBS_COUNT = metrics.Gauge("nucliadb_kbs_count")
+RESOURCES_COUNT = metrics.Gauge("nucliadb_resources_count")
+
 
 async def iter_kbids(context: ApplicationContext) -> AsyncGenerator[str, None]:
     """
@@ -47,9 +50,11 @@ async def iter_kbids(context: ApplicationContext) -> AsyncGenerator[str, None]:
             yield kbid
 
 
-async def update_migration_metrics(context: ApplicationContext):
+async def update_kb_metrics(context: ApplicationContext):
     """
-    Report the global migration version and the number of KBs per migration version.
+    Report metrics at the kb level:
+      - total number of KBs
+      - the global migration version and the number of KBs per migration version.
     """
     # Clear previoulsy set values so that we report only the current state
     MIGRATION_COUNT.gauge.clear()
@@ -60,12 +65,16 @@ async def update_migration_metrics(context: ApplicationContext):
         MIGRATION_COUNT.set(1, labels=dict(type="global", version=str(global_info.current_version)))
 
     version_count: dict[str, int] = {}
+    n_kbs = 0
     async for kbid in iter_kbids(context):
         kb_info = await mdm.get_kb_info(kbid)
         if kb_info is not None:
             current_version = str(kb_info.current_version)
             version_count.setdefault(current_version, 0)
             version_count[current_version] += 1
+            n_kbs += 1
+
+    KBS_COUNT.set(n_kbs)
 
     for version, count in version_count.items():
         MIGRATION_COUNT.set(count, labels=dict(type="kb", version=version))
@@ -88,6 +97,10 @@ async def update_resource_metrics(context: ApplicationContext):
         count = cast(Tuple[int], await cur.fetchone())[0]
         PENDING_RESOURCE_COUNT.set(count)
 
+        await cur.execute("SELECT COUNT(*) FROM catalog")
+        count = cast(Tuple[int], await cur.fetchone())[0]
+        RESOURCES_COUNT.set(count)
+
 
 async def run_exporter_task(context: ApplicationContext, exporter_task: Callable, interval: int):
     """
@@ -109,7 +122,7 @@ async def run_exporter(context: ApplicationContext):
     # Schedule exporter tasks
     tasks = []
     for export_task, interval in [
-        (update_migration_metrics, 60 * 3),
+        (update_kb_metrics, 60 * 3),
         (update_resource_metrics, 60 * 5),
     ]:
         tasks.append(asyncio.create_task(run_exporter_task(context, export_task, interval=interval)))

{nucliadb-6.8.0.post4923.dist-info → nucliadb-6.8.0.post4925.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.8.0.post4923
+Version: 6.8.0.post4925
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -19,11 +19,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.8.0.post4923
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.8.0.post4923
-Requires-Dist: nucliadb-protos>=6.8.0.post4923
-Requires-Dist: nucliadb-models>=6.8.0.post4923
-Requires-Dist: nidx-protos>=6.8.0.post4923
+Requires-Dist: nucliadb-telemetry[all]>=6.8.0.post4925
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.8.0.post4925
+Requires-Dist: nucliadb-protos>=6.8.0.post4925
+Requires-Dist: nucliadb-models>=6.8.0.post4925
+Requires-Dist: nidx-protos>=6.8.0.post4925
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.47.0
 Requires-Dist: uvicorn[standard]

{nucliadb-6.8.0.post4923.dist-info → nucliadb-6.8.0.post4925.dist-info}/RECORD

@@ -48,7 +48,7 @@ migrations/pg/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/__init__.py,sha256=_abCmDJ_0ku483Os4UAjPX7Nywm39cQgAV_DiyjsKeQ,891
 nucliadb/health.py,sha256=UIxxA4oms4HIsCRZM_SZsdkIZIlgzmOxw-qSHLlWuak,3465
 nucliadb/learning_proxy.py,sha256=ZFCb4sTWGmNE1SNNAF2eJEcFksn1VMW7AD8-vu7o_U4,19294
-nucliadb/metrics_exporter.py,sha256=OG4mHCDY3D89NS62c2mpJpyofS7dOQ1nNf0KW91Mduc,4970
+nucliadb/metrics_exporter.py,sha256=CdfDqKqR-4xMjZxITl6F6mV539iXVsF5ovXCPHjKp40,5341
 nucliadb/openapi.py,sha256=dI5hHSUs2oHf4fd27gGagVltWfjVZPIoVqMtIN04VJk,2290
 nucliadb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb/backups/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
@@ -379,8 +379,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vu1BGg4VqJ_x2P1u2BxqPKlSfw5orT_a3R-Ln5oPUpU,8483
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.8.0.post4923.dist-info/METADATA,sha256=uu_xZtgQQfSR0Hsw2cbBUNslZIUBF1sC3GkGPeJiQkc,4158
-nucliadb-6.8.0.post4923.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb-6.8.0.post4923.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.8.0.post4923.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.8.0.post4923.dist-info/RECORD,,
+nucliadb-6.8.0.post4925.dist-info/METADATA,sha256=Of26ErA1L2l3SsuBlrfG_O1ywcdnjx4K_eXiJvqSbZs,4158
+nucliadb-6.8.0.post4925.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb-6.8.0.post4925.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.8.0.post4925.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.8.0.post4925.dist-info/RECORD,,