fixes short sha

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.air.toml

@@ -35,7 +35,7 @@ pre_cmd = []
 rerun = false
 rerun_delay = 500
 send_interrupt = true
-stop_on_error = false
+stop_on_error = true
 
 [color]
 app = ""

.github/workflows/deploy.yml

@@ -127,7 +127,9 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
-          build-args: TAG=${{ steps.meta.outputs.version }}
+          build-args: |
+            TAG=${{ steps.meta.outputs.version }}
+            SHA=${{ github.sha.substr(0,9) }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/dev.yml

@@ -45,7 +45,9 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
-          build-args: TAG=${{ steps.meta.outputs.version }}
+          build-args: |
+            TAG=${{ steps.meta.outputs.version }}
+            SHA=${{ github.sha.substr(0,9) }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

Dockerfile

@@ -48,19 +48,21 @@ COPY --from=node /build/dist ./dist
 
 # Args
 ARG TAG=dev
+ARG SHA=
 ARG TARGETOS TARGETARCH
 
 # Generate protos
 RUN go generate
 
 # Build binary
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=$TAG" -o dozzle
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=$TAG -X github.com/amir20/dozzle/internal/support/cli.SHA=$SHA" -o dozzle
 
 RUN mkdir /data
 
 FROM scratch
 
 COPY --from=builder /data /data
+COPY --from=builder /tmp /tmp
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /dozzle/dozzle /dozzle
 

Makefile

@@ -2,7 +2,7 @@ PROTO_DIR := protos
 GEN_DIR := internal/agent/pb
 PROTO_FILES := $(wildcard $(PROTO_DIR)/*.proto)
 GEN_FILES := $(patsubst $(PROTO_DIR)/%.proto,$(GEN_DIR)/%.pb.go,$(PROTO_FILES))
-
+SHA := $(shell git rev-parse --short HEAD)
 .PHONY: clean
 clean:
 	@rm -rf dist
@@ -26,11 +26,12 @@ test: fake_assets generate
 
 .PHONY: build
 build: dist generate
-	CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=local"
+	echo "Building with SHA: $(SHA)"
+	CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=local -X github.com/amir20/dozzle/internal/support/cli.SHA=$(SHA)"
 
 .PHONY: docker
 docker: shared_key.pem shared_cert.pem
-	@docker build  --build-arg TAG=local -t amir20/dozzle .
+	@docker build  --build-arg TAG=local --build-arg SHA=$(SHA) -t amir20/dozzle .
 
 generate: shared_key.pem shared_cert.pem $(GEN_FILES)
 
@@ -43,7 +44,7 @@ int:
 	docker compose up --build --force-recreate --exit-code-from playwright
 
 shared_key.pem:
-	@openssl genpkey -algorithm RSA -out shared_key.pem -pkeyopt rsa_keygen_bits:2048
+	@openssl genpkey -algorithm Ed25519 -out shared_key.pem
 
 shared_cert.pem: shared_key.pem
 	@openssl req -new -key shared_key.pem -out shared_request.csr -subj "/C=US/ST=California/L=San Francisco/O=Dozzle"

assets/auto-imports.d.ts

@@ -373,7 +373,7 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
   // @ts-ignore
   export type { DrawerWidth } from './composable/drawer'

assets/components/ContainerViewer/ContainerTitle.vue

@@ -6,15 +6,15 @@
       <carbon:star class="swap-off" />
     </label>
     <div class="inline-flex items-center text-sm">
-      <div class="breadcrumbs p-0">
+      <div class="breadcrumbs p-0 font-mono">
         <ul>
           <li v-if="config.hosts.length > 1" class="font-thin max-md:hidden">
             {{ container.hostLabel }}
           </li>
           <li>
-            <div v-if="otherContainers.length === 0" class="font-mono">{{ container.name }}</div>
+            <template v-if="otherContainers.length === 0">{{ container.name }}</template>
             <div class="wrapper" ref="wrapper" v-else>
-              <button popovertarget="popover-container-list" class="btn btn-xs md:btn-sm anchor font-mono">
+              <button popovertarget="popover-container-list" class="btn btn-xs md:btn-sm anchor">
                 {{ container.name }} <carbon:caret-down />
               </button>
 
@@ -25,8 +25,8 @@
                       class="status data-[state=exited]:status-error data-[state=running]:status-success"
                       :data-state="other.state"
                     ></div>
-                    <div class="font-mono" v-if="other.isSwarm">{{ other.swarmId }}</div>
-                    <div class="font-mono" v-else>{{ other.name }}</div>
+                    <div v-if="other.isSwarm">{{ other.swarmId }}</div>
+                    <div v-else>{{ other.name }}</div>
                     <div v-if="other.state === 'running'">running</div>
                     <DistanceTime :date="other.created" strict class="text-base-content/70 text-xs" v-else />
                   </router-link>

assets/components/FuzzySearchModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="dropdown dropdown-open w-full">
+  <div class="dropdown dropdown-open w-full shadow-md">
     <div class="input input-xl input-primary flex w-full items-center">
       <mdi:magnify class="flex size-8" />
       <input

assets/components/GroupedViewer/GroupedLog.vue

@@ -2,7 +2,7 @@
   <ScrollableView :scrollable="scrollable" v-if="group.containers.length && ready">
     <template #header>
       <div class="mx-2 flex items-center gap-2 md:ml-4">
-        <div class="@container flex flex-1 gap-1.5 truncate md:gap-2">
+        <div class="@container flex flex-1 items-center gap-1.5 truncate md:gap-2">
           <div class="inline-flex font-mono text-sm">
             <div class="font-semibold">{{ $t("label.container", group.containers.length) }}</div>
           </div>

assets/components/LogViewer/LogAnalytics.vue

@@ -11,18 +11,26 @@
           <textarea
             v-model="query"
             class="textarea textarea-primary w-full font-mono text-lg"
-            :class="{ 'textarea-error': error }"
+            :class="{ 'textarea-error!': error }"
+            :disabled="state === 'downloading'"
           ></textarea>
-          <div class="label max-h-48 overflow-y-auto pr-2">
-            <span class="label-text-alt text-error" v-if="error">{{ error }}</span>
-            <span class="label-text-alt" v-else>
-              Total {{ results.numRows }} records
-              <template v-if="results.numRows > pageLimit"> . Showing first {{ page.numRows }}. </template>
+          <div class="mt-2">
+            <span class="text-error" v-if="error">{{ error }}</span>
+            <span v-else-if="state === 'initializing'">{{ $t("analytics.creating_table") }}</span>
+            <span v-else-if="state === 'downloading'">{{
+              $t("analytics.downloading", { size: formatBytes(bytes, { decimals: 1 }) })
+            }}</span>
+            <span v-else-if="evaluating">{{ $t("analytics.evaluating_query") }}</span>
+            <span v-else>
+              {{ $t("analytics.total_records", { count: results.numRows.toLocaleString() }) }}
+              <template v-if="results.numRows > pageLimit">{{
+                $t("analytics.showing_first", { count: page.numRows.toLocaleString() })
+              }}</template>
             </span>
           </div>
         </label>
       </section>
-      <SQLTable :table="page" :loading="evaluating || !isReady" />
+      <SQLTable :table="page" :loading="evaluating || state !== 'ready'" />
     </div>
   </aside>
 </template>
@@ -30,12 +38,15 @@
 <script setup lang="ts">
 import { Container } from "@/models/Container";
 import { type Table } from "@apache-arrow/esnext-esm";
+
 const { container } = defineProps<{ container: Container }>();
 const query = ref("SELECT * FROM logs LIMIT 100");
 const error = ref<string | null>(null);
 const debouncedQuery = debouncedRef(query, 500);
 const evaluating = ref(false);
 const pageLimit = 1000;
+const state = ref<"downloading" | "ready" | "initializing">("downloading");
+const bytes = ref(0);
 
 const url = withBase(
   `/api/hosts/${container.host}/containers/${container.id}/logs?stdout=1&stderr=1&everything&jsonOnly`,
@@ -51,27 +62,49 @@ if (!response.ok) {
 const { db, conn } = await useDuckDB();
 const empty = await conn.query<Record<string, any>>(`SELECT 1 LIMIT 0`);
 
-const { isReady } = useAsyncState(
-  async () => {
-    await db.registerFileBuffer("logs.json", new Uint8Array(await response.arrayBuffer()));
+onMounted(async () => {
+  try {
+    state.value = "downloading";
+
+    const reader = response.body?.getReader();
+    if (!reader) throw new Error("No reader available from stream");
+
+    const chunks: Uint8Array[] = [];
+    bytes.value = 0;
+
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      chunks.push(value);
+      bytes.value += value.length;
+    }
+
+    const arrayBuffer = new Uint8Array(bytes.value);
+    let position = 0;
+    for (const chunk of chunks) {
+      arrayBuffer.set(chunk, position);
+      position += chunk.length;
+    }
+
+    await db.registerFileBuffer("logs.json", arrayBuffer);
+
+    state.value = "initializing";
     await conn.query(
       `CREATE TABLE logs AS SELECT unnest(m) FROM read_json('logs.json', ignore_errors = true, format = 'newline_delimited')`,
     );
-  },
-  undefined,
-  {
-    onError: (e) => {
-      console.error(e);
-      if (e instanceof Error) {
-        error.value = e.message;
-      }
-    },
-  },
-);
+
+    state.value = "ready";
+  } catch (e) {
+    console.error(e);
+    if (e instanceof Error) {
+      error.value = e.message;
+    }
+  }
+});
 
 const results = computedAsync(
   async () => {
-    if (isReady.value) {
+    if (state.value === "ready") {
       return await conn.query<Record<string, any>>(debouncedQuery.value);
     } else {
       return empty;
@@ -89,7 +122,10 @@ const results = computedAsync(
   },
 );
 
-whenever(evaluating, () => (error.value = null));
+whenever(evaluating, () => {
+  error.value = null;
+  state.value = "ready";
+});
 const page = computed(() =>
   results.value.numRows > pageLimit ? results.value.slice(0, pageLimit) : results.value,
 ) as unknown as ComputedRef<Table<Record<string, any>>>;

assets/components/MultiContainerViewer/MultiContainerLog.vue

@@ -2,7 +2,7 @@
   <ScrollableView :scrollable="scrollable" v-if="containers.length && ready">
     <template #header>
       <div class="mx-2 flex items-center gap-2 md:ml-4">
-        <div class="@container flex flex-1 gap-1.5 truncate md:gap-2">
+        <div class="@container flex flex-1 items-center gap-1.5 truncate md:gap-2">
           <octicon:container-24 />
           <div class="inline-flex font-mono text-sm">
             <div class="font-semibold">{{ containers.length }} containers</div>

assets/components/ServiceViewer/ServiceLog.vue

@@ -2,7 +2,7 @@
   <ScrollableView :scrollable="scrollable" v-if="service.name">
     <template #header>
       <div class="mx-2 flex items-center gap-2 md:ml-4">
-        <div class="@container flex flex-1 gap-1.5 truncate md:gap-2">
+        <div class="@container flex flex-1 items-center gap-1.5 truncate md:gap-2">
           <ph:stack-simple />
           <div class="inline-flex font-mono text-sm">
             <div class="font-semibold">{{ service.name }}</div>

assets/components/StackViewer/StackLog.vue

@@ -2,7 +2,7 @@
   <ScrollableView :scrollable="scrollable" v-if="stack.name">
     <template #header>
       <div class="mx-2 flex items-center gap-2 md:ml-4">
-        <div class="@container flex flex-1 gap-1.5 truncate md:gap-2">
+        <div class="@container flex flex-1 items-center gap-1.5 truncate md:gap-2">
           <ph:stack />
           <div class="inline-flex font-mono text-sm">
             <div class="font-semibold">{{ stack.name }}</div>

assets/components/common/ToastModal.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="toast toast-end whitespace-normal max-md:m-0 max-md:w-full">
+  <div class="toast toast-end whitespace-normal max-md:end-auto max-md:m-0 max-md:max-w-full">
     <div
-      class="alert max-w-xl max-md:rounded-none"
+      class="alert max-w-xl shadow-sm max-md:rounded-none"
       v-for="{ toast, options: { timed } } in toasts"
       :key="toast.id"
       :class="{

assets/layouts/default.vue

@@ -25,7 +25,7 @@
       </Pane>
     </Splitpanes>
     <label
-      class="btn btn-circle swap bg-base-100 swap-rotate fixed bottom-4 -left-12 w-16 transition-all hover:-left-4"
+      class="btn btn-circle swap bg-base-content/10 swap-rotate border-base-content/20 hover:border-primary fixed bottom-4 -left-12 w-16 shadow-sm transition-all hover:-left-4"
       :class="{ '-left-6!': collapseNav }"
       v-if="!isMobile && !forceMenuHidden"
     >
@@ -34,7 +34,7 @@
       <mdi:chevron-left class="swap-off" />
     </label>
   </div>
-  <dialog ref="modal" class="modal items-start bg-white/15 backdrop-blur-xs transition-none!" @close="open = false">
+  <dialog ref="modal" class="modal bg-base-300/50! items-start backdrop-blur-md transition-none!" @close="open = false">
     <div class="modal-box max-w-2xl bg-transparent pt-20 shadow-none">
       <FuzzySearchModal @close="open = false" v-if="open" />
     </div>

docker-compose.yml

@@ -95,7 +95,7 @@ services:
 
   playwright:
     container_name: playwright
-    image: mcr.microsoft.com/playwright:v1.51.1-jammy
+    image: mcr.microsoft.com/playwright:v1.52.0-jammy
     working_dir: /app
     volumes:
       - .:/app

docs/guide/agent.md

@@ -180,7 +180,7 @@ This will mount the `cert.pem` and `key.pem` files to the agent. The agent will
 To generate certificates, you can use the following command:
 
 ```sh
-$ openssl genpkey -algorithm RSA -out key.pem -pkeyopt rsa_keygen_bits:2048
+$ openssl genpkey -algorithm Ed25519 -out key.pem
 $ openssl req -new -key key.pem -out request.csr -subj "/C=US/ST=California/L=San Francisco/O=My Company"
 $ openssl x509 -req -in request.csr -signkey key.pem -out cert.pem -days 365
 ```

docs/guide/authentication.md

@@ -10,7 +10,12 @@ If you do not have an authentication solution, then Dozzle has a simple file-bas
 
 ## File-Based User Management
 
-Dozzle supports multi-user authentication by setting `--auth-provider` to `simple`. In this mode, Dozzle will try to read `/data/users.yml`.
+Dozzle supports multi-user authentication by setting `--auth-provider` to `simple`. In this mode, Dozzle will attempt to read the users file from `/data/`, prioritizing `users.yml` over `users.yaml` if both files are present. If only one of the files exists, it will be used. The log will indicate which file is being read (e.g., `Reading users.yml file`).
+
+### Example file paths:
+
+- `/data/users.yml`
+- `/data/users.yaml`
 
 The content of the file looks like:
 
@@ -20,7 +25,7 @@ users:
   admin:
     email: me@email.net
     name: Admin
-    # Generate with docker run amir20/dozzle generate --name Admin --email me@email.net --password secret admin
+    # Generate with docker run run -it --rm amir20/dozzle generate --name Admin --email me@email.net --password secret admin
     password: $2a$11$9ho4vY2LdJ/WBopFcsAS0uORC0x2vuFHQgT/yBqZyzclhHsoaIkzK
     filter:
 ```
@@ -28,7 +33,7 @@ users:
 Dozzle uses `email` to generate avatars using [Gravatar](https://gravatar.com/). It is optional. The password is hashed using `bcrypt` which can be generated using `docker run amir20/dozzle generate`.
 
 > [!WARNING]
-> In previous versions of Dozzle, SHA-256 was used to hash passwords. Bcrypt is now more secure and is recommended for future use. Dozzle will revert to SHA-256 if it does not find a bcrypt hash. It is advisable to update the password hash to bcrypt using `docker run amir20/dozzle generate`. For more details, see [this issue](https://github.com/amir20/dozzle/security/advisories/GHSA-w7qr-q9fh-fj35).
+> In previous versions of Dozzle, SHA-256 was used to hash passwords. Bcrypt is now more secure and is recommended for future use. Dozzle will revert to SHA-256 if it does not find a bcrypt hash. It is advisable to update the password hash to bcrypt using `generate`. For more details, see [this issue](https://github.com/amir20/dozzle/security/advisories/GHSA-w7qr-q9fh-fj35).
 
 You will need to mount this file for Dozzle to find it. Here is an example:
 
@@ -139,10 +144,10 @@ In this example, the `admin` user has no filter, so they can see all containers.
 Dozzle has a built-in `generate` command to generate `users.yml`. Here is an example:
 
 ```sh
-docker run amir20/dozzle generate admin --password password --email test@email.net --name "John Doe" --user-filter name=foo > users.yml
+docker run -it --rm amir20/dozzle generate admin --password password --email test@email.net --name "John Doe" --user-filter name=foo > users.yml
 ```
 
-In this example, `admin` is the username. Email and name are optional but recommended to display accurate avatars. `docker run amir20/dozzle generate --help` displays all options. The `--user-filter` flag is a comma-separated list of filters.
+In this example, `admin` is the username. Email and name are optional but recommended to display accurate avatars. `docker run -it --rm amir20/dozzle generate --help` displays all options. The `--user-filter` flag is a comma-separated list of filters.
 
 ## Forward Proxy
 

docs/guide/supported-env-vars.md

@@ -34,7 +34,7 @@ Configurations can be done with flags or environment variables. The table below
 Dozzle supports generating `users.yml` file. This file is used to authenticate users. Here is an example:
 
 ```sh
-docker run amir20/dozzle generate admin --password password --email test@email.net --name "John Doe" > users.yml
+docker run -it --rm amir20/dozzle generate admin --password password --email test@email.net --name "John Doe" > users.yml
 ```
 
 In this example, `admin` is the username. Email and name are optional but recommended to display accurate avatars. `docker run amir20/dozzle generate --help` displays all options.

go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/alexflint/go-arg v1.5.1
 	github.com/beme/abide v0.0.0-20190723115211-635a09831760
-	github.com/docker/docker v28.0.4+incompatible
+	github.com/docker/docker v28.1.1+incompatible
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1
@@ -17,21 +17,22 @@ require (
 	github.com/spf13/afero v1.14.0
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.10.2
+	github.com/PuerkitoBio/goquery v1.10.3
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-chi/jwtauth/v5 v5.3.3
+	github.com/go-faker/faker/v4 v4.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/puzpuzpuz/xsync/v4 v4.0.0
 	github.com/rs/zerolog v1.34.0
 	github.com/samber/lo v1.49.1
 	github.com/wk8/go-ordered-map/v2 v2.1.8
-	github.com/yuin/goldmark v1.7.8
+	github.com/yuin/goldmark v1.7.10
 	golang.org/x/crypto v0.37.0
 	golang.org/x/sync v0.13.0
 	google.golang.org/grpc v1.71.1

go.sum

@@ -4,6 +4,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
 github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
+github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
 github.com/alexflint/go-arg v1.5.1 h1:nBuWUCpuRy0snAG+uIJ6N0UvYxpxA0/ghA/AaHxlT8Y=
 github.com/alexflint/go-arg v1.5.1/go.mod h1:A7vTJzvjoaSTypg4biM5uYNTkJ27SkNTArtYXnlqVO8=
 github.com/alexflint/go-scalar v1.2.0 h1:WR7JPKkeNpnYIOfHRa7ivM21aWAdHD0gEWHCx+WQBRw=
@@ -34,6 +36,10 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok=
 github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.1.0+incompatible h1:4iqpcWQCt3Txcz7iWIb1U3SZ/n9ffo4U+ryY5/3eOp0=
+github.com/docker/docker v28.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
+github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -50,6 +56,8 @@ github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
 github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-chi/jwtauth/v5 v5.3.3 h1:50Uzmacu35/ZP9ER2Ht6SazwPsnLQ9LRJy6zTZJpHEo=
 github.com/go-chi/jwtauth/v5 v5.3.3/go.mod h1:O4QvPRuZLZghl9WvfVaON+ARfGzpD2PBX/QY5vUz7aQ=
+github.com/go-faker/faker/v4 v4.6.0 h1:6aOPzNptRiDwD14HuAnEtlTa+D1IfFuEHO8+vEFwjTs=
+github.com/go-faker/faker/v4 v4.6.0/go.mod h1:ZmrHuVtTTm2Em9e0Du6CJ9CADaLEzGXW62z1YqFH0m0=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -192,6 +200,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
 github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.9 h1:rVSeT+f7/lAM+bJHVm5YHGwNrnd40i1Ch2DEocEjHQ0=
+github.com/yuin/goldmark v1.7.9/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark v1.7.10 h1:S+LrtBjRmqMac2UdtB6yyCEJm+UILZ2fefI4p7o0QpI=
+github.com/yuin/goldmark v1.7.10/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
@@ -244,6 +256,8 @@ golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
 golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
 golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
 golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

internal/agent/client.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/amir20/dozzle/internal/agent/pb"
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/amir20/dozzle/internal/utils"
 	"github.com/rs/zerolog/log"
 	orderedmap "github.com/wk8/go-ordered-map/v2"
 	"google.golang.org/grpc"
@@ -253,23 +252,7 @@ func (c *Client) StreamNewContainers(ctx context.Context, containers chan<- cont
 			return rpcErrToErr(err)
 		}
 
-		containers <- container.Container{
-			ID:          resp.Container.Id,
-			Name:        resp.Container.Name,
-			Image:       resp.Container.Image,
-			Labels:      resp.Container.Labels,
-			Group:       resp.Container.Group,
-			Created:     resp.Container.Created.AsTime(),
-			State:       resp.Container.State,
-			Health:      resp.Container.Health,
-			Host:        resp.Container.Host,
-			Tty:         resp.Container.Tty,
-			StartedAt:   resp.Container.Started.AsTime(),
-			FinishedAt:  resp.Container.Finished.AsTime(),
-			Command:     resp.Container.Command,
-			MemoryLimit: resp.Container.MemoryLimit,
-			CPULimit:    resp.Container.CpuLimit,
-		}
+		containers <- container.FromProto(resp.Container)
 	}
 }
 
@@ -279,35 +262,7 @@ func (c *Client) FindContainer(ctx context.Context, containerID string) (contain
 		return container.Container{}, err
 	}
 
-	var stats []container.ContainerStat
-
-	for _, stat := range response.Container.Stats {
-		stats = append(stats, container.ContainerStat{
-			ID:            stat.Id,
-			CPUPercent:    stat.CpuPercent,
-			MemoryPercent: stat.MemoryPercent,
-			MemoryUsage:   stat.MemoryUsage,
-		})
-	}
-
-	return container.Container{
-		ID:          response.Container.Id,
-		Name:        response.Container.Name,
-		Image:       response.Container.Image,
-		Labels:      response.Container.Labels,
-		Group:       response.Container.Group,
-		Created:     response.Container.Created.AsTime(),
-		State:       response.Container.State,
-		Health:      response.Container.Health,
-		Host:        response.Container.Host,
-		Tty:         response.Container.Tty,
-		Command:     response.Container.Command,
-		StartedAt:   response.Container.Started.AsTime(),
-		FinishedAt:  response.Container.Finished.AsTime(),
-		Stats:       utils.RingBufferFrom(300, stats),
-		MemoryLimit: response.Container.MemoryLimit,
-		CPULimit:    response.Container.CpuLimit,
-	}, nil
+	return container.FromProto(response.Container), nil
 }
 
 func (c *Client) ListContainers(ctx context.Context, labels container.ContainerLabels) ([]container.Container, error) {
@@ -327,34 +282,7 @@ func (c *Client) ListContainers(ctx context.Context, labels container.ContainerL
 
 	containers := make([]container.Container, 0)
 	for _, c := range response.Containers {
-		var stats []container.ContainerStat
-		for _, stat := range c.Stats {
-			stats = append(stats, container.ContainerStat{
-				ID:            stat.Id,
-				CPUPercent:    stat.CpuPercent,
-				MemoryPercent: stat.MemoryPercent,
-				MemoryUsage:   stat.MemoryUsage,
-			})
-		}
-
-		containers = append(containers, container.Container{
-			ID:          c.Id,
-			Name:        c.Name,
-			Image:       c.Image,
-			Labels:      c.Labels,
-			Group:       c.Group,
-			Created:     c.Created.AsTime(),
-			State:       c.State,
-			Health:      c.Health,
-			Host:        c.Host,
-			Tty:         c.Tty,
-			Command:     c.Command,
-			StartedAt:   c.Started.AsTime(),
-			FinishedAt:  c.Finished.AsTime(),
-			Stats:       utils.RingBufferFrom(300, stats),
-			MemoryLimit: c.MemoryLimit,
-			CPULimit:    c.CpuLimit,
-		})
+		containers = append(containers, container.FromProto(c))
 	}
 
 	return containers, nil

internal/agent/client_test.go

@@ -3,6 +3,7 @@ package agent
 import (
 	"context"
 	"crypto/tls"
+	"fmt"
 	"io"
 	"net"
 	"os"
@@ -13,6 +14,8 @@ import (
 	"github.com/amir20/dozzle/internal/container"
 	"github.com/amir20/dozzle/internal/utils"
 	"github.com/docker/docker/api/types/system"
+	"github.com/go-faker/faker/v4"
+	"github.com/go-faker/faker/v4/pkg/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
@@ -78,28 +81,16 @@ func (m *MockedClient) SystemInfo() system.Info {
 	return system.Info{ID: "123"}
 }
 
-var wantedContainer = container.Container{
-	ID:      "123456",
-	Name:    "test",
-	Host:    "localhost",
-	Image:   "test",
-	State:   "running",
-	Health:  "healthy",
-	Group:   "test",
-	Command: "test",
-	Tty:     true,
-	Labels: map[string]string{
-		"test": "test",
-	},
-	Stats:       utils.NewRingBuffer[container.ContainerStat](300),
-	Created:     time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
-	StartedAt:   time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
-	FinishedAt:  time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
-	CPULimit:    0.1,
-	MemoryLimit: 1024,
-}
+var wantedContainer = container.Container{}
 
 func init() {
+	faker.FakeData(&wantedContainer, options.WithFieldsToIgnore("Stats"))
+	wantedContainer.FinishedAt = wantedContainer.FinishedAt.UTC()
+	wantedContainer.Created = wantedContainer.Created.UTC()
+	wantedContainer.StartedAt = wantedContainer.StartedAt.UTC()
+	wantedContainer.Stats = utils.NewRingBuffer[container.ContainerStat](300)
+
+	fmt.Printf("Fake data generated %+v", wantedContainer)
 	lis = bufconn.Listen(bufSize)
 
 	cwd, err := os.Getwd()
@@ -149,7 +140,7 @@ func TestFindContainer(t *testing.T) {
 
 	c, _ := rpc.FindContainer(context.Background(), "123456")
 
-	assert.Equal(t, c, wantedContainer)
+	assert.Equal(t, wantedContainer, c)
 }
 
 func TestListContainers(t *testing.T) {
@@ -160,7 +151,7 @@ func TestListContainers(t *testing.T) {
 
 	containers, _ := rpc.ListContainers(context.Background(), container.ContainerLabels{})
 
-	assert.Equal(t, containers, []container.Container{
+	assert.Equal(t, []container.Container{
 		wantedContainer,
-	})
+	}, containers)
 }

internal/agent/pb/types.pb.go

@@ -92,6 +92,7 @@ type Container struct {
 	Finished      *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=finished,proto3" json:"finished,omitempty"`
 	MemoryLimit   uint64                 `protobuf:"varint,17,opt,name=memoryLimit,proto3" json:"memoryLimit,omitempty"`
 	CpuLimit      float64                `protobuf:"fixed64,18,opt,name=cpuLimit,proto3" json:"cpuLimit,omitempty"`
+	FullyLoaded   bool                   `protobuf:"varint,19,opt,name=fullyLoaded,proto3" json:"fullyLoaded,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -252,6 +253,13 @@ func (x *Container) GetCpuLimit() float64 {
 	return 0
 }
 
+func (x *Container) GetFullyLoaded() bool {
+	if x != nil {
+		return x.FullyLoaded
+	}
+	return false
+}
+
 type ContainerStat struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -708,7 +716,7 @@ var file_types_proto_rawDesc = string([]byte{
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
 	0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x80, 0x05, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
+	0x6f, 0x74, 0x6f, 0x22, 0xa2, 0x05, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
 	0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
 	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x03,
@@ -744,81 +752,83 @@ var file_types_proto_rawDesc = string([]byte{
 	0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01,
 	0x28, 0x04, 0x52, 0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
 	0x1a, 0x0a, 0x08, 0x63, 0x70, 0x75, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x08, 0x63, 0x70, 0x75, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x4c,
-	0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x87, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x61,
-	0x69, 0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70, 0x75, 0x50,
-	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, 0x63, 0x70,
-	0x75, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x6d, 0x6f,
-	0x72, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0b, 0x6d,
-	0x65, 0x6d, 0x6f, 0x72, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65,
-	0x6d, 0x6f, 0x72, 0x79, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x0d, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
-	0x22, 0xf0, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a,
-	0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12,
-	0x2e, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76,
-	0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12,
-	0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0x29, 0x0a, 0x0d, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x24,
-	0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x22, 0x8c, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x6f, 0x72,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x49,
-	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x22, 0xaf, 0x03, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x77, 0x61, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x73, 0x77, 0x61, 0x72, 0x6d, 0x12, 0x32, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65,
-	0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x28, 0x0a, 0x0f,
-	0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67,
-	0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x73, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x73, 0x56, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08,
-	0x63, 0x70, 0x75, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08,
-	0x63, 0x70, 0x75, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x6f,
-	0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79,
-	0x12, 0x22, 0x0a, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x56, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x6f, 0x63,
-	0x6b, 0x65, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x39, 0x0a, 0x0b, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x33, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x72,
-	0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x74, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0b, 0x0a,
-	0x07, 0x52, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x10, 0x02, 0x42, 0x13, 0x5a, 0x11, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x52, 0x08, 0x63, 0x70, 0x75, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66,
+	0x75, 0x6c, 0x6c, 0x79, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x1a, 0x39, 0x0a,
+	0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x87, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e,
+	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x70,
+	0x75, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a,
+	0x63, 0x70, 0x75, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65,
+	0x6d, 0x6f, 0x72, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x0b, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x0d,
+	0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x01, 0x52, 0x0d, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x50, 0x65, 0x72, 0x63, 0x65,
+	0x6e, 0x74, 0x22, 0xf0, 0x01, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12,
+	0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49,
+	0x64, 0x12, 0x2e, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c,
+	0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65,
+	0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x29, 0x0a, 0x0d, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x22, 0x24, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x8c, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x74, 0x61,
+	0x69, 0x6e, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x74,
+	0x6f, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x74, 0x6f,
+	0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xaf, 0x03, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x77, 0x61, 0x72, 0x6d, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x77, 0x61, 0x72, 0x6d, 0x12, 0x32, 0x0a, 0x06, 0x6c, 0x61,
+	0x62, 0x65, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x28,
+	0x0a, 0x0f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65,
+	0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
+	0x6e, 0x67, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x73, 0x56, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x73, 0x56,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a,
+	0x0a, 0x08, 0x63, 0x70, 0x75, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x08, 0x63, 0x70, 0x75, 0x43, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65,
+	0x6d, 0x6f, 0x72, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x6f,
+	0x72, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x56,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72,
+	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64,
+	0x6f, 0x63, 0x6b, 0x65, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x39, 0x0a, 0x0b,
+	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x33, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74, 0x61,
+	0x69, 0x6e, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x74,
+	0x61, 0x72, 0x74, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x74, 0x6f, 0x70, 0x10, 0x01, 0x12,
+	0x0b, 0x0a, 0x07, 0x52, 0x65, 0x73, 0x74, 0x61, 0x72, 0x74, 0x10, 0x02, 0x42, 0x13, 0x5a, 0x11,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 })
 
 var (

internal/agent/server.go

@@ -189,25 +189,9 @@ func (s *server) FindContainer(ctx context.Context, in *pb.FindContainerRequest)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
-
+	c := container.ToProto()
 	return &pb.FindContainerResponse{
-		Container: &pb.Container{
-			Id:          container.ID,
-			Name:        container.Name,
-			Image:       container.Image,
-			Command:     container.Command,
-			Created:     timestamppb.New(container.Created),
-			State:       container.State,
-			Health:      container.Health,
-			Host:        container.Host,
-			Tty:         container.Tty,
-			Labels:      container.Labels,
-			Group:       container.Group,
-			Started:     timestamppb.New(container.StartedAt),
-			Finished:    timestamppb.New(container.FinishedAt),
-			MemoryLimit: container.MemoryLimit,
-			CpuLimit:    container.CPULimit,
-		},
+		Container: &c,
 	}, nil
 }
 
@@ -225,36 +209,9 @@ func (s *server) ListContainers(ctx context.Context, in *pb.ListContainersReques
 	}
 
 	var pbContainers []*pb.Container
-
 	for _, container := range containers {
-		var pbStats []*pb.ContainerStat
-		for _, stat := range container.Stats.Data() {
-			pbStats = append(pbStats, &pb.ContainerStat{
-				Id:            stat.ID,
-				CpuPercent:    stat.CPUPercent,
-				MemoryPercent: stat.MemoryPercent,
-				MemoryUsage:   stat.MemoryUsage,
-			})
-		}
-
-		pbContainers = append(pbContainers, &pb.Container{
-			Id:          container.ID,
-			Name:        container.Name,
-			Image:       container.Image,
-			Created:     timestamppb.New(container.Created),
-			State:       container.State,
-			Health:      container.Health,
-			Host:        container.Host,
-			Tty:         container.Tty,
-			Labels:      container.Labels,
-			Group:       container.Group,
-			Started:     timestamppb.New(container.StartedAt),
-			Finished:    timestamppb.New(container.FinishedAt),
-			Stats:       pbStats,
-			Command:     container.Command,
-			MemoryLimit: container.MemoryLimit,
-			CpuLimit:    container.CPULimit,
-		})
+		c := container.ToProto()
+		pbContainers = append(pbContainers, &c)
 	}
 
 	return &pb.ListContainersResponse{
@@ -284,23 +241,9 @@ func (s *server) StreamContainerStarted(in *pb.StreamContainerStartedRequest, ou
 	for {
 		select {
 		case container := <-containers:
+			c := container.ToProto()
 			out.Send(&pb.StreamContainerStartedResponse{
-				Container: &pb.Container{
-					Id:          container.ID,
-					Name:        container.Name,
-					Image:       container.Image,
-					Created:     timestamppb.New(container.Created),
-					State:       container.State,
-					Health:      container.Health,
-					Host:        container.Host,
-					Tty:         container.Tty,
-					Labels:      container.Labels,
-					Group:       container.Group,
-					Started:     timestamppb.New(container.StartedAt),
-					Finished:    timestamppb.New(container.FinishedAt),
-					MemoryLimit: container.MemoryLimit,
-					CpuLimit:    container.CPULimit,
-				},
+				Container: &c,
 			})
 		case <-out.Context().Done():
 			return nil

internal/container/types.go

@@ -6,7 +6,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/amir20/dozzle/internal/agent/pb"
 	"github.com/amir20/dozzle/internal/utils"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 // Container represents an internal representation of docker containers
@@ -30,6 +32,70 @@ type Container struct {
 	FullyLoaded bool                             `json:"-,omitempty"`
 }
 
+func (container Container) ToProto() pb.Container {
+	var pbStats []*pb.ContainerStat
+	for _, stat := range container.Stats.Data() {
+		pbStats = append(pbStats, &pb.ContainerStat{
+			Id:            stat.ID,
+			CpuPercent:    stat.CPUPercent,
+			MemoryPercent: stat.MemoryPercent,
+			MemoryUsage:   stat.MemoryUsage,
+		})
+	}
+
+	return pb.Container{
+		Id:          container.ID,
+		Name:        container.Name,
+		Image:       container.Image,
+		Created:     timestamppb.New(container.Created),
+		State:       container.State,
+		Health:      container.Health,
+		Host:        container.Host,
+		Tty:         container.Tty,
+		Labels:      container.Labels,
+		Group:       container.Group,
+		Started:     timestamppb.New(container.StartedAt),
+		Finished:    timestamppb.New(container.FinishedAt),
+		Stats:       pbStats,
+		Command:     container.Command,
+		MemoryLimit: container.MemoryLimit,
+		CpuLimit:    container.CPULimit,
+		FullyLoaded: container.FullyLoaded,
+	}
+}
+
+func FromProto(c *pb.Container) Container {
+	var stats []ContainerStat
+	for _, stat := range c.Stats {
+		stats = append(stats, ContainerStat{
+			ID:            stat.Id,
+			CPUPercent:    stat.CpuPercent,
+			MemoryPercent: stat.MemoryPercent,
+			MemoryUsage:   stat.MemoryUsage,
+		})
+	}
+
+	return Container{
+		ID:          c.Id,
+		Name:        c.Name,
+		Image:       c.Image,
+		Labels:      c.Labels,
+		Group:       c.Group,
+		Created:     c.Created.AsTime(),
+		State:       c.State,
+		Health:      c.Health,
+		Host:        c.Host,
+		Tty:         c.Tty,
+		Command:     c.Command,
+		StartedAt:   c.Started.AsTime(),
+		FinishedAt:  c.Finished.AsTime(),
+		Stats:       utils.RingBufferFrom(300, stats),
+		MemoryLimit: c.MemoryLimit,
+		CPULimit:    c.CpuLimit,
+		FullyLoaded: c.FullyLoaded,
+	}
+}
+
 // ContainerStat represent stats instant for a container
 type ContainerStat struct {
 	ID            string  `json:"id"`

internal/container/types_test.go

@@ -0,0 +1,25 @@
+package container
+
+import (
+	"testing"
+
+	"github.com/amir20/dozzle/internal/utils"
+	"github.com/go-faker/faker/v4"
+	"github.com/go-faker/faker/v4/pkg/options"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestProto(t *testing.T) {
+	expected := Container{}
+	faker.FakeData(&expected, options.WithFieldsToIgnore("Stats"))
+	expected.FinishedAt = expected.FinishedAt.UTC()
+	expected.Created = expected.Created.UTC()
+	expected.StartedAt = expected.StartedAt.UTC()
+	expected.Stats = utils.NewRingBuffer[ContainerStat](300)
+
+	pb := expected.ToProto()
+	actual := FromProto(&pb)
+
+	assert.Equal(t, expected, actual)
+
+}

internal/support/cli/agent_command.go

@@ -15,7 +15,6 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-
 type AgentCmd struct {
 	Addr string `arg:"--agent-addr,env:DOZZLE_AGENT_ADDR" default:":7007" help:"sets the host:port to bind for the agent"`
 }
@@ -37,11 +36,12 @@ func (a *AgentCmd) Run(args Args, embeddedCerts embed.FS) error {
 	if err != nil {
 		return fmt.Errorf("failed to listen: %w", err)
 	}
-	tempFile, err := os.CreateTemp("./", "agent-*.addr")
+	tempFile, err := os.CreateTemp("", "agent-*.addr")
 	if err != nil {
 		return fmt.Errorf("failed to create temp file: %w", err)
 	}
 	io.WriteString(tempFile, listener.Addr().String())
+	log.Debug().Str("file", tempFile.Name()).Msg("Created temp file")
 	go StartEvent(args, "", client, "agent")
 	server, err := agent.NewServer(client, certs, args.Version(), args.Filter)
 	if err != nil {

internal/support/cli/args.go

@@ -9,6 +9,7 @@ import (
 )
 
 var Version = "head"
+var SHA = ""
 
 type Args struct {
 	Addr             string              `arg:"env:DOZZLE_ADDR" default:":8080" help:"sets host:port to bind for server. This is rarely needed inside a docker container."`

internal/support/cli/generate_command.go

@@ -6,6 +6,8 @@ import (
 	"os"
 
 	"github.com/amir20/dozzle/internal/auth"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 )
 
 type GenerateCmd struct {
@@ -17,6 +19,8 @@ type GenerateCmd struct {
 }
 
 func (g *GenerateCmd) Run(args Args, embeddedCerts embed.FS) error {
+	writer := zerolog.NewConsoleWriter()
+	log.Logger = log.Output(writer)
 	StartEvent(args, "", nil, "generate")
 	if args.Generate.Username == "" || args.Generate.Password == "" {
 		return fmt.Errorf("username and password are required")

internal/support/cli/health_command.go

@@ -8,43 +8,28 @@ import (
 	"path/filepath"
 
 	"github.com/amir20/dozzle/internal/healthcheck"
+	"github.com/rs/zerolog/log"
 )
 
-type HealthcheckCmd struct {
-}
+type HealthcheckCmd struct{}
 
 func (h *HealthcheckCmd) Run(args Args, embeddedCerts embed.FS) error {
-	files, err := os.ReadDir(".")
-	if err != nil {
-		return fmt.Errorf("failed to read directory: %w", err)
-	}
-
-	agentAddress := ""
-	for _, file := range files {
-		if match, _ := filepath.Match("agent-*.addr", file.Name()); match {
-			data, err := os.ReadFile(file.Name())
-			if err != nil {
-				return fmt.Errorf("failed to read file: %w", err)
-			}
-			agentAddress = string(data)
-			break
+	if matches, err := filepath.Glob("/tmp/agent-*.addr"); err == nil && len(matches) == 1 {
+		data, err := os.ReadFile(matches[0])
+		if err != nil {
+			return fmt.Errorf("failed to read file: %w", err)
 		}
-	}
-	if agentAddress == "" {
-		if err := healthcheck.HttpRequest(args.Addr, args.Base); err != nil {
-			return fmt.Errorf("failed to make request: %w", err)
-		}
-	} else {
+		agentAddress := string(data)
 		certs, err := ReadCertificates(embeddedCerts)
 		if err != nil {
 			return fmt.Errorf("failed to read certificates: %w", err)
 		}
 		ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
 		defer cancel()
-		if err := healthcheck.RPCRequest(ctx, agentAddress, certs); err != nil {
-			return fmt.Errorf("failed to make request: %w", err)
-		}
+		log.Info().Str("address", agentAddress).Msg("Making RPC request to agent")
+		return healthcheck.RPCRequest(ctx, agentAddress, certs)
+	} else {
+		log.Info().Str("address", args.Addr).Str("base", args.Base).Msg("Making HTTP request to server")
+		return healthcheck.HttpRequest(args.Addr, args.Base)
 	}
-
-	return nil
 }

internal/web/logs.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"compress/gzip"
 	"context"
 	"errors"
 	"regexp"
@@ -111,7 +112,15 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 		lastSeenId = uint32(num)
 	}
 
-	encoder := json.NewEncoder(w)
+	var encoder *json.Encoder
+	if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+		w.Header().Set("Content-Encoding", "gzip")
+		writer := gzip.NewWriter(w)
+		defer writer.Close()
+		encoder = json.NewEncoder(writer)
+	} else {
+		encoder = json.NewEncoder(w)
+	}
 
 	for {
 		if buffer.Len() > minimum {

internal/web/version.go

@@ -3,9 +3,11 @@ package web
 import (
 	"fmt"
 	"net/http"
+
+	"github.com/amir20/dozzle/internal/support/cli"
 )
 
 func (h *handler) version(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add("Content-Type", "text/html")
-	fmt.Fprintf(w, "<pre>%v</pre>", h.config.Version)
+	fmt.Fprintf(w, "<pre>%v  commit: %v</pre>", h.config.Version, cli.SHA)
 }

locales/da.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Kopieret
     message: Log kopieret til clipboard
+analytics:
+  creating_table: Opretter midlertidig tabel...
+  downloading: Henter containerlogfiler... ({size})
+  evaluating_query: Evaluerer forespørgsel...
+  total_records: I alt {count} poster.
+  showing_first: Viser de første {count}.

locales/de.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Kopiert
     message: Log in Zwischenablage kopiert
+analytics:
+  creating_table: Temporäre Tabelle wird erstellt...
+  downloading: Container-Logs werden abgerufen... ({size})
+  evaluating_query: Abfrage wird ausgewertet...
+  total_records: Insgesamt {count} Datensätze.
+  showing_first: Zeige die ersten {count}.

locales/en.yml

@@ -119,3 +119,9 @@ toasts:
   copied:
     title: Copied
     message: Log copied to clipboard
+analytics:
+  creating_table: Creating temporary table...
+  downloading: Fetching container logs... ({size})
+  evaluating_query: Evaluating query...
+  total_records: Total {count} records.
+  showing_first: Showing first {count}.

locales/es.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Copiado
     message: Registro copiado al portapapeles
+analytics:
+  creating_table: Creando tabla temporal...
+  downloading: Obteniendo registros de contenedores... ({size})
+  evaluating_query: Evaluando consulta...
+  total_records: Total {count} registros.
+  showing_first: Mostrando los primeros {count}.

locales/fr.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Copié
     message: Journal copié dans le presse-papiers
+analytics:
+  creating_table: Création d'une table temporaire...
+  downloading: Récupération des journaux des conteneurs... ({size})
+  evaluating_query: Évaluation de la requête...
+  total_records: Total de {count} enregistrements.
+  showing_first: Affichage des {count} premiers.

locales/it.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Copiato
     message: Log copiato nella clipboard
+analytics:
+  creating_table: Creazione tabella temporanea...
+  downloading: Recupero dei log dei container... ({size})
+  evaluating_query: Valutazione della query...
+  total_records: Totale {count} record.
+  showing_first: Mostrati i primi {count}.

locales/pl.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Skopiowany
     message: Log skopiowany do schowka
+analytics:
+  creating_table: Tworzenie tymczasowej tabeli...
+  downloading: Pobieranie logów kontenerów... ({size})
+  evaluating_query: Przetwarzanie zapytania...
+  total_records: Razem {count} rekordów.
+  showing_first: Pokazywanie pierwszych {count}.

locales/pr.yml

@@ -109,3 +109,10 @@ settings:
         start-line: Esta é uma mensagem de erro multi-linha
         middle-line: com uma segunda linha
         end-line: e finalmente uma terceira linha.
+
+analytics:
+  creating_table: A criar tabela temporária...
+  downloading: A obter registos dos contentores... ({size})
+  evaluating_query: A avaliar consulta...
+  total_records: Total de {count} registos.
+  showing_first: A mostrar os primeiros {count}.

locales/pt.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Copiado
     message: Log copiado para a área de transferência
+analytics:
+  creating_table: Criando tabela temporária...
+  downloading: Buscando logs dos containers... ({size})
+  evaluating_query: Avaliando consulta...
+  total_records: Total de {count} registros.
+  showing_first: Mostrando os primeiros {count}.

locales/ru.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: Copied
     message: Log copied to clipboard
+analytics:
+  creating_table: Создание временной таблицы...
+  downloading: Получение логов контейнеров... ({size})
+  evaluating_query: Выполнение запроса...
+  total_records: Всего {count} записей.
+  showing_first: Показаны первые {count}.

locales/tr.yml

@@ -107,3 +107,9 @@ toasts:
   copied:
     title: Kopyalandı
     message: Günlük panoya kopyalandı
+analytics:
+  creating_table: Geçici tablo oluşturuluyor...
+  downloading: Konteyner günlükleri alınıyor... ({size})
+  evaluating_query: Sorgu değerlendiriliyor...
+  total_records: Toplam {count} kayıt.
+  showing_first: İlk {count} gösteriliyor.

locales/zh-tw.yml

@@ -116,4 +116,10 @@ log_actions:
 toasts:
   copied:
     title: 已複製
-    message: 日誌已複製到剪貼簿
+    message: 日誌已複製到剪貼簿
+analytics:
+  creating_table: 正在建立臨時資料表...
+  downloading: 正在取得容器日誌... ({size})
+  evaluating_query: 正在評估查詢...
+  total_records: 共計 {count} 筆記錄。
+  showing_first: 顯示前 {count} 筆。

locales/zh.yml

@@ -114,3 +114,9 @@ toasts:
   copied:
     title: 已复制
     message: 日志已复制到剪贴板
+analytics:
+  creating_table: 正在创建临时表...
+  downloading: 正在获取容器日志... ({size})
+  evaluating_query: 正在评估查询...
+  total_records: 总共 {count} 条记录。
+  showing_first: 显示前 {count} 条。

main.go

@@ -129,6 +129,14 @@ func main() {
 	log.Debug().Msg("shut down complete")
 }
 
+func fileExists(filename string) bool {
+    _, err := os.Stat(filename)
+    if os.IsNotExist(err) {
+        return false
+    }
+    return err == nil
+}
+
 func createServer(args cli.Args, hostService web.HostService) *http.Server {
 	_, dev := os.LookupEnv("DEV")
 
@@ -141,21 +149,21 @@ func createServer(args cli.Args, hostService web.HostService) *http.Server {
 	} else if args.AuthProvider == "simple" {
 		log.Debug().Msg("Using simple authentication")
 		provider = web.SIMPLE
+		
+        userFilePath := "./data/users.yml"
+        if !fileExists(userFilePath) {
+            userFilePath = "./data/users.yaml"
+            if !fileExists(userFilePath) {
+                log.Fatal().Msg("No users.yaml or users.yml file found.")
+            }
+        }
 
-		path, err := filepath.Abs("./data/users.yml")
-		if err != nil {
-			log.Fatal().Err(err).Msg("Could not get absolute path")
-		}
-		if _, err := os.Stat(path); os.IsNotExist(err) {
-			log.Fatal().Msg("users.yml file does not exist")
-		}
+        log.Debug().Msgf("Reading %s file", filepath.Base(userFilePath))
 
-		log.Debug().Str("path", path).Msg("Reading users.yml file")
-
-		db, err := auth.ReadUsersFromFile(path)
-		if err != nil {
-			log.Fatal().Err(err).Msg("Could not read users.yml file")
-		}
+        db, err := auth.ReadUsersFromFile(userFilePath)
+        if err != nil {
+            log.Fatal().Err(err).Msgf("Could not read users file: %s", userFilePath)
+        }
 
 		log.Debug().Int("users", len(db.Users)).Msg("Loaded users")
 		ttl := time.Duration(0)

package.json

@@ -1,12 +1,12 @@
 {
   "name": "dozzle",
-  "version": "8.12.6",
+  "version": "8.12.10",
   "description": "Realtime log viewer for docker containers.",
   "homepage": "https://github.com/amir20/dozzle#readme",
   "bugs": {
     "url": "https://github.com/amir20/dozzle/issues"
   },
-  "packageManager": "pnpm@10.8.0",
+  "packageManager": "pnpm@10.8.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -29,11 +29,11 @@
     "docs:preview": "vitepress preview docs"
   },
   "dependencies": {
-    "@duckdb/duckdb-wasm": "1.29.0",
+    "@duckdb/duckdb-wasm": "1.29.1-dev132.0",
     "@iconify-json/carbon": "^1.2.8",
     "@iconify-json/cil": "^1.2.2",
     "@iconify-json/ic": "^1.2.2",
-    "@iconify-json/material-symbols": "^1.2.18",
+    "@iconify-json/material-symbols": "^1.2.20",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/mdi-light": "^1.2.2",
     "@iconify-json/octicon": "^1.2.5",
@@ -41,7 +41,7 @@
     "@intlify/unplugin-vue-i18n": "^6.0.5",
     "@oddbird/css-anchor-positioning": "^0.5.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "4.1.3",
+    "@tailwindcss/vite": "4.1.4",
     "@vueuse/components": "^13.1.0",
     "@vueuse/core": "^13.1.0",
     "@vueuse/integrations": "^13.1.0",
@@ -55,7 +55,7 @@
     "d3-selection": "^3.0.0",
     "d3-shape": "^3.2.0",
     "d3-transition": "^3.0.1",
-    "daisyui": "5.0.17",
+    "daisyui": "5.0.27",
     "date-fns": "^4.1.0",
     "entities": "^6.0.0",
     "fuse.js": "^7.1.0",
@@ -64,13 +64,13 @@
     "sortablejs": "^1.15.6",
     "splitpanes": "^4.0.3",
     "strip-ansi": "^7.1.0",
-    "tailwindcss": "4.1.3",
+    "tailwindcss": "4.1.4",
     "unplugin-auto-import": "^19.1.2",
     "unplugin-icons": "^22.1.0",
-    "unplugin-vue-components": "^28.4.1",
+    "unplugin-vue-components": "^28.5.0",
     "unplugin-vue-macros": "^2.14.5",
     "unplugin-vue-router": "^0.12.0",
-    "vite": "6.2.5",
+    "vite": "6.3.2",
     "vite-plugin-compression2": "^1.3.3",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-svg-loader": "^5.1.0",
@@ -81,10 +81,10 @@
   },
   "devDependencies": {
     "@apache-arrow/esnext-esm": "^19.0.1",
-    "@iconify-json/material-symbols-light": "^1.2.18",
+    "@iconify-json/material-symbols-light": "^1.2.20",
     "@iconify-json/ri": "^1.2.5",
     "@pinia/testing": "^1.0.1",
-    "@playwright/test": "^1.51.1",
+    "@playwright/test": "^1.52.0",
     "@types/d3-array": "^3.2.1",
     "@types/d3-ease": "^3.0.2",
     "@types/d3-scale": "^4.0.9",
@@ -92,7 +92,7 @@
     "@types/d3-shape": "^3.1.7",
     "@types/d3-transition": "^3.0.9",
     "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "@vitejs/plugin-vue": "5.2.3",
     "@vue/compiler-sfc": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
@@ -100,8 +100,8 @@
     "c8": "^10.1.3",
     "concurrently": "^9.1.2",
     "eventsourcemock": "^2.0.0",
-    "jsdom": "^26.0.0",
-    "lint-staged": "^15.5.0",
+    "jsdom": "^26.1.0",
+    "lint-staged": "^15.5.1",
     "prettier": "^3.5.3",
     "prettier-plugin-tailwindcss": "^0.6.11",
     "simple-git-hooks": "^2.12.1",

protos/types.proto

@@ -25,6 +25,7 @@ message Container {
   google.protobuf.Timestamp finished = 16;
   uint64 memoryLimit = 17;
   double cpuLimit = 18;
+  bool fullyLoaded = 19;
 }
 
 message ContainerStat {