feat: bump to @guidebooks/[email protected] to pick up more flexible (non-ray) vmstat tracking

guidebooks/store#576

Author: starpit

package-lock.json

@@ -30,7 +30,7 @@
     "@types/split2": "^3.2.1"
   },
   "dependencies": {
-    "@guidebooks/store": "^5.1.7",
+    "@guidebooks/store": "^5.2.0",
     "@logdna/tail-file": "^3.0.1",
     "@patternfly/react-charts": "^6.94.18",
     "@patternfly/react-core": "^4.276.6",

plugins/plugin-codeflare/package.json

@@ -24,8 +24,8 @@ import charts from "./charts"
 import events from "./events"
 import dashboard from "./dashboard"
 import description from "./description"
+import { LogsOptions, logsFlags } from "./logs"
 import { Options as AttachOptions } from "./attach"
-import { ProfileOptions, profileFlags } from "./options"
 
 function help() {
   return `Usage:
@@ -43,11 +43,9 @@ export default function registerCodeflareCommands(registrar: Registrar) {
   description(registrar)
   registrar.listen("/help", help)
 
-  registrar.listen<KResponse, ProfileOptions>(
-    "/codeflare/logs",
-    (args) => import("./logs").then((_) => _.default(args)),
-    { flags: profileFlags }
-  )
+  registrar.listen<KResponse, LogsOptions>("/codeflare/logs", (args) => import("./logs").then((_) => _.default(args)), {
+    flags: logsFlags,
+  })
 
   registrar.listen<KResponse, AttachOptions>(
     "/codeflare/attach",

plugins/plugin-codeflare/src/controller/index.ts

@@ -14,22 +14,44 @@
  * limitations under the License.
  */
 
-import { Arguments } from "@kui-shell/core"
-import { MadWizardOptions } from "madwizard"
+import type { Arguments } from "@kui-shell/core"
+import type { MadWizardOptions } from "madwizard"
 
 import appName from "./appName"
-import { ProfileOptions } from "./options"
+import { ProfileOptions, profileFlags } from "./options"
 
-export default async function logs(args: Arguments<ProfileOptions>) {
+export type LogsOptions = ProfileOptions & {
+  l: string
+  "label-selector": string
+}
+
+export const logsFlags = Object.assign({}, profileFlags, {
+  alias: Object.assign({}, profileFlags.alias, {
+    "label-selector": ["l"],
+  }),
+})
+
+export default async function logs(args: Arguments<LogsOptions>) {
   // Display logs for this jobID; if not provided, the user will be
   // prompted (via the guidebook) to choose one
   const jobId = args.argvNoOptions[args.argvNoOptions.indexOf("logs") + 1]
   if (jobId) {
     process.env.JOB_ID = jobId
   }
 
+  // query by label selector?
+  const byLabelSelector = typeof args.parsedOptions.l === "string"
+  if (byLabelSelector) {
+    process.env.WAIT = "true"
+    process.env.KUBE_POD_LABEL_SELECTOR = args.parsedOptions.l
+  }
+
   // play this guidebook
-  const guidebook = jobId === undefined ? "ml/ray/aggregator" : "ml/ray/aggregator/with-jobid"
+  const guidebook = byLabelSelector
+    ? "ml/ray/run/pod-stats"
+    : jobId === undefined
+    ? "ml/ray/aggregator"
+    : "ml/ray/aggregator/with-jobid"
 
   // but only interactive starting here
   const ifor =

plugins/plugin-codeflare/src/controller/logs.ts

@@ -25,7 +25,7 @@ export type ProfileOptions = ParsedOptions & {
   verbose: string
 }
 
-export const profileFlags: CommandOptions["flags"] = {
+export const profileFlags: Required<Pick<CommandOptions, "flags">>["flags"] = {
   boolean: ["V", "verbose"],
   alias: {
     verbose: ["V"],