@tonbo/cli 0.24.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",
@@ -1062,6 +1076,22 @@ var managementOperations = {
     "idempotencyKey": false,
     "cli": "tonbo volume delete"
   },
+  "getVolumeNameMetrics": {
+    "method": "GET",
+    "path": "/volumes/{name}/metrics",
+    "pathParams": [
+      "name"
+    ],
+    "query": [
+      "series",
+      "window",
+      "granularity",
+      "from",
+      "to"
+    ],
+    "idempotencyKey": false,
+    "cli": "tonbo volume metrics"
+  },
   "listStreams": {
     "method": "GET",
     "path": "/streams",
@@ -2445,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);
@@ -2459,6 +2493,10 @@ var ManagementApi = class {
   getVolumeMetrics(key, query = {}) {
     return this.call("getVolumeMetrics", key, { query });
   }
+  /** One Volume's guest I/O and stored bytes per UTC hour or day. */
+  getVolumeNameMetrics(key, name, query = {}) {
+    return this.call("getVolumeNameMetrics", key, { params: { name }, query });
+  }
   /** The account's writes of yesterday and today, hourly, per lane. */
   getUsageToday(key) {
     return this.call("getUsageToday", key);
@@ -5394,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])
@@ -5402,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(
@@ -5434,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],
@@ -5609,14 +5654,14 @@ async function metricsVolumesCommand(deps, options = {}) {
       ["DAY", "STORED", ""],
       points.map((point) => [
         point.start.slice(0, 10),
-        bytes(point.stored_bytes),
+        bytes(point.stored_bytes ?? 0),
         point.partial ? "so far" : ""
       ])
     )
   ];
   const complete = points.filter((point) => !point.partial);
   if (complete.length > 1) {
-    const change = complete[complete.length - 1].stored_bytes - complete[0].stored_bytes;
+    const change = (complete[complete.length - 1].stored_bytes ?? 0) - (complete[0].stored_bytes ?? 0);
     lines.push(
       `Change over its complete days: ${change < 0 ? "-" : "+"}${bytes(Math.abs(change))}`
     );
@@ -6009,6 +6054,44 @@ async function resolveVolumeBinding(deps, key, spec) {
     region: volume.region
   };
 }
+var VOLUME_COLUMNS = {
+  stored_bytes: ["STORED", (value) => bytes(value)],
+  read_bytes: ["READ", (value) => bytes(value)],
+  write_bytes: ["WRITTEN", (value) => bytes(value)],
+  read_ops: ["READ OPS", String],
+  write_ops: ["WRITE OPS", String],
+  trim_ops: ["TRIMS", String]
+};
+async function volumeMetricsCommand(deps, name, options = {}) {
+  const metrics = await deps.api.getVolumeNameMetrics(
+    await deps.auth.apiKey(),
+    name,
+    metricsQuery(options)
+  );
+  const series = Object.keys(VOLUME_COLUMNS).filter(
+    (key) => metrics.points.some((point) => key in point)
+  );
+  const hourly = metrics.granularity === "hour";
+  print(
+    deps,
+    options.json,
+    metrics,
+    [
+      `Volume ${metrics.name} in ${metrics.region} from ${metrics.from} to ${metrics.to} (UTC)`,
+      table(
+        [hourly ? "HOUR (UTC)" : "DAY (UTC)", ...series.map((key) => VOLUME_COLUMNS[key][0]), ""],
+        metrics.points.map((point) => [
+          hourly ? point.start.slice(0, 16).replace("T", " ") : point.start.slice(0, 10),
+          ...series.map((key) => {
+            const value = point[key];
+            return value === null || value === void 0 ? "-" : VOLUME_COLUMNS[key][1](value);
+          }),
+          point.partial ? "so far" : ""
+        ])
+      )
+    ].join("\n")
+  );
+}
 
 // src/machine.ts
 var MACHINE_ERROR_HINTS = {
@@ -7866,6 +7949,18 @@ var COMMAND_HELP = {
     examples: ["tonbo volume show data"],
     arguments: NAME("Volume")
   },
+  "tonbo volume metrics": {
+    about: [
+      "Prints the Volume's metrics, one row per UTC hour or day: the bytes and requests its Machine read, wrote and trimmed, as the Volume served them, and what its files held at the step's last sample, compressed. The I/O updates about every 30 seconds while the Volume is attached; the current step is marked `so far`.",
+      "Give `--window` (24h hourly; 7d, 30d or 90d daily, 7d also hourly with `--granularity hour`), or `--from` and `--to` with `--granularity` (at most 8 days hourly, 92 days daily). `--series` prints only the series it names. It carries no money: `tonbo usage show` says what the Volume cost."
+    ],
+    examples: [
+      "tonbo volume metrics data --window 24h",
+      "tonbo volume metrics data --series read_bytes,write_bytes --window 7d"
+    ],
+    arguments: NAME("Volume"),
+    defaults: { "--window": "30d" }
+  },
   "tonbo volume move": {
     about: [
       "Moves the Volume to the Machine `--to`, taking it from the Machine that has it now in one write: the Volume is unbound there (that Machine's ETag changes and it boots without it) and bound to `--to`, which may be awake and gets it at its next boot. The CLI reads both Machines' ETags first, so a Machine changed since is refused, never overwritten. Without `--path` the Volume keeps the path it has now, or stays a whole disk; a whole disk moves only to a Machine on the same image.",
@@ -7913,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.",
@@ -9900,6 +10005,17 @@ function createProgram(makeDependencies = createDependencies) {
   ).action(
     async (name, options) => volumeShowCommand(dependencies(), name, options)
   );
+  operationOptions(
+    volume.command("metrics <name>").description(
+      "show what a Volume's Machine read, wrote and trimmed, and what it held, over time"
+    ).option("--window <window>", "24h hourly, or 7d, 30d or 90d daily; 30d when omitted").option(
+      "--series <series>",
+      "the series to print, comma-separated; every series when omitted"
+    ).option("--granularity <step>", "hour or day: with --from and --to, or with --window 7d").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"),
+    "getVolumeNameMetrics"
+  ).action(
+    async (name, options) => volumeMetricsCommand(dependencies(), name, options)
+  );
   operationOptions(
     volume.command("move <name>").description(
       "move a Volume to another Machine of its region, taking it from the asleep Machine that has it in the same write"
@@ -9968,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.24.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": {