@tonbo/cli 0.25.0 → 0.26.0

package/dist/bin/tonbo.js

@@ -796,6 +796,20 @@ var managementOperations = {
     "idempotencyKey": false,
     "cli": "tonbo metrics streams"
   },
+  "getAccountDatabaseAndStreamMetrics": {
+    "method": "GET",
+    "path": "/metrics/databases-and-streams",
+    "pathParams": [],
+    "query": [
+      "series",
+      "window",
+      "granularity",
+      "from",
+      "to"
+    ],
+    "idempotencyKey": false,
+    "cli": "tonbo metrics databases-and-streams"
+  },
   "listMachineShapes": {
     "method": "GET",
     "path": "/machine-shapes",
@@ -2461,6 +2475,10 @@ var ManagementApi = class {
   getAccountStreamMetrics(key, query = {}) {
     return this.call("getAccountStreamMetrics", key, { query });
   }
+  /** The account's databases and streams together, with one server latency for both. */
+  getAccountDatabaseAndStreamMetrics(key, query = {}) {
+    return this.call("getAccountDatabaseAndStreamMetrics", key, { query });
+  }
   /** The whole usage page: its rows, `other`, prices and checkpoint. */
   listStreamUsage(key, page, query = {}) {
     return this.page("listStreamUsage", key, page, query);
@@ -5414,7 +5432,7 @@ function printAccountRegistryMetrics(deps, noun, metrics, options) {
       "",
       table(
         [
-          noun === "databases" ? "DATABASE" : "STREAM",
+          noun === "databases" ? "DATABASE" : noun === "streams" ? "STREAM" : "NAME",
           "REGION",
           ...sized ? ["STORED"] : [],
           ...counted.map((name) => REGISTRY_COLUMNS[name][0])
@@ -5422,7 +5440,7 @@ function printAccountRegistryMetrics(deps, noun, metrics, options) {
         metrics.resources.map((resource) => {
           const stored = [...resource.points].reverse().find((point) => point.stored_bytes !== null && point.stored_bytes !== void 0);
           return [
-            resource.name,
+            resource.kind ? `${resource.name} (${resource.kind})` : resource.name,
             resource.region,
             ...sized ? [stored ? bytes(stored.stored_bytes ?? 0) : "-"] : [],
             ...counted.map(
@@ -5454,6 +5472,13 @@ async function metricsStreamsCommand(deps, options = {}) {
   );
   printAccountRegistryMetrics(deps, "streams", metrics, options);
 }
+async function metricsDatabasesAndStreamsCommand(deps, options = {}) {
+  const metrics = await deps.api.getAccountDatabaseAndStreamMetrics(
+    await deps.auth.apiKey(),
+    metricsQuery(options)
+  );
+  printAccountRegistryMetrics(deps, "databases and streams", metrics, options);
+}
 function streamFields(stream) {
   return fields([
     ["Name", stream.name],
@@ -7983,6 +8008,16 @@ var COMMAND_HELP = {
     examples: ["tonbo metrics databases --window 30d --series stored_bytes,write_units"],
     defaults: { "--window": "7d" }
   },
+  "tonbo metrics databases-and-streams": {
+    about: [
+      "Prints the account's databases and streams together, per UTC hour or day, summed over every region, with the same series as `tonbo database metrics`: the total's server latency comes from every database's and stream's merged histograms, one figure for both kinds, never an average of percentiles. Server latency is measured at Tonbo's servers, from request to response headers; your network adds to this. Then each one's row over the window, named with its kind.",
+      "Give `--window`, or `--from` and `--to` with `--granularity` (at most 31 days hourly, 92 days daily)."
+    ],
+    examples: [
+      "tonbo metrics databases-and-streams --window 30d --series server_read_latency_p50_ms"
+    ],
+    defaults: { "--window": "7d" }
+  },
   "tonbo metrics streams": {
     about: [
       "Prints the account's streams per UTC hour or day, summed over every region, with the same series as `tonbo stream metrics`: the total's server latency comes from every stream's merged histograms, never an average of percentiles. Server latency is measured at Tonbo's servers, from request to response headers; your network adds to this. Then each stream's row over the window: its stored size at the last measured step and its counts summed.",
@@ -10049,6 +10084,17 @@ function createProgram(makeDependencies = createDependencies) {
     ).option("--granularity <step>", "with --from and --to, hour or day").option("--from <time>", "with --to, the window's start, on a UTC hour or day").option("--to <time>", "with --from, the window's end, exclusive"),
     "getAccountStreamMetrics"
   ).action(async (options) => metricsStreamsCommand(dependencies(), options));
+  operationOptions(
+    metrics.command("databases-and-streams").description(
+      "show the account's databases and streams together, with one server latency for both"
+    ).option("--window <window>", "24h or 7d hourly, 30d or 90d daily; 7d when omitted").option(
+      "--series <series>",
+      "the series to print, comma-separated; every series when omitted"
+    ).option("--granularity <step>", "with --from and --to, hour or day").option("--from <time>", "with --to, the window's start, on a UTC hour or day").option("--to <time>", "with --from, the window's end, exclusive"),
+    "getAccountDatabaseAndStreamMetrics"
+  ).action(
+    async (options) => metricsDatabasesAndStreamsCommand(dependencies(), options)
+  );
   const ssh = program.command("ssh").description("open a terminal on a Machine, or run a command there, over SSH").argument("<machine>", "the Machine's name").argument("[command...]", "a command to run instead of a shell, after --").action(async (name, command) => sshCommand(dependencies(), name, command));
   ssh.command("config").description(
     "print the ssh_config block that lets ssh, scp, sftp and Remote-SSH reach every Machine"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "The Tonbo CLI. Compute, disks, databases and streams for AI agents: your agent picks what it needs, sets it up, and knows what it costs, from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {