wip oidc

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

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -23,6 +23,7 @@ body:
         - Agents
         - Remote Hosts
         - Swarm Mode
+        - Kubernetes
     validations:
       required: true
   - type: input

.github/funding.yml

@@ -0,0 +1 @@
+buy_me_a_coffee: amirraminfar

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.x
+          go-version: 1.24.1
           check-latest: true
       - name: Checkout code
         uses: actions/checkout@v4
@@ -90,14 +90,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Login to DockerHub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -121,7 +121,7 @@ jobs:
           echo "${{ secrets.TTL_KEY }}" > shared_key.pem
           echo "${{ secrets.TTL_CERT }}" > shared_cert.pem
       - name: Build and push
-        uses: docker/build-push-action@v6.13.0
+        uses: docker/build-push-action@v6.15.0
         with:
           push: true
           context: .

.github/workflows/dev.yml

@@ -13,14 +13,14 @@ jobs:
     if: ${{ !github.event.repository.fork && !github.event.pull_request.head.repo.fork && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'amir20/dozzle') }}
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
       - name: Login to DockerHub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -39,7 +39,7 @@ jobs:
           echo "${{ secrets.TTL_KEY }}" > shared_key.pem
           echo "${{ secrets.TTL_CERT }}" > shared_cert.pem
       - name: Build and push
-        uses: docker/build-push-action@v6.13.0
+        uses: docker/build-push-action@v6.15.0
         with:
           context: .
           push: true

.github/workflows/test.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version: "1.24.1"
           check-latest: true
       - name: Checkout code
         uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24"
+          go-version: "1.24.1"
           check-latest: true
       - name: Generate dependencies
         run: make fake_assets shared_key.pem shared_cert.pem

.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Debug test",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/main.go",
-      "args": ["test"]
-    }
-  ]
-}

.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-  "i18n-ally.localesPaths": ["locales"],
-  "i18n-ally.keystyle": "nested",
-  "cSpell.words": ["healthcheck", "orderedmap", "Retriable", "stdcopy", "Warnf"],
-  "editor.formatOnSave": true,
-  "i18n-ally.extract.autoDetect": true
-}

Dockerfile

@@ -1,5 +1,5 @@
 # Build assets
-FROM --platform=$BUILDPLATFORM node:23.7.0-alpine AS node
+FROM --platform=$BUILDPLATFORM node:23.10.0-alpine AS node
 
 RUN corepack enable
 

README.md

@@ -97,9 +97,9 @@ Once you have the podman remote socket you can run Dozzle on podman.
 podman run --volume=/run/user/1000/podman/podman.sock:/var/run/docker.sock -d -p 8080:8080 docker.io/amir20/dozzle:latest
 ```
 
-Additionally you have to create a fake engine-id to prevent ```host not found``` errors. Podman doesn't generate an engine-id like Docker by itself due to its daemonless architecture.
+Additionally you have to create a fake engine-id to prevent `host not found` errors. Podman doesn't generate an engine-id like Docker by itself due to its daemonless architecture.
 
-Under ```/var/lib/docker``` create a file named ```engine-id```. On a system with Podman you will have to create the folder path as well. Inside the file place the UUID, for instance using ```uuidgen > engine-id```. After that the file should have an identifier that looks like this: ```b9f1d7fc-b459-4b6e-9f7a-e3d1cd2e14a9```.
+Under `/var/lib/docker` create a file named `engine-id`. On a system with Podman you will have to create the folder path as well. Inside the file place the UUID, for instance using `uuidgen > engine-id`. After that the file should have an identifier that looks like this: `b9f1d7fc-b459-4b6e-9f7a-e3d1cd2e14a9`.
 
 For more details check [Podman Infos](docs/guide/podman.md) or the [FAQ](docs/guide/faq.md#i-am-seeing-host-not-found-error-in-the-logs-how-do-i-fix-it)
 
@@ -127,12 +127,14 @@ Dozzle follows the [12-factor](https://12factor.net/) model. Configurations can
 | `--auth-header-user`  | `DOZZLE_AUTH_HEADER_USER`  | `Remote-User`  |
 | `--auth-header-email` | `DOZZLE_AUTH_HEADER_EMAIL` | `Remote-Email` |
 | `--auth-header-name`  | `DOZZLE_AUTH_HEADER_NAME`  | `Remote-Name`  |
-| `--enable-actions`    | `DOZZLE_ENABLE_ACTIONS`    | false          |
+| `--enable-actions`    | `DOZZLE_ENABLE_ACTIONS`    | `false`        |
 | `--filter`            | `DOZZLE_FILTER`            | `""`           |
-| `--no-analytics`      | `DOZZLE_NO_ANALYTICS`      | false          |
+| `--no-analytics`      | `DOZZLE_NO_ANALYTICS`      | `false`        |
 | `--mode`              | `DOZZLE_MODE`              | `server`       |
 | `--remote-host`       | `DOZZLE_REMOTE_HOST`       |                |
 | `--remote-agent`      | `DOZZLE_REMOTE_AGENT`      |                |
+| `--timeout`           | `DOZZLE_TIMEOUT`           | `10s`          |
+| `--namespace`         | `DOZZLE_NAMESPACE`         | `""`           |
 
 ## Support
 

assets/App.vue

@@ -15,6 +15,7 @@ watchEffect(() => {
   if (theme === "auto") {
     theme = mode.value;
   }
+  document.querySelector('meta[name="theme-color"]')?.setAttribute("content", theme == "dark" ? "#121212" : "#3FA68F");
   document.documentElement.setAttribute("data-theme", theme);
 });
 </script>

assets/auto-imports.d.ts

@@ -31,6 +31,7 @@ declare global {
   const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
   const createPinia: typeof import('pinia')['createPinia']
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
+  const createRef: typeof import('@vueuse/core')['createRef']
   const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
   const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
   const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
@@ -421,6 +422,7 @@ declare module 'vue' {
     readonly createInjectionState: UnwrapRef<typeof import('@vueuse/core')['createInjectionState']>
     readonly createPinia: UnwrapRef<typeof import('pinia')['createPinia']>
     readonly createReactiveFn: UnwrapRef<typeof import('@vueuse/core')['createReactiveFn']>
+    readonly createRef: UnwrapRef<typeof import('@vueuse/core')['createRef']>
     readonly createReusableTemplate: UnwrapRef<typeof import('@vueuse/core')['createReusableTemplate']>
     readonly createSharedComposable: UnwrapRef<typeof import('@vueuse/core')['createSharedComposable']>
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>

assets/components.d.ts

@@ -2,6 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
 export {}
 
 /* prettier-ignore */
@@ -61,6 +62,7 @@ declare module 'vue' {
     LogMessageActions: typeof import('./components/LogViewer/LogMessageActions.vue')['default']
     LogStd: typeof import('./components/LogViewer/LogStd.vue')['default']
     LogViewer: typeof import('./components/LogViewer/LogViewer.vue')['default']
+    'MaterialSymbols:terminal': typeof import('~icons/material-symbols/terminal')['default']
     'Mdi:account': typeof import('~icons/mdi/account')['default']
     'Mdi:announcement': typeof import('~icons/mdi/announcement')['default']
     'Mdi:arrowUp': typeof import('~icons/mdi/arrow-up')['default']
@@ -102,6 +104,7 @@ declare module 'vue' {
     'Ph:stackSimple': typeof import('~icons/ph/stack-simple')['default']
     Popup: typeof import('./components/Popup.vue')['default']
     RandomColorTag: typeof import('./components/LogViewer/RandomColorTag.vue')['default']
+    'Ri:terminalWindowFill': typeof import('~icons/ri/terminal-window-fill')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     ScrollableView: typeof import('./components/ScrollableView.vue')['default']
@@ -120,6 +123,7 @@ declare module 'vue' {
     StatSparkline: typeof import('./components/LogViewer/StatSparkline.vue')['default']
     SwarmMenu: typeof import('./components/SwarmMenu.vue')['default']
     Tag: typeof import('./components/common/Tag.vue')['default']
+    Terminal: typeof import('./components/Terminal.vue')['default']
     TimedButton: typeof import('./components/common/TimedButton.vue')['default']
     ToastModal: typeof import('./components/common/ToastModal.vue')['default']
     Toggle: typeof import('./components/common/Toggle.vue')['default']

assets/components/ContainerViewer/ContainerActionsToolbar.vue

@@ -134,6 +134,20 @@
           </button>
         </li>
       </template>
+
+      <li class="line"></li>
+      <li>
+        <a @click.prevent="showDrawer(Terminal, { container, action: 'attach' }, 'lg')">
+          <ri:terminal-window-fill /> Attach
+          <KeyShortcut char="a" :modifiers="['shift', 'meta']" />
+        </a>
+      </li>
+      <li>
+        <a @click.prevent="showDrawer(Terminal, { container, action: 'exec' }, 'lg')">
+          <material-symbols:terminal /> Shell
+          <KeyShortcut char="e" :modifiers="['shift', 'meta']" />
+        </a>
+      </li>
     </ul>
   </div>
 </template>
@@ -142,6 +156,7 @@
 import { Container } from "@/models/Container";
 import { allLevels } from "@/composable/logContext";
 import LogAnalytics from "../LogViewer/LogAnalytics.vue";
+import Terminal from "@/components/Terminal.vue";
 
 const { showSearch } = useSearchFilter();
 const { enableActions } = config;
@@ -161,6 +176,20 @@ onKeyStroke("f", (e) => {
   }
 });
 
+onKeyStroke("a", (e) => {
+  if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
+    showDrawer(Terminal, { container, action: "attach" }, "lg");
+    e.preventDefault();
+  }
+});
+
+onKeyStroke("e", (e) => {
+  if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
+    showDrawer(Terminal, { container, action: "exec" }, "lg");
+    e.preventDefault();
+  }
+});
+
 const downloadParams = computed(() =>
   Object.entries(toValue(streamConfig))
     .filter(([, value]) => value)

assets/components/ContainerViewer/ContainerTitle.vue

@@ -62,9 +62,9 @@ const store = useContainerStore();
 const { containers: allContainers } = storeToRefs(store);
 
 const otherContainers = computed(() =>
-  [...allContainers.value.filter((c) => c.name === container.name && c.id !== container.id)].sort(
-    (a, b) => +b.created - +a.created,
-  ),
+  allContainers.value
+    .filter((c) => c.name === container.name && c.id !== container.id)
+    .sort((a, b) => +b.created - +a.created),
 );
 const wrapper = useTemplateRef("wrapper");
 

assets/components/LogViewer/LogDetails.vue

@@ -72,7 +72,6 @@
 
 <script setup lang="ts">
 import { ComplexLogEntry } from "@/models/LogEntry";
-import { useSortable } from "@vueuse/integrations/useSortable";
 import { UseClipboard } from "@vueuse/components";
 
 const { entry } = defineProps<{ entry: ComplexLogEntry }>();
@@ -82,6 +81,8 @@ const container = currentContainer(toRef(() => entry.containerID));
 const visibleKeys = persistentVisibleKeysForContainer(container);
 const { hosts } = useHosts();
 
+const { useSortable } = await import("@vueuse/integrations/useSortable");
+
 function toggleField(key: string[]) {
   if (visibleKeys.value.size === 0) {
     visibleKeys.value = new Map<string[], boolean>(fields.value.map(({ key }) => [key, true]));
@@ -146,8 +147,8 @@ function syntaxHighlight(json: any) {
     /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|\b\d+\b)/g,
     function (match: string) {
       var cls = "json-number";
-      if (/^"/.test(match)) {
-        if (/:$/.test(match)) {
+      if (match.startsWith('"')) {
+        if (match.endsWith(":")) {
           cls = "json-key";
         } else {
           cls = "json-string";

assets/components/LogViewer/SimpleLogItem.vue

@@ -19,8 +19,8 @@ import stripAnsi from "strip-ansi";
 
 const ansiConvertor = new AnsiConvertor({
   escapeXML: false,
-  fg: "oklch(var(--base-content-color))",
-  bg: "oklch(var(--base-color))",
+  fg: "var(--color-base-content)",
+  bg: "var(--color-base-100)",
 });
 
 defineProps<{
@@ -29,7 +29,7 @@ defineProps<{
 
 const colorize = (value: string) => ansiConvertor.toHtml(value);
 const urlPattern =
-  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&\/=]*/g;
+  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&/=]*/g;
 const linkify = (text: string) =>
   text.replace(urlPattern, (url) => `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`);
 </script>

assets/components/Terminal.vue

@@ -0,0 +1,79 @@
+<template>
+  <aside>
+    <header class="flex items-center gap-4">
+      <material-symbols:terminal class="size-8" />
+      <h1 class="text-2xl max-md:hidden">{{ container.name }}</h1>
+      <h2 class="text-sm">Started <DistanceTime :date="container.created" /></h2>
+    </header>
+
+    <div class="mt-8 flex flex-col gap-2">
+      <section>
+        <div ref="host" class="shell"></div>
+      </section>
+    </div>
+  </aside>
+</template>
+
+<script setup lang="ts">
+import { Container } from "@/models/Container";
+import "@xterm/xterm/css/xterm.css";
+const { container, action } = defineProps<{ container: Container; action: "attach" | "exec" }>();
+
+const { Terminal } = await import("@xterm/xterm");
+const { WebLinksAddon } = await import("@xterm/addon-web-links");
+
+const host = useTemplateRef<HTMLDivElement>("host");
+const terminal = new Terminal({
+  cursorBlink: true,
+  cursorStyle: "block",
+});
+terminal.loadAddon(new WebLinksAddon());
+
+let ws: WebSocket | null = null;
+
+onMounted(() => {
+  terminal.open(host.value!);
+  terminal.resize(100, 40);
+  ws = new WebSocket(withBase(`/api/hosts/${container.host}/containers/${container.id}/${action}`));
+  ws.onopen = () => {
+    terminal.writeln(`Attached to ${container.name} 🚀`);
+    if (action === "attach") {
+      ws?.send("\r");
+    }
+    terminal.onData((data) => {
+      ws?.send(data);
+    });
+    terminal.focus();
+  };
+  ws.onmessage = (event) => terminal.write(event.data);
+  ws.addEventListener("close", () => {
+    terminal.writeln("⚠️ Connection closed");
+  });
+});
+
+onUnmounted(() => {
+  console.log("Closing WebSocket");
+  terminal.dispose();
+  ws?.close();
+});
+</script>
+<style scoped>
+@import "@/main.css" reference;
+
+.shell {
+  & :deep(.terminal) {
+    @apply overflow-hidden rounded border-1 p-2;
+    &:is(.focus) {
+      @apply border-primary;
+    }
+  }
+
+  & :deep(.xterm-viewport) {
+    @apply bg-base-200!;
+  }
+
+  & :deep(.xterm-rows) {
+    @apply text-base-content;
+  }
+}
+</style>

assets/components/common/SideDrawer.vue

@@ -2,7 +2,7 @@
   <dialog ref="panel" class="modal-right modal items-start outline-hidden backdrop:bg-none">
     <div class="modal-box" :width="width">
       <form method="dialog">
-        <button class="swap swap-rotate hover:swap-active absolute top-4 right-4 outline-hidden">
+        <button class="swap hover:swap-active absolute top-4 right-4 outline-hidden">
           <mdi:keyboard-esc class="swap-off" />
           <mdi:close class="swap-on" />
         </button>

assets/composable/profileStorage.ts

@@ -29,7 +29,7 @@ export function useProfileStorage<K extends keyof Profile>(
     if (transformer) {
       storage.value = transformer.from(config.profile[key]);
     } else if (storage.value instanceof Set && config.profile[key] instanceof Array) {
-      storage.value = new Set([...(config.profile[key] as Iterable<any>)]) as unknown as NonNullable<Profile[K]>;
+      storage.value = new Set(config.profile[key] as Iterable<any>) as unknown as NonNullable<Profile[K]>;
     } else if (config.profile[key] instanceof Array) {
       storage.value = config.profile[key] as NonNullable<Profile[K]>;
     } else if (config.profile[key] instanceof Object) {

assets/layouts/default.vue

@@ -5,7 +5,7 @@
       <Pane min-size="10" :size="menuWidth" v-if="!isMobile && !collapseNav && !forceMenuHidden">
         <SidePanel @search="showFuzzySearch" />
       </Pane>
-      <Pane min-size="10">
+      <Pane min-size="10" :size="100 - menuWidth">
         <Splitpanes>
           <Pane class="router-view min-h-screen">
             <router-view></router-view>
@@ -91,9 +91,9 @@ function showFuzzySearch() {
   open.value = true;
 }
 
-function onResized(e: any) {
-  if (e.length == 2) {
-    menuWidth.value = e[0].size;
+function onResized({ panes }: { panes: { size: number }[] }) {
+  if (panes.length == 2) {
+    menuWidth.value = Math.min(panes[0].size, 50);
   }
 }
 </script>
@@ -102,7 +102,7 @@ function onResized(e: any) {
 @import "@/main.css" reference;
 
 :deep(.splitpanes--vertical > .splitpanes__splitter) {
-  @apply bg-base-100 hover:bg-secondary min-w-[3px];
+  @apply bg-base-100 hover:bg-secondary min-w-[5px];
 }
 
 @media screen and (max-width: 768px) {

assets/main.css

@@ -126,3 +126,14 @@
     }
   }
 }
+
+nav {
+  padding-top: env(safe-area-inset-top);
+}
+
+body {
+  padding-top: env(safe-area-inset-top);
+  padding-bottom: env(safe-area-inset-bottom);
+  padding-left: env(safe-area-inset-left);
+  padding-right: env(safe-area-inset-right);
+}

docker-compose.yml

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

docs/.vitepress/config.ts

@@ -59,6 +59,14 @@ export default defineConfig({
           { text: "Getting Started", link: "/guide/getting-started" },
         ],
       },
+      {
+        text: "Platforms",
+        items: [
+          { text: "Swarm", link: "/guide/swarm-mode" },
+          { text: "K8s", link: "/guide/k8s" },
+          { text: "Podman", link: "/guide/podman" },
+        ],
+      },
       {
         text: "Advanced Configuration",
         items: [
@@ -73,9 +81,6 @@ export default defineConfig({
           { text: "Filters", link: "/guide/filters" },
           { text: "Healthcheck", link: "/guide/healthcheck" },
           { text: "Remote Hosts", link: "/guide/remote-hosts" },
-          { text: "Swarm Mode", link: "/guide/swarm-mode" },
-          { text: "K8s Mode", link: "/guide/k8s" },
-          { text: "Supported Env Vars", link: "/guide/supported-env-vars" },
           { text: "Logging Files on Disk", link: "/guide/log-files-on-disk" },
           { text: "SQL Engine", link: "/guide/sql-engine" },
         ],
@@ -85,6 +90,7 @@ export default defineConfig({
         items: [
           { text: "FAQ", link: "/guide/faq" },
           { text: "Debugging", link: "/guide/debugging" },
+          { text: "Supported Env Vars", link: "/guide/supported-env-vars" },
         ],
       },
       {

docs/.vitepress/theme/index.ts

@@ -8,6 +8,7 @@ import HeroVideo from "./components/HeroVideo.vue";
 import BuyMeCoffee from "./components/BuyMeCoffee.vue";
 import Stats from "./components/Stats.vue";
 import Banner from "./components/Banner.vue";
+import Supported from "./components/Supported.vue";
 
 export default {
   ...DefaultTheme,
@@ -16,7 +17,8 @@ export default {
       "home-hero-image": () => h(HeroVideo),
       "sidebar-nav-after": () => h(BuyMeCoffee),
       "home-hero-actions-after": () => h(Stats),
-      "layout-top": () => h(Banner),
+      // "layout-top": () => h(Banner),
+      "home-hero-after": () => h(Supported),
     });
   },
   enhanceApp(ctx) {

docs/components.d.ts

@@ -2,6 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
 export {}
 
 /* prettier-ignore */
@@ -14,5 +15,6 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Stats: typeof import('./.vitepress/theme/components/Stats.vue')['default']
+    Supported: typeof import('./.vitepress/theme/components/Supported.vue')['default']
   }
 }

docs/guide/actions.md

@@ -4,9 +4,7 @@ title: Container Actions
 
 # Using Container Actions
 
-Dozzle now supports **Container Actions**, which allows you to `start`, `stop` and `restart` containers from within the UI in the dropdown menu.
-
-This feature is **disabled** by default and can be enabled by setting the environment variable `DOZZLE_ENABLE_ACTIONS` to `true`.
+Dozzle supports Container Actions, which allows you to `start`, `stop` and `restart` containers from within the UI in the dropdown menu. This feature is **disabled** by default and can be enabled by setting the environment variable `DOZZLE_ENABLE_ACTIONS` to `true`.
 
 ::: code-group
 

docs/guide/agent.md

@@ -2,7 +2,7 @@
 title: Agent Mode
 ---
 
-# Agent Mode
+# Agent Mode <Badge type="warning" text="Docker Only" />
 
 Dozzle can run in agent mode which can expose Docker hosts to other Dozzle instances. All communication is done over a secured connection using TLS. This means that you can deploy Dozzle on a remote host and connect to it from your local machine.
 

docs/guide/getting-started.md

@@ -4,9 +4,12 @@ title: Getting Started
 
 # Getting Started
 
-Dozzle supports multiple ways to run the application. You can run it using Docker CLI, Docker Compose, or in Swarm. The following sections will guide you through the process of setting up Dozzle.
+Dozzle supports multiple ways to run the application. You can run it using Docker CLI, Docker Compose, Swarm, or Kubernetes. The following sections will guide you through the process of setting up Dozzle.
 
-## Running with Docker <Badge type="tip" text="Updated" />
+> [!TIP]
+> If Docker Hub is blocked in your network, you can use the [GitHub Container Registry](https://ghcr.io/amir20/dozzle:latest) to pull the image. Use `ghcr.io/amir20/dozzle:latest` instead of `amir20/dozzle:latest`.
+
+## Standalone Docker
 
 The easiest way to set up Dozzle is to use the CLI and mount `docker.sock` file. This file is usually located at `/var/run/docker.sock` and can be mounted with the `--volume` flag. You also need to expose the port to view Dozzle. By default, Dozzle listens on port 8080, but you can change the external port using `-p`. You can also run using compose or as a service in Swarm.
 
@@ -27,6 +30,14 @@ services:
       - 8080:8080
 ```
 
+:::
+
+Dozzle also supports connecting to remote agents to monitor multiple Docker hosts. See [agent](/guide/agent) to learn more.
+
+## Docker Swarm
+
+Dozzle supports running in Swarm mode by deploying it on every node. To run Dozzle in Swarm mode, you can use the following configuration:
+
 ```yaml [dozzle-stack.yml]
 # Run with docker stack deploy -c dozzle-stack.yml <name>
 services:
@@ -47,6 +58,18 @@ networks:
     driver: overlay
 ```
 
+Then you can deploy the stack using the following command:
+
+```bash
+docker stack deploy -c dozzle-stack.yml <name>
+```
+
+See [swarm mode](/guide/swarm-mode) for more information.
+
+## K8s <Badge type="tip" text="New" />
+
+Dozzle supports running in Kubernetes. It only needs to be deployed on one node within the cluster.
+
 ```yaml [k8s-dozzle.yml]
 # rbac.yaml
 apiVersion: v1
@@ -107,9 +130,10 @@ spec:
               value: "k8s"
 ```
 
-:::
+Then apply the configuration using the following command:
 
-See [swarm mode](/guide/swarm-mode) for more information on running Dozzle in Swarm and [Kubernetes](/guide/k8s) for running Dozzle in Kubernetes.
+```bash
+kubectl apply -f k8s-dozzle.yml
+```
 
-> [!TIP]
-> If Docker Hub is blocked in your network, you can use the [GitHub Container Registry](https://ghcr.io/amir20/dozzle:latest) to pull the image. Use `ghcr.io/amir20/dozzle:latest` instead of `amir20/dozzle:latest`.
+See [Kubernetes mode](/guide/k8s) for more information.

docs/guide/k8s.md

@@ -50,7 +50,6 @@ kind: Deployment
 metadata:
   name: dozzle
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: dozzle
@@ -90,3 +89,83 @@ All other features are supported as well, including authentication, filtering, a
 
 > [!NOTE]
 > Dozzle in Kubernetes is a new feature and may have some limitations compared to the Docker version. Please use this [discussion](https://github.com/amir20/dozzle/discussions/3614) to report any issues or suggestions for improvement.
+
+## Metrics API
+
+Dozzle relies on the [Kubernetes Metrics API](https://github.com/kubernetes-sigs/metrics-server) to retrieve resource usage information. The API can be installed using the following command:
+
+```bash
+kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+```
+
+To verify that the API is running, you can run the following command:
+
+```bash
+kubectl top pod
+```
+
+For now this is required to use Dozzle in Kubernetes.
+
+## Namespaces and Filters
+
+### Namespaces
+
+By default, Dozzle will monitor all namespaces in the cluster. If you want to restrict Dozzle to a specific namespace, you can set the `DOZZLE_NAMESPACE` environment variable to the name of the namespace.
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dozzle
+spec:
+  selector:
+    matchLabels:
+      app: dozzle
+  template:
+    metadata:
+      labels:
+        app: dozzle
+    spec:
+      serviceAccountName: pod-viewer
+      containers:
+        - name: dozzle
+          image: amir20/dozzle:latest
+          ports:
+            - containerPort: 8080
+          env:
+            - name: DOZZLE_MODE
+              value: "k8s"
+            - name: DOZZLE_NAMESPACE
+              value: "default"
+```
+
+### Labels and Filters
+
+`DOZZLE_FILTER` behave similarlty to Docker filters. You can limit the scope of Dozzle using the `DOZZLE_FILTER` environment variable. For example, to scope only to `env=prod`:
+
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dozzle
+spec:
+  selector:
+    matchLabels:
+      app: dozzle
+  template:
+    metadata:
+      labels:
+        app: dozzle
+    spec:
+      serviceAccountName: pod-viewer
+      containers:
+        - name: dozzle
+          image: amir20/dozzle:latest
+          ports:
+            - containerPort: 8080
+          env:
+            - name: DOZZLE_MODE
+              value: "k8s"
+            - name: DOZZLE_FILTER
+              value: "env=prod"
+```

docs/guide/podman.md

@@ -2,6 +2,10 @@
 title: Podman
 ---
 
+# Podman
+
+Dozzle supports Podman. However, there are some issues with Podman that might prevent Dozzle from working properly. One of the main issues is that Podman doesn't create an engine-id like Docker.
+
 ## I am seeing host not found error in the logs. How do I fix it?
 
 This should be mainly a Podman only error: Using Podman doesn't create an engine-id like Docker.

docs/guide/remote-hosts.md

@@ -9,7 +9,7 @@ Dozzle supports connecting to remote Docker hosts. This is useful when running D
 However, with Dozzle agents, you can connect to remote hosts without exposing the Docker socket. See the [agent](/guide/agent) page for more information.
 
 > [!WARNING]
-> Remote hosts have been replaced with agents. Agents provide a more secure way to connect to remote hosts. Although remote hosts are still supported, it is recommended to use agents. See the [agent](/guide/agent) page for more information and examples. For comparison, see the [comparing agents with remote connections](/guide/agent#comparing-agents-with-remote-connection) section.
+> Remote hosts have been replaced with agents. Agents provide a more secure way to connect to remote hosts. Although remote hosts are still supported, it is recommended to use agents. See the [agent](/guide/agent) page for more information and examples. For comparison, see the [comparing agents with remote connections](/guide/agent#comparing-agents-with-remote-connection) section. I won't be able to investigate user's issues with remote hosts as it is very time consuming.
 
 ## Connecting to Remote Hosts with TLS
 
@@ -45,7 +45,7 @@ services:
 If you are in a private network, then you can use [Docker Socket Proxy](https://github.com/Tecnativa/docker-socket-proxy) which exposes `docker.sock` file without the need for TLS. Dozzle will never try to write to Docker but it will need access to list APIs. The following command will start a proxy with minimal access:
 
 ```sh
-docker container run --privileged -e CONTAINERS=1 -e INFO=1 -v /var/run/docker.sock:/var/run/docker.sock -p 2375:2375 tecnativa/docker-socket-proxy
+$ docker container run --privileged -e CONTAINERS=1 -e INFO=1 -v /var/run/docker.sock:/var/run/docker.sock -p 2375:2375 tecnativa/docker-socket-proxy
 ```
 
 > [!TIP]
@@ -53,12 +53,28 @@ docker container run --privileged -e CONTAINERS=1 -e INFO=1 -v /var/run/docker.s
 
 Running Dozzle without any certificates should work. Here is an example:
 
-```sh
-docker run --volume=/var/run/docker.sock:/var/run/docker.sock -p 8080:8080 amir20/dozzle --remote-host tcp://123.1.1.1:2375
+::: code-group
+
+```sh [cli]
+$ docker run -p 8080:8080 amir20/dozzle --remote-host tcp://123.1.1.1:2375
 ```
 
+```yaml [docker-compose.yml]
+services:
+  dozzle:
+    image: amir20/dozzle:latest
+    ports:
+      - 8080:8080
+    environment:
+      DOZZLE_REMOTE_HOST: tcp://123.1.1.1:2375
+```
+
+:::
+
+When using remote host, mounting `/var/run/docker.sock` is optional. You need to have at least one remote host to connect to.
+
 > [!WARNING]
-> Docker Socket Proxy is not recommended for production use. It is only for private networks.
+> Docker Socket Proxy exposes the Docker API to the internet. This can be a security risk if not properly secured.
 
 ## Adding Labels to Hosts
 

docs/guide/supported-env-vars.md

@@ -22,7 +22,8 @@ Configurations can be done with flags or environment variables. The table below
 | `--mode`              | `DOZZLE_MODE`              | `server`       |
 | `--remote-host`       | `DOZZLE_REMOTE_HOST`       |                |
 | `--remote-agent`      | `DOZZLE_REMOTE_AGENT`      |                |
-| `--timeout`           | `DOZZLE_TIMEOUT`           | `3s`           |
+| `--timeout`           | `DOZZLE_TIMEOUT`           | `10s`          |
+| `--namespace`         | `DOZZLE_NAMESPACE`         | `""`           |
 
 > [!TIP]
 > Some flags like `--remote-host` or `--remote-agent` can be used multiple times. For example, `--remote-agent tcp://167.99.1.1:7007 --remote-agent tcp://167.99.1.2:7007` or comma-separated `DOZZLE_REMOTE_AGENT=tcp://167.99.1.1:7007,tcp://167.99.1.2:7007`.

docs/index.md

@@ -6,7 +6,7 @@ title: Home
 
 hero:
   name: "Dozzle"
-  tagline: Real-time logging and monitoring for Docker in the browser
+  tagline: Simple Container Monitoring and Logging
   actions:
     - theme: brand
       text: Get Started
@@ -14,6 +14,9 @@ hero:
     - theme: alt
       text: View on GitHub
       link: https://github.com/amir20/dozzle
+    - theme: alt
+      text: Support 🙏🏼
+      link: https://www.buymeacoffee.com/amirraminfar
 
 features:
   - title: Self Hosted

docs/package.json

@@ -6,6 +6,6 @@
     "dozzle": "workspace:*"
   },
   "dependencies": {
-    "@fontsource-variable/playfair-display": "^5.1.1"
+    "@fontsource-variable/playfair-display": "^5.2.5"
   }
 }

docs/pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@fontsource-variable/playfair-display':
-        specifier: ^5.1.1
-        version: 5.1.1
+        specifier: ^5.2.5
+        version: 5.2.5
     devDependencies:
       dozzle:
         specifier: workspace:*
@@ -18,9 +18,9 @@ importers:
 
 packages:
 
-  '@fontsource-variable/playfair-display@5.1.1':
-    resolution: {integrity: sha512-89gLVOcVRIp0aayWwTcaLGQxhxDT2ZIv7cFU/BjxcWA8iALi8SrlT7dNHdhakb8MeXc0UUw9n8k6kG+jWvX61A==}
+  '@fontsource-variable/playfair-display@5.2.5':
+    resolution: {integrity: sha512-nzSCC5pbWHjkJBqjPe81cPIC7fqJ6U5DwJ6tec7vF1bQ2DJnaKRBZluRQJuseFpACZLTN8LeN/1gBQEA7PnKOw==}
 
 snapshots:
 
-  '@fontsource-variable/playfair-display@5.1.1': {}
+  '@fontsource-variable/playfair-display@5.2.5': {}

examples/README.md

@@ -0,0 +1,6 @@
+> [!WARNING]
+> This directory contains examples that are used for testing and demonstration purposes. The configurations may vary and use different tags that are not wanted for the production environment.
+
+This directory contains scripts to setup swarm, k8s, and other environments. There is also examples to demonstrate how to use Dozzle with different environments. I use these examples to test and demonstrate the functionality of Dozzle.
+
+For official documentation, please visit [https://dozzle.dev](https://dozzle.dev).

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 v27.5.1+incompatible
+	github.com/docker/docker v28.0.4+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
@@ -15,31 +15,34 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/spf13/afero v1.12.0
+	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/sys v0.30.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/PuerkitoBio/goquery v1.10.2
+	github.com/coreos/go-oidc/v3 v3.13.0
 	github.com/go-chi/chi/v5 v5.2.1
-	github.com/go-chi/jwtauth/v5 v5.3.2
-	github.com/puzpuzpuz/xsync/v3 v3.5.0
-	github.com/rs/zerolog v1.33.0
+	github.com/go-chi/jwtauth/v5 v5.3.3
+	github.com/gorilla/websocket v1.5.3
+	github.com/puzpuzpuz/xsync/v3 v3.5.1
+	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
-	golang.org/x/crypto v0.33.0
-	golang.org/x/sync v0.11.0
-	google.golang.org/grpc v1.70.0
-	google.golang.org/protobuf v1.36.5
-	k8s.io/api v0.32.2
-	k8s.io/apimachinery v0.32.2
-	k8s.io/client-go v0.32.2
-	k8s.io/metrics v0.32.1
+	golang.org/x/crypto v0.36.0
+	golang.org/x/oauth2 v0.28.0
+	golang.org/x/sync v0.12.0
+	google.golang.org/grpc v1.71.0
+	google.golang.org/protobuf v1.36.6
+	k8s.io/api v0.32.3
+	k8s.io/apimachinery v0.32.3
+	k8s.io/client-go v0.32.3
+	k8s.io/metrics v0.32.3
 )
 
 require (
@@ -50,19 +53,20 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -74,8 +78,8 @@ require (
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/jwx/v2 v2.1.3 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -84,27 +88,27 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
-	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
-	go.opentelemetry.io/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.32.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.8.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gotest.tools/v3 v3.0.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
+	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-go 1.24.0
+go 1.24.1

go.sum

@@ -2,8 +2,6 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7O
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU=
-github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY=
 github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
 github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
 github.com/alexflint/go-arg v1.5.1 h1:nBuWUCpuRy0snAG+uIJ6N0UvYxpxA0/ghA/AaHxlT8Y=
@@ -22,59 +20,60 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/coreos/go-oidc/v3 v3.13.0 h1:M66zd0pcc5VxvBNM4pB331Wrsanby+QomQYjN8HamW8=
+github.com/coreos/go-oidc/v3 v3.13.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
-github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+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/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=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
+github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 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.2 h1:s+ON3ATyyMs3Me0kqyuua6Rwu+2zqIIkL0GCaMarwvs=
-github.com/go-chi/jwtauth/v5 v5.3.2/go.mod h1:O4QvPRuZLZghl9WvfVaON+ARfGzpD2PBX/QY5vUz7aQ=
+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-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
+github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 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=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -87,6 +86,8 @@ github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgY
 github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -96,7 +97,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -117,10 +117,11 @@ github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNB
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
 github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -152,13 +153,13 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/puzpuzpuz/xsync/v3 v3.5.0 h1:i+cMcpEDY1BkNm7lPDkCtE4oElsYLn+EKF8kAu2vXT4=
-github.com/puzpuzpuz/xsync/v3 v3.5.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
+github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
 github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
@@ -167,14 +168,12 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
-github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
+github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -182,8 +181,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
@@ -195,22 +192,24 @@ 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=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+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=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -221,8 +220,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -242,12 +241,11 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
 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/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
+golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -257,8 +255,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -275,8 +273,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -286,8 +284,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -297,10 +295,10 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -316,15 +314,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
-google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
+google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -341,29 +338,23 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
-k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
-k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
-k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
-k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
-k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
-k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
-k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
-k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
-k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
-k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
-k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
-k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
+k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
+k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
+k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
+k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
+k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
+k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
-k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
-k8s.io/metrics v0.32.1 h1:Ou4nrEtZS2vFf7OJCf9z3+2kr0A00kQzfoSwxg0gXps=
-k8s.io/metrics v0.32.1/go.mod h1:cLnai9XKYby1tNMX+xe8p9VLzTqrxYPcmqfCBoWObcM=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
+k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
+k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
+k8s.io/metrics v0.32.3 h1:2vsBvw0v8rIIlczZ/lZ8Kcqk9tR6Fks9h+dtFNbc2a4=
+k8s.io/metrics v0.32.3/go.mod h1:9R1Wk5cb+qJpCQon9h52mgkVCcFeYxcY+YkumfwHVCU=
+k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
+k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
+sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

internal/agent/client.go

@@ -395,6 +395,14 @@ func (c *Client) ContainerAction(ctx context.Context, containerId string, action
 	return err
 }
 
+func (c *Client) ContainerAttach(ctx context.Context, containerId string) (io.WriteCloser, io.Reader, error) {
+	panic("not implemented")
+}
+
+func (c *Client) ContainerExec(ctx context.Context, containerId string, cmd []string) (io.WriteCloser, io.Reader, error) {
+	panic("not implemented")
+}
+
 func (c *Client) Close() error {
 	return c.conn.Close()
 }

internal/auth/openid.go

@@ -0,0 +1,60 @@
+package auth
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/coreos/go-oidc/v3/oidc"
+	"golang.org/x/oauth2"
+)
+
+type OpenID struct {
+	provider *oidc.Provider
+}
+
+func NewOpenID(ctx context.Context, issuer string) (*OpenID, error) {
+	provider, err := oidc.NewProvider(ctx, issuer)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create provider: %w", err)
+	}
+
+	return &OpenID{
+		provider: provider,
+	}, nil
+}
+
+func (o *OpenID) CreateToken(ctx context.Context, claims map[string]interface{}) (*oidc.IDToken, error) {
+	config := oauth2.Config{
+		ClientID:     clientID,
+		ClientSecret: clientSecret,
+		Endpoint:     provider.Endpoint(),
+		RedirectURL:  "http://127.0.0.1:5556/auth/google/callback",
+		Scopes:       []string{oidc.ScopeOpenID, "profile", "email"},
+	}
+	token, err := o.provider.NewIDToken(ctx, claims)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create token: %w", err)
+	}
+
+	return token, nil
+}
+
+func (o *OpenID) AuthMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		token, err := o.Verify(r.Context(), r)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusUnauthorized)
+			return
+		}
+
+		userInfo, err := o.UserInfo(r.Context(), token)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusUnauthorized)
+			return
+		}
+
+		ctx := context.WithValue(r.Context(), "user", userInfo)
+		next.ServeHTTP(w, r.WithContext(ctx))
+	})
+}

internal/container/client.go

@@ -38,4 +38,6 @@ type Client interface {
 	Ping(context.Context) error
 	Host() Host
 	ContainerActions(ctx context.Context, action ContainerAction, containerID string) error
+	ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error)
+	ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error)
 }

internal/container/container_store.go

@@ -84,7 +84,7 @@ func (s *ContainerStore) checkConnectivity() error {
 			}
 
 			running := lo.Filter(containers, func(item Container, index int) bool {
-				return item.State != "exited"
+				return item.State != "exited" && !item.FullyLoaded
 			})
 
 			sem := semaphore.NewWeighted(maxFetchParallelism)
@@ -129,6 +129,10 @@ func (s *ContainerStore) ListContainers(labels ContainerLabels) ([]Container, er
 			return nil, err
 		}
 
+		if len(validContainers) == 0 {
+			log.Warn().Interface("userLabels", labels).Msg("no containers found with user labels")
+		}
+
 		validIDMap := lo.KeyBy(validContainers, func(item Container) string {
 			return item.ID
 		})
@@ -168,8 +172,8 @@ func (s *ContainerStore) FindContainer(id string, labels ContainerLabels) (Conta
 	}
 
 	if container, ok := s.containers.Load(id); ok {
-		if container.StartedAt.IsZero() {
-			log.Debug().Str("id", id).Msg("container doesn't have detailed information, fetching it")
+		if !container.FullyLoaded {
+			log.Debug().Str("id", id).Msg("container is not fully loaded, fetching it")
 			if newContainer, ok := s.containers.Compute(id, func(c *Container, loaded bool) (*Container, bool) {
 				if loaded {
 					ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)

internal/container/level_guesser.go

@@ -20,23 +20,18 @@ var logLevels = [][]string{
 	{"fatal", "sev", "severe", "crit", "critical"},
 }
 
-var plainLevels = map[string][]*regexp.Regexp{}
-var bracketLevels = map[string][]*regexp.Regexp{}
+var plainLevels = map[string]*regexp.Regexp{}
+var bracketLevels = map[string]*regexp.Regexp{}
+var separatorLevels = map[string]*regexp.Regexp{}
 var timestampRegex = regexp.MustCompile(`^(?:\d{4}[-/]\d{2}[-/]\d{2}(?:[T ](?:\d{2}:\d{2}:\d{2}(?:\.\d+)?Z?|\d{2}:\d{2}(?:AM|PM)))?\s+)`)
 
 func init() {
 	for _, levelGroup := range logLevels {
 		first := levelGroup[0]
-		for _, level := range levelGroup {
-			plainLevels[first] = append(plainLevels[first], regexp.MustCompile("(?i)^"+level+"[^a-z]"))
-		}
-	}
-
-	for _, levelGroup := range logLevels {
-		first := levelGroup[0]
-		for _, level := range levelGroup {
-			bracketLevels[first] = append(bracketLevels[first], regexp.MustCompile("(?i)\\[ ?"+level+" ?\\]"))
-		}
+		levelsGroup := "(?:" + strings.Join(levelGroup, "|") + ")"
+		plainLevels[first] = regexp.MustCompile("(?i)^" + levelsGroup + "[^a-z]")
+		bracketLevels[first] = regexp.MustCompile("(?i)\\[ ?" + levelsGroup + " ?\\]")
+		separatorLevels[first] = regexp.MustCompile("(?i) " + levelsGroup + "[/-]")
 	}
 
 	SupportedLogLevels = make(map[string]struct{}, len(logLevels)+1)
@@ -54,17 +49,18 @@ func guessLogLevel(logEvent *LogEvent) string {
 		for _, levelGroup := range logLevels {
 			first := levelGroup[0]
 			// Look for the level at the beginning of the message
-			for _, regex := range plainLevels[first] {
-				if regex.MatchString(value) {
-					return first
-				}
+			if plainLevels[first].MatchString(value) {
+				return first
 			}
 
 			// Look for the level in brackets
-			for _, regex := range bracketLevels[first] {
-				if regex.MatchString(value) {
-					return first
-				}
+			if bracketLevels[first].MatchString(value) {
+				return first
+			}
+
+			// Look for the level with a separator after
+			if separatorLevels[first].MatchString(value) {
+				return first
 			}
 
 			// Look for the level in the middle of the message that are uppercase and surrounded by quotes

internal/container/level_guesser_test.go

@@ -14,6 +14,8 @@ func TestGuessLogLevel(t *testing.T) {
 		expected string
 	}{
 		{"2024/12/30 12:21AM INF this is a test", "info"},
+		{"2025-01-07 22:00:08,059: DEBUG/MainProcess TaskPool: ", "debug"},
+		{"Some test with error-test", "error"},
 		{"2024-12-30T17:43:16Z DBG loggging debug from here", "debug"},
 		{"2025-01-07 15:40:15,784 LL=\"ERROR\" some message", "error"},
 		{"2025-01-07 15:40:15,784 LL=\"WARN\" some message", "warn"},
@@ -35,6 +37,7 @@ func TestGuessLogLevel(t *testing.T) {
 		{"123 ERROR Something went wrong", "error"},
 		{"123 Something went wrong", "unknown"},
 		{"DBG Something went wrong", "debug"},
+		{"DBG with more error=msg", "debug"},
 		{"inf Something went wrong", "info"},
 		{"crit: Something went wrong", "fatal"},
 		{orderedmap.New[string, string](

internal/container/types.go

@@ -11,20 +11,21 @@ import (
 
 // Container represents an internal representation of docker containers
 type Container struct {
-	ID         string                           `json:"id"`
-	Name       string                           `json:"name"`
-	Image      string                           `json:"image"`
-	Command    string                           `json:"command"`
-	Created    time.Time                        `json:"created"`
-	StartedAt  time.Time                        `json:"startedAt"`
-	FinishedAt time.Time                        `json:"finishedAt"`
-	State      string                           `json:"state"`
-	Health     string                           `json:"health,omitempty"`
-	Host       string                           `json:"host,omitempty"`
-	Tty        bool                             `json:"-"`
-	Labels     map[string]string                `json:"labels,omitempty"`
-	Stats      *utils.RingBuffer[ContainerStat] `json:"stats,omitempty"`
-	Group      string                           `json:"group,omitempty"`
+	ID          string                           `json:"id"`
+	Name        string                           `json:"name"`
+	Image       string                           `json:"image"`
+	Command     string                           `json:"command"`
+	Created     time.Time                        `json:"created"`
+	StartedAt   time.Time                        `json:"startedAt"`
+	FinishedAt  time.Time                        `json:"finishedAt"`
+	State       string                           `json:"state"`
+	Health      string                           `json:"health,omitempty"`
+	Host        string                           `json:"host,omitempty"`
+	Tty         bool                             `json:"-"`
+	Labels      map[string]string                `json:"labels,omitempty"`
+	Stats       *utils.RingBuffer[ContainerStat] `json:"stats,omitempty"`
+	Group       string                           `json:"group,omitempty"`
+	FullyLoaded bool                             `json:"-,omitempty"`
 }
 
 // ContainerStat represent stats instant for a container

internal/docker/client.go

@@ -24,15 +24,19 @@ import (
 )
 
 type DockerCLI interface {
-	ContainerList(context.Context, docker.ListOptions) ([]types.Container, error)
+	ContainerList(context.Context, docker.ListOptions) ([]docker.Summary, error)
 	ContainerLogs(context.Context, string, docker.LogsOptions) (io.ReadCloser, error)
 	Events(context.Context, events.ListOptions) (<-chan events.Message, <-chan error)
-	ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
+	ContainerInspect(ctx context.Context, containerID string) (docker.InspectResponse, error)
 	ContainerStats(ctx context.Context, containerID string, stream bool) (docker.StatsResponseReader, error)
 	Ping(ctx context.Context) (types.Ping, error)
 	ContainerStart(ctx context.Context, containerID string, options docker.StartOptions) error
 	ContainerStop(ctx context.Context, containerID string, options docker.StopOptions) error
 	ContainerRestart(ctx context.Context, containerID string, options docker.StopOptions) error
+	ContainerAttach(ctx context.Context, containerID string, options docker.AttachOptions) (types.HijackedResponse, error)
+	ContainerExecCreate(ctx context.Context, containerID string, options docker.ExecOptions) (docker.ExecCreateResponse, error)
+	ContainerExecAttach(ctx context.Context, execID string, config docker.ExecAttachOptions) (types.HijackedResponse, error)
+	ContainerExecResize(ctx context.Context, execID string, options docker.ResizeOptions) error
 	Info(ctx context.Context) (system.Info, error)
 }
 
@@ -66,7 +70,7 @@ func NewClient(cli DockerCLI, host container.Host) *DockerClient {
 	}
 }
 
-// NewClientWithFilters creates a new instance of Client with docker filters
+// NewLocalClient creates a new instance of Client with docker filters
 func NewLocalClient(hostname string) (*DockerClient, error) {
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation(), client.WithUserAgent("Docker-Client/Dozzle"))
 
@@ -297,7 +301,55 @@ func (d *DockerClient) Host() container.Host {
 	return d.host
 }
 
-func newContainer(c types.Container, host string) container.Container {
+func (d *DockerClient) ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error) {
+	log.Debug().Str("id", id).Str("host", d.host.Name).Msg("Attaching to container")
+	options := docker.AttachOptions{
+		Stream: true,
+		Stdin:  true,
+		Stdout: true,
+		Stderr: true,
+	}
+
+	waiter, err := d.cli.ContainerAttach(ctx, id, options)
+
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return waiter.Conn, waiter.Reader, nil
+}
+
+func (d *DockerClient) ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error) {
+	log.Debug().Str("id", id).Str("host", d.host.Name).Msg("Executing command in container")
+	options := docker.ExecOptions{
+		AttachStdout: true,
+		AttachStderr: true,
+		AttachStdin:  true,
+		Cmd:          cmd,
+		Tty:          true,
+	}
+
+	execID, err := d.cli.ContainerExecCreate(ctx, id, options)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	waiter, err := d.cli.ContainerExecAttach(ctx, execID.ID, docker.ExecAttachOptions{})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if err = d.cli.ContainerExecResize(ctx, execID.ID, docker.ResizeOptions{
+		Width:  100,
+		Height: 40,
+	}); err != nil {
+		return nil, nil, err
+	}
+
+	return waiter.Conn, waiter.Reader, nil
+}
+
+func newContainer(c docker.Summary, host string) container.Container {
 	name := "no name"
 	if c.Labels["dev.dozzle.name"] != "" {
 		name = c.Labels["dev.dozzle.name"]
@@ -323,7 +375,7 @@ func newContainer(c types.Container, host string) container.Container {
 	}
 }
 
-func newContainerFromJSON(c types.ContainerJSON, host string) container.Container {
+func newContainerFromJSON(c docker.InspectResponse, host string) container.Container {
 	name := "no name"
 	if c.Config.Labels["dev.dozzle.name"] != "" {
 		name = c.Config.Labels["dev.dozzle.name"]
@@ -337,16 +389,17 @@ func newContainerFromJSON(c types.ContainerJSON, host string) container.Containe
 	}
 
 	container := container.Container{
-		ID:      c.ID[:12],
-		Name:    name,
-		Image:   c.Config.Image,
-		Command: strings.Join(c.Config.Entrypoint, " ") + " " + strings.Join(c.Config.Cmd, " "),
-		State:   c.State.Status,
-		Host:    host,
-		Labels:  c.Config.Labels,
-		Stats:   utils.NewRingBuffer[container.ContainerStat](300), // 300 seconds of stats
-		Group:   group,
-		Tty:     c.Config.Tty,
+		ID:          c.ID[:12],
+		Name:        name,
+		Image:       c.Config.Image,
+		Command:     strings.Join(c.Config.Entrypoint, " ") + " " + strings.Join(c.Config.Cmd, " "),
+		State:       c.State.Status,
+		Host:        host,
+		Labels:      c.Config.Labels,
+		Stats:       utils.NewRingBuffer[container.ContainerStat](300), // 300 seconds of stats
+		Group:       group,
+		Tty:         c.Config.Tty,
+		FullyLoaded: true,
 	}
 
 	if createdAt, err := time.Parse(time.RFC3339Nano, c.Created); err == nil {

internal/docker/client_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/docker/docker/api/types"
 	docker "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/system"
 	"github.com/stretchr/testify/assert"
@@ -24,14 +23,13 @@ type mockedProxy struct {
 	DockerCLI
 }
 
-func (m *mockedProxy) ContainerList(context.Context, docker.ListOptions) ([]types.Container, error) {
+func (m *mockedProxy) ContainerList(context.Context, docker.ListOptions) ([]docker.Summary, error) {
 	args := m.Called()
-	containers, ok := args.Get(0).([]types.Container)
+	containers, ok := args.Get(0).([]docker.Summary)
 	if !ok && args.Get(0) != nil {
-		panic("containers is not of type []types.Container")
+		panic("containers is not of type []docker.Summary")
 	}
 	return containers, args.Error(1)
-
 }
 
 func (m *mockedProxy) ContainerLogs(ctx context.Context, id string, options docker.LogsOptions) (io.ReadCloser, error) {
@@ -43,9 +41,9 @@ func (m *mockedProxy) ContainerLogs(ctx context.Context, id string, options dock
 	return reader, args.Error(1)
 }
 
-func (m *mockedProxy) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+func (m *mockedProxy) ContainerInspect(ctx context.Context, containerID string) (docker.InspectResponse, error) {
 	args := m.Called(ctx, containerID)
-	return args.Get(0).(types.ContainerJSON), args.Error(1)
+	return args.Get(0).(docker.InspectResponse), args.Error(1)
 }
 
 func (m *mockedProxy) ContainerStats(ctx context.Context, containerID string, stream bool) (docker.StatsResponseReader, error) {
@@ -112,7 +110,7 @@ func Test_dockerClient_ListContainers_error(t *testing.T) {
 }
 
 func Test_dockerClient_ListContainers_happy(t *testing.T) {
-	containers := []types.Container{
+	containers := []docker.Summary{
 		{
 			ID:    "abcdefghijklmnopqrst",
 			Names: []string{"/z_test_container"},
@@ -185,8 +183,8 @@ func Test_dockerClient_ContainerLogs_error(t *testing.T) {
 func Test_dockerClient_FindContainer_happy(t *testing.T) {
 	proxy := new(mockedProxy)
 
-	state := &types.ContainerState{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
-	json := types.ContainerJSON{ContainerJSONBase: &types.ContainerJSONBase{ID: "abcdefghijklmnopqrst", State: state}, Config: &docker.Config{Tty: false}}
+	state := &docker.State{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
+	json := docker.InspectResponse{ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijklmnopqrst", State: state}, Config: &docker.Config{Tty: false}}
 	proxy.On("ContainerInspect", mock.Anything, "abcdefghijkl").Return(json, nil)
 
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
@@ -201,7 +199,7 @@ func Test_dockerClient_FindContainer_happy(t *testing.T) {
 
 func Test_dockerClient_FindContainer_error(t *testing.T) {
 	proxy := new(mockedProxy)
-	proxy.On("ContainerInspect", mock.Anything, "not_valid").Return(types.ContainerJSON{}, errors.New("not found"))
+	proxy.On("ContainerInspect", mock.Anything, "not_valid").Return(docker.InspectResponse{}, errors.New("not found"))
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
 
 	_, err := client.FindContainer(context.Background(), "not_valid")
@@ -214,8 +212,8 @@ func Test_dockerClient_ContainerActions_happy(t *testing.T) {
 	proxy := new(mockedProxy)
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
 
-	state := &types.ContainerState{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
-	json := types.ContainerJSON{ContainerJSONBase: &types.ContainerJSONBase{ID: "abcdefghijkl", State: state}, Config: &docker.Config{Tty: false}}
+	state := &docker.State{Status: "running", StartedAt: time.Now().Format(time.RFC3339Nano)}
+	json := docker.InspectResponse{ContainerJSONBase: &docker.ContainerJSONBase{ID: "abcdefghijkl", State: state}, Config: &docker.Config{Tty: false}}
 
 	proxy.On("ContainerInspect", mock.Anything, "abcdefghijkl").Return(json, nil)
 	proxy.On("ContainerStart", mock.Anything, "abcdefghijkl", mock.Anything).Return(nil)
@@ -241,7 +239,7 @@ func Test_dockerClient_ContainerActions_error(t *testing.T) {
 
 	proxy := new(mockedProxy)
 	client := &DockerClient{proxy, container.Host{ID: "localhost"}, system.Info{}}
-	proxy.On("ContainerInspect", mock.Anything, "random-id").Return(types.ContainerJSON{}, errors.New("not found"))
+	proxy.On("ContainerInspect", mock.Anything, "random-id").Return(docker.InspectResponse{}, errors.New("not found"))
 	proxy.On("ContainerStart", mock.Anything, mock.Anything, mock.Anything).Return(errors.New("test"))
 	proxy.On("ContainerStop", mock.Anything, mock.Anything, mock.Anything).Return(errors.New("test"))
 	proxy.On("ContainerRestart", mock.Anything, mock.Anything, mock.Anything).Return(errors.New("test"))

internal/k8s/client.go

@@ -85,39 +85,43 @@ func podToContainers(pod *corev1.Pod) []container.Container {
 	var containers []container.Container
 	for _, c := range pod.Spec.Containers {
 		containers = append(containers, container.Container{
-			ID:        pod.Name + ":" + c.Name,
-			Name:      pod.Name + "/" + c.Name,
-			Image:     c.Image,
-			Created:   pod.CreationTimestamp.Time,
-			State:     phaseToState(pod.Status.Phase),
-			StartedAt: started,
-			Command:   strings.Join(c.Command, " "),
-			Host:      pod.Spec.NodeName,
-			Tty:       c.TTY,
-			Stats:     utils.NewRingBuffer[container.ContainerStat](300),
+			ID:          pod.Namespace + ":" + pod.Name + ":" + c.Name,
+			Name:        pod.Name + "/" + c.Name,
+			Image:       c.Image,
+			Created:     pod.CreationTimestamp.Time,
+			State:       phaseToState(pod.Status.Phase),
+			StartedAt:   started,
+			Command:     strings.Join(c.Command, " "),
+			Host:        pod.Spec.NodeName,
+			Tty:         c.TTY,
+			Stats:       utils.NewRingBuffer[container.ContainerStat](300),
+			FullyLoaded: true,
 		})
 	}
 	return containers
 }
 
 func (k *K8sClient) ListContainers(ctx context.Context, labels container.ContainerLabels) ([]container.Container, error) {
-	pods, err := k.Clientset.CoreV1().Pods(k.namespace).List(ctx, metav1.ListOptions{})
+	selector := ""
+	if labels.Exists() {
+		for key, values := range labels {
+			for _, value := range values {
+				if selector != "" {
+					selector += ","
+				}
+				selector += fmt.Sprintf("%s=%s", key, value)
+			}
+		}
+		log.Debug().Str("selector", selector).Msg("Listing containers with labels")
+	}
+	pods, err := k.Clientset.CoreV1().Pods(k.namespace).List(ctx, metav1.ListOptions{LabelSelector: selector})
 	if err != nil {
 		return nil, err
 	}
 
 	var containers []container.Container
 	for _, pod := range pods.Items {
-		for _, c := range pod.Spec.Containers {
-			containers = append(containers, container.Container{
-				ID:      pod.Name + ":" + c.Name,
-				Name:    pod.Name + "/" + c.Name,
-				Image:   c.Image,
-				Created: pod.CreationTimestamp.Time,
-				State:   phaseToState(pod.Status.Phase),
-				Host:    pod.Spec.NodeName,
-			})
-		}
+		containers = append(containers, podToContainers(&pod)...)
 	}
 	return containers, nil
 }
@@ -141,9 +145,9 @@ func phaseToState(phase corev1.PodPhase) string {
 
 func (k *K8sClient) FindContainer(ctx context.Context, id string) (container.Container, error) {
 	log.Debug().Str("id", id).Msg("Finding container")
-	podName, containerName := parsePodContainerID(id)
+	namespace, podName, containerName := parsePodContainerID(id)
 
-	pod, err := k.Clientset.CoreV1().Pods(k.namespace).Get(ctx, podName, metav1.GetOptions{})
+	pod, err := k.Clientset.CoreV1().Pods(namespace).Get(ctx, podName, metav1.GetOptions{})
 	if err != nil {
 		return container.Container{}, err
 	}
@@ -158,20 +162,24 @@ func (k *K8sClient) FindContainer(ctx context.Context, id string) (container.Con
 }
 
 func (k *K8sClient) ContainerLogs(ctx context.Context, id string, since time.Time, stdType container.StdType) (io.ReadCloser, error) {
-	podName, containerName := parsePodContainerID(id)
+	namespace, podName, containerName := parsePodContainerID(id)
+
+	var lines int64 = 500
 	opts := &corev1.PodLogOptions{
 		Container:  containerName,
 		Follow:     true,
 		Previous:   false,
 		Timestamps: true,
 		SinceTime:  &metav1.Time{Time: since},
+		TailLines:  &lines,
 	}
 
-	return k.Clientset.CoreV1().Pods(k.namespace).GetLogs(podName, opts).Stream(ctx)
+	return k.Clientset.CoreV1().Pods(namespace).GetLogs(podName, opts).Stream(ctx)
 }
 
 func (k *K8sClient) ContainerLogsBetweenDates(ctx context.Context, id string, start time.Time, end time.Time, stdType container.StdType) (io.ReadCloser, error) {
-	podName, containerName := parsePodContainerID(id)
+	namespace, podName, containerName := parsePodContainerID(id)
+
 	opts := &corev1.PodLogOptions{
 		Container:  containerName,
 		Follow:     false,
@@ -179,7 +187,7 @@ func (k *K8sClient) ContainerLogsBetweenDates(ctx context.Context, id string, st
 		SinceTime:  &metav1.Time{Time: start},
 	}
 
-	return k.Clientset.CoreV1().Pods(k.namespace).GetLogs(podName, opts).Stream(ctx)
+	return k.Clientset.CoreV1().Pods(namespace).GetLogs(podName, opts).Stream(ctx)
 }
 
 func (k *K8sClient) ContainerEvents(ctx context.Context, ch chan<- container.ContainerEvent) error {
@@ -224,7 +232,7 @@ func (k *K8sClient) ContainerStats(ctx context.Context, id string, stats chan<-
 }
 
 func (k *K8sClient) Ping(ctx context.Context) error {
-	_, err := k.Clientset.CoreV1().Pods(k.namespace).List(ctx, metav1.ListOptions{Limit: 1})
+	_, err := k.Clientset.CoreV1().Pods("default").List(ctx, metav1.ListOptions{Limit: 1})
 	return err
 }
 
@@ -233,12 +241,19 @@ func (k *K8sClient) Host() container.Host {
 }
 
 func (k *K8sClient) ContainerActions(ctx context.Context, action container.ContainerAction, containerID string) error {
-	// Implementation for container actions (start, stop, restart, etc.)
-	return nil
+	panic("not implemented")
+}
+
+func (k *K8sClient) ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error) {
+	panic("not implemented")
+}
+
+func (k *K8sClient) ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error) {
+	panic("not implemented")
 }
 
 // Helper function to parse pod and container names from container ID
-func parsePodContainerID(id string) (string, string) {
+func parsePodContainerID(id string) (string, string, string) {
 	parts := strings.Split(id, ":")
-	return parts[0], parts[1]
+	return parts[0], parts[1], parts[2]
 }

internal/k8s/stats_collector.go

@@ -102,7 +102,7 @@ func (sc *K8sStatsCollector) Start(parentCtx context.Context) bool {
 			for _, pod := range metricList.Items {
 				for _, c := range pod.Containers {
 					stat := container.ContainerStat{
-						ID:          pod.Name + ":" + c.Name,
+						ID:          pod.Namespace + ":" + pod.Name + ":" + c.Name,
 						CPUPercent:  float64(c.Usage.Cpu().MilliValue()) / 1000 * 100,
 						MemoryUsage: c.Usage.Memory().AsApproximateFloat64(),
 					}

internal/support/cli/agent_command.go

@@ -0,0 +1,67 @@
+package cli
+
+import (
+	"context"
+	"embed"
+	"fmt"
+	"io"
+	"net"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/amir20/dozzle/internal/agent"
+	"github.com/amir20/dozzle/internal/docker"
+	"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"`
+}
+
+func (a *AgentCmd) Run(args Args, embeddedCerts embed.FS) error {
+	if args.Mode != "server" {
+		return fmt.Errorf("agent command is only available in server mode")
+	}
+	client, err := docker.NewLocalClient(args.Hostname)
+	if err != nil {
+		return fmt.Errorf("failed to create docker client: %w", err)
+	}
+	certs, err := ReadCertificates(embeddedCerts)
+	if err != nil {
+		return fmt.Errorf("failed to read certificates: %w", err)
+	}
+
+	listener, err := net.Listen("tcp", args.Agent.Addr)
+	if err != nil {
+		return fmt.Errorf("failed to listen: %w", err)
+	}
+	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())
+	go StartEvent(args, "", client, "agent")
+	server, err := agent.NewServer(client, certs, args.Version(), args.Filter)
+	if err != nil {
+		return fmt.Errorf("failed to create agent server: %w", err)
+	}
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer stop()
+	go func() {
+		log.Info().Msgf("Dozzle agent version %s", args.Version())
+		log.Info().Msgf("Agent listening on %s", listener.Addr().String())
+
+		if err := server.Serve(listener); err != nil {
+			log.Error().Err(err).Msg("failed to serve")
+		}
+	}()
+	<-ctx.Done()
+	stop()
+	log.Info().Msg("Shutting down agent")
+	server.Stop()
+	log.Debug().Str("file", tempFile.Name()).Msg("Removing temp file")
+	os.Remove(tempFile.Name())
+	return nil
+}

internal/support/cli/agent_test_command.go

@@ -0,0 +1,38 @@
+package cli
+
+import (
+	"context"
+	"embed"
+	"fmt"
+
+	"github.com/amir20/dozzle/internal/agent"
+	"github.com/rs/zerolog/log"
+)
+
+type AgentTestCmd struct {
+	Address string `arg:"positional"`
+}
+
+func (at *AgentTestCmd) Run(args Args, embeddedCerts embed.FS) error {
+	certs, err := ReadCertificates(embeddedCerts)
+	if err != nil {
+		return fmt.Errorf("error reading certificates: %w", err)
+	}
+
+	log.Info().Str("endpoint", args.AgentTest.Address).Msg("Connecting to agent")
+
+	agent, err := agent.NewClient(args.AgentTest.Address, certs)
+	if err != nil {
+		return fmt.Errorf("error connecting to agent: %w", err)
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
+	defer cancel()
+	host, err := agent.Host(ctx)
+	if err != nil {
+		return fmt.Errorf("error fetching host info for agent: %w", err)
+	}
+
+	log.Info().Str("endpoint", args.AgentTest.Address).Str("version", host.AgentVersion).Str("name", host.Name).Str("id", host.ID).Msg("Successfully connected to agent")
+
+	return nil
+}

internal/support/cli/args.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"embed"
 	"strings"
 	"time"
 
@@ -29,29 +30,15 @@ type Args struct {
 	Mode             string              `arg:"env:DOZZLE_MODE" default:"server" help:"sets the mode to run in (server, swarm)"`
 	TimeoutString    string              `arg:"--timeout,env:DOZZLE_TIMEOUT" default:"10s" help:"sets the timeout for docker client"`
 	Timeout          time.Duration       `arg:"-"`
+	Namespace        string              `arg:"env:DOZZLE_NAMESPACE" default:"" help:"sets the namespace to use in k8s"`
 	Healthcheck      *HealthcheckCmd     `arg:"subcommand:healthcheck" help:"checks if the server is running"`
 	Generate         *GenerateCmd        `arg:"subcommand:generate" help:"generates a configuration file for simple auth"`
 	Agent            *AgentCmd           `arg:"subcommand:agent" help:"starts the agent"`
 	AgentTest        *AgentTestCmd       `arg:"subcommand:agent-test" help:"tests an agent"`
 }
 
-type HealthcheckCmd struct {
-}
-
-type AgentCmd struct {
-	Addr string `arg:"--agent-addr,env:DOZZLE_AGENT_ADDR" default:":7007" help:"sets the host:port to bind for the agent"`
-}
-
-type AgentTestCmd struct {
-	Address string `arg:"positional"`
-}
-
-type GenerateCmd struct {
-	Username string `arg:"positional"`
-	Password string `arg:"--password, -p" help:"sets the password for the user"`
-	Name     string `arg:"--name, -n" help:"sets the display name for the user"`
-	Email    string `arg:"--email, -e" help:"sets the email for the user"`
-	Filter   string `arg:"--user-filter" help:"sets the filter for the user. This can be a comma separated list of filters."`
+type Runnable interface {
+	Run(args Args, embeddedCerts embed.FS) error
 }
 
 func (Args) Version() string {

internal/support/cli/generate_command.go

@@ -0,0 +1,38 @@
+package cli
+
+import (
+	"embed"
+	"fmt"
+	"os"
+
+	"github.com/amir20/dozzle/internal/auth"
+)
+
+type GenerateCmd struct {
+	Username string `arg:"positional"`
+	Password string `arg:"--password, -p" help:"sets the password for the user"`
+	Name     string `arg:"--name, -n" help:"sets the display name for the user"`
+	Email    string `arg:"--email, -e" help:"sets the email for the user"`
+	Filter   string `arg:"--user-filter" help:"sets the filter for the user. This can be a comma separated list of filters."`
+}
+
+func (g *GenerateCmd) Run(args Args, embeddedCerts embed.FS) error {
+	StartEvent(args, "", nil, "generate")
+	if args.Generate.Username == "" || args.Generate.Password == "" {
+		return fmt.Errorf("username and password are required")
+	}
+
+	buffer := auth.GenerateUsers(auth.User{
+		Username: args.Generate.Username,
+		Password: args.Generate.Password,
+		Name:     args.Generate.Name,
+		Email:    args.Generate.Email,
+		Filter:   args.Generate.Filter,
+	}, true)
+
+	if _, err := os.Stdout.Write(buffer.Bytes()); err != nil {
+		return fmt.Errorf("failed to write to stdout: %w", err)
+	}
+
+	return nil
+}

internal/support/cli/health_command.go

@@ -0,0 +1,50 @@
+package cli
+
+import (
+	"context"
+	"embed"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/amir20/dozzle/internal/healthcheck"
+)
+
+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 agentAddress == "" {
+		if err := healthcheck.HttpRequest(args.Addr, args.Base); err != nil {
+			return fmt.Errorf("failed to make request: %w", err)
+		}
+	} else {
+		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)
+		}
+	}
+
+	return nil
+}

internal/support/cli/logger.go

@@ -10,6 +10,7 @@ import (
 func ConfigureLogger(level string) {
 	if level, err := zerolog.ParseLevel(level); err == nil {
 		zerolog.SetGlobalLevel(level)
+		log.Logger = log.With().Str("version", Version).Logger()
 	} else {
 		panic(err)
 	}

internal/support/container/agent_service.go

@@ -70,3 +70,11 @@ func (d *agentService) SubscribeContainersStarted(ctx context.Context, container
 func (a *agentService) ContainerAction(ctx context.Context, container container.Container, action container.ContainerAction) error {
 	return a.client.ContainerAction(ctx, container.ID, action)
 }
+
+func (a *agentService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
+	panic("not implemented")
+}
+
+func (a *agentService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
+	panic("not implemented")
+}

internal/support/container/client_service.go

@@ -16,13 +16,17 @@ type ClientService interface {
 	Host(ctx context.Context) (container.Host, error)
 	ContainerAction(ctx context.Context, container container.Container, action container.ContainerAction) error
 	LogsBetweenDates(ctx context.Context, container container.Container, from time.Time, to time.Time, stdTypes container.StdType) (<-chan *container.LogEvent, error)
-	RawLogs(ctx context.Context, container container.Container, from time.Time, to time.Time, stdTypes container.StdType) (io.ReadCloser, error)
+	RawLogs(context.Context, container.Container, time.Time, time.Time, container.StdType) (io.ReadCloser, error)
 
 	// Subscriptions
-	SubscribeStats(ctx context.Context, stats chan<- container.ContainerStat)
-	SubscribeEvents(ctx context.Context, events chan<- container.ContainerEvent)
-	SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container)
+	SubscribeStats(context.Context, chan<- container.ContainerStat)
+	SubscribeEvents(context.Context, chan<- container.ContainerEvent)
+	SubscribeContainersStarted(context.Context, chan<- container.Container)
 
 	// Blocking streaming functions that should be used in a goroutine
-	StreamLogs(ctx context.Context, container container.Container, from time.Time, stdTypes container.StdType, events chan<- *container.LogEvent) error
+	StreamLogs(context.Context, container.Container, time.Time, container.StdType, chan<- *container.LogEvent) error
+
+	// Terminal
+	Attach(context.Context, container.Container, io.Reader, io.Writer) error
+	Exec(context.Context, container.Container, []string, io.Reader, io.Writer) error
 }

internal/support/container/container_service.go

@@ -35,3 +35,11 @@ func (c *ContainerService) StreamLogs(ctx context.Context, from time.Time, stdTy
 func (c *ContainerService) Action(ctx context.Context, action container.ContainerAction) error {
 	return c.clientService.ContainerAction(ctx, c.Container, action)
 }
+
+func (c *ContainerService) Attach(ctx context.Context, stdin io.Reader, stdout io.Writer) error {
+	return c.clientService.Attach(ctx, c.Container, stdin, stdout)
+}
+
+func (c *ContainerService) Exec(ctx context.Context, cmd []string, stdin io.Reader, stdout io.Writer) error {
+	return c.clientService.Exec(ctx, c.Container, cmd, stdin, stdout)
+}

internal/support/docker/docker_service.go

@@ -3,6 +3,7 @@ package docker_support
 import (
 	"context"
 	"io"
+	"sync"
 	"time"
 
 	"github.com/amir20/dozzle/internal/container"
@@ -109,3 +110,75 @@ func (d *DockerClientService) SubscribeEvents(ctx context.Context, events chan<-
 func (d *DockerClientService) SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container) {
 	d.store.SubscribeNewContainers(ctx, containers)
 }
+
+func (d *DockerClientService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
+	cancelCtx, cancel := context.WithCancel(ctx)
+	containerWriter, containerReader, err := d.client.ContainerAttach(cancelCtx, container.ID)
+	if err != nil {
+		cancel()
+		return err
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(2)
+
+	go func() {
+		defer wg.Done()
+		if _, err := io.Copy(containerWriter, stdin); err != nil {
+			log.Error().Err(err).Msg("error while reading from ws")
+		}
+		cancel()
+		containerWriter.Close()
+	}()
+
+	go func() {
+		defer wg.Done()
+		if container.Tty {
+			if _, err := io.Copy(stdout, containerReader); err != nil {
+				log.Error().Err(err).Msg("error while writing to ws")
+			}
+		} else {
+			if _, err := stdcopy.StdCopy(stdout, stdout, containerReader); err != nil {
+				log.Error().Err(err).Msg("error while writing to ws")
+			}
+		}
+		cancel()
+	}()
+
+	wg.Wait()
+
+	return nil
+}
+
+func (d *DockerClientService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
+	cancelCtx, cancel := context.WithCancel(ctx)
+	containerWriter, containerReader, err := d.client.ContainerExec(cancelCtx, container.ID, cmd)
+	if err != nil {
+		cancel()
+		return err
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(2)
+
+	go func() {
+		defer wg.Done()
+		if _, err := io.Copy(containerWriter, stdin); err != nil {
+			log.Error().Err(err).Msg("error while reading from ws")
+		}
+		cancel()
+		containerWriter.Close()
+	}()
+
+	go func() {
+		defer wg.Done()
+		if _, err := stdcopy.StdCopy(stdout, stdout, containerReader); err != nil {
+			log.Error().Err(err).Msg("error while writing to ws")
+		}
+		cancel()
+	}()
+
+	wg.Wait()
+
+	return nil
+}

internal/support/k8s/k8s_service.go

@@ -90,3 +90,11 @@ func (k *K8sClientService) SubscribeEvents(ctx context.Context, events chan<- co
 func (k *K8sClientService) SubscribeContainersStarted(ctx context.Context, containers chan<- container.Container) {
 	k.store.SubscribeNewContainers(ctx, containers)
 }
+
+func (k *K8sClientService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
+	panic("not implemented")
+}
+
+func (k *K8sClientService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
+	panic("not implemented")
+}

internal/web/__snapshots__/web.snapshot

@@ -84,6 +84,10 @@ Content-Type: text/html
 {"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
 {"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}
 
+/* snapshot: Test_handler_between_dates_with_everything_complex */
+{"m":{"msg":"a complex log message"},"ts":1589396197772,"id":62280847,"l":"unknown","s":"stdout","c":"123456"}
+
+
 /* snapshot: Test_handler_between_dates_with_fill */
 {"m":"INFO Testing stdout logs...","ts":1589396137772,"id":466600245,"l":"info","s":"stdout","c":"123456"}
 {"m":"INFO Testing stderr logs...","ts":1589396197772,"id":1101501603,"l":"info","s":"stderr","c":"123456"}

internal/web/actions.go

@@ -1,9 +1,7 @@
 package web
 
 import (
-	"context"
 	"net/http"
-	"time"
 
 	"github.com/amir20/dozzle/internal/auth"
 	"github.com/amir20/dozzle/internal/container"
@@ -16,7 +14,7 @@ func (h *handler) containerActions(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, "id")
 
 	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
+	if h.config.Authorization.Provider != None {
 		user := auth.UserFromContext(r.Context())
 		if user.ContainerLabels.Exists() {
 			userLabels = user.ContainerLabels
@@ -37,9 +35,7 @@ func (h *handler) containerActions(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-	if err := containerService.Action(ctx, parsedAction); err != nil {
+	if err := containerService.Action(r.Context(), parsedAction); err != nil {
 		log.Error().Err(err).Msg("error while trying to perform container action")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

internal/web/actions_test.go

@@ -34,7 +34,7 @@ func mockedClient() *MockedClient {
 func Test_handler_containerActions_stop(t *testing.T) {
 	mockedClient := mockedClient()
 
-	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("POST", "/api/hosts/localhost/containers/123/actions/stop", nil)
 	require.NoError(t, err, "Request should not return an error.")
 
@@ -46,7 +46,7 @@ func Test_handler_containerActions_stop(t *testing.T) {
 func Test_handler_containerActions_restart(t *testing.T) {
 	mockedClient := mockedClient()
 
-	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("POST", "/api/hosts/localhost/containers/123/actions/restart", nil)
 	require.NoError(t, err, "Request should not return an error.")
 
@@ -58,7 +58,7 @@ func Test_handler_containerActions_restart(t *testing.T) {
 func Test_handler_containerActions_unknown_action(t *testing.T) {
 	mockedClient := mockedClient()
 
-	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("POST", "/api/hosts/localhost/containers/123/actions/something-else", nil)
 	require.NoError(t, err, "Request should not return an error.")
 
@@ -70,7 +70,7 @@ func Test_handler_containerActions_unknown_action(t *testing.T) {
 func Test_handler_containerActions_unknown_container(t *testing.T) {
 	mockedClient := mockedClient()
 
-	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("POST", "/api/hosts/localhost/containers/456/actions/start", nil)
 	require.NoError(t, err, "Request should not return an error.")
 
@@ -82,7 +82,7 @@ func Test_handler_containerActions_unknown_container(t *testing.T) {
 func Test_handler_containerActions_start(t *testing.T) {
 	mockedClient := mockedClient()
 
-	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(mockedClient, nil, Config{Base: "/", EnableActions: true, Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("POST", "/api/hosts/localhost/containers/123/actions/start", nil)
 	require.NoError(t, err, "Request should not return an error.")
 

internal/web/auth_proxy_test.go

@@ -19,7 +19,7 @@ func Test_createRoutes_proxy_missing_headers(t *testing.T) {
 
 	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/",
 		Authorization: Authorization{
-			Provider:   FORWARD_PROXY,
+			Provider:   ForwardProxy,
 			Authorizer: auth.NewForwardProxyAuth("Remote-User", "Remote-Email", "Remote-Name", "Remote-Filter"),
 		},
 	})
@@ -38,7 +38,7 @@ func Test_createRoutes_proxy_happy(t *testing.T) {
 
 	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/",
 		Authorization: Authorization{
-			Provider:   FORWARD_PROXY,
+			Provider:   ForwardProxy,
 			Authorizer: auth.NewForwardProxyAuth("Remote-User", "Remote-Email", "Remote-Name", "Remote-Filter"),
 		},
 	})

internal/web/auth_simple_test.go

@@ -25,7 +25,7 @@ func Test_createRoutes_simple_redirect(t *testing.T) {
 
 	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/",
 		Authorization: Authorization{
-			Provider: SIMPLE,
+			Provider: Simple,
 			Authorizer: auth.NewSimpleAuth(auth.UserDatabase{
 				Users: map[string]*auth.User{
 					"amir": {
@@ -50,7 +50,7 @@ func Test_createRoutes_simple_valid_token(t *testing.T) {
 
 	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/",
 		Authorization: Authorization{
-			Provider: SIMPLE,
+			Provider: Simple,
 			Authorizer: auth.NewSimpleAuth(auth.UserDatabase{
 				Users: map[string]*auth.User{
 					"amir": {
@@ -95,7 +95,7 @@ func Test_createRoutes_simple_bad_password(t *testing.T) {
 
 	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/",
 		Authorization: Authorization{
-			Provider: SIMPLE,
+			Provider: Simple,
 			Authorizer: auth.NewSimpleAuth(auth.UserDatabase{
 				Users: map[string]*auth.User{
 					"amir": {

internal/web/auth_test.go

@@ -18,7 +18,7 @@ func Test_createRoutes_index(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
 
-	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/", Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/", Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("GET", "/", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -31,7 +31,7 @@ func Test_createRoutes_redirect(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
 
-	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("GET", "/foobar", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -44,7 +44,7 @@ func Test_createRoutes_foobar(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("foo page"), 0644), "WriteFile should have no error.")
 
-	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("GET", "/foobar/", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -58,7 +58,7 @@ func Test_createRoutes_foobar_file(t *testing.T) {
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
 	require.NoError(t, afero.WriteFile(fs, "test", []byte("test page"), 0644), "WriteFile should have no error.")
 
-	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("GET", "/foobar/test", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()
@@ -70,7 +70,7 @@ func Test_createRoutes_foobar_file(t *testing.T) {
 func Test_createRoutes_version(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
-	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/", Version: "dev", Authorization: Authorization{Provider: NONE}})
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/", Version: "dev", Authorization: Authorization{Provider: None}})
 	req, err := http.NewRequest("GET", "/api/version", nil)
 	require.NoError(t, err, "NewRequest should not return an error.")
 	rr := httptest.NewRecorder()

internal/web/download.go

@@ -23,7 +23,7 @@ func (h *handler) downloadLogs(w http.ResponseWriter, r *http.Request) {
 	}
 
 	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
+	if h.config.Authorization.Provider != None {
 		user := auth.UserFromContext(r.Context())
 		if user.ContainerLabels.Exists() {
 			userLabels = user.ContainerLabels

internal/web/events.go

@@ -28,7 +28,7 @@ func (h *handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 	h.hostService.SubscribeAvailableHosts(r.Context(), availableHosts)
 
 	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
+	if h.config.Authorization.Provider != None {
 		user := auth.UserFromContext(r.Context())
 		if user.ContainerLabels.Exists() {
 			userLabels = user.ContainerLabels

internal/web/events_test.go

@@ -57,7 +57,7 @@ func Test_handler_streamEvents_happy(t *testing.T) {
 	manager := docker_support.NewRetriableClientManager(nil, 3*time.Second, tls.Certificate{}, docker_support.NewDockerClientService(mockedClient, container.ContainerLabels{}))
 	multiHostService := docker_support.NewMultiHostService(manager, 3*time.Second)
 
-	server := CreateServer(multiHostService, nil, Config{Base: "/", Authorization: Authorization{Provider: NONE}})
+	server := CreateServer(multiHostService, nil, Config{Base: "/", Authorization: Authorization{Provider: None}})
 
 	handler := server.Handler
 	rr := httptest.NewRecorder()

internal/web/index.go

@@ -54,7 +54,7 @@ func (h *handler) executeTemplate(w http.ResponseWriter, req *http.Request) {
 
 	user := auth.UserFromContext(req.Context())
 
-	if h.config.Authorization.Provider == NONE || user != nil {
+	if h.config.Authorization.Provider == None || user != nil {
 		config["authProvider"] = h.config.Authorization.Provider
 		config["version"] = h.config.Version
 		config["hostname"] = h.config.Hostname
@@ -69,7 +69,7 @@ func (h *handler) executeTemplate(w http.ResponseWriter, req *http.Request) {
 			config["profile"] = struct{}{}
 		}
 		config["user"] = user
-	} else if h.config.Authorization.Provider == FORWARD_PROXY {
+	} else if h.config.Authorization.Provider == ForwardProxy {
 		log.Error().Msg("Unable to find remote user. Please check your proxy configuration. Expecting headers Remote-Email, Remote-User, Remote-Name.")
 		log.Debug().Str("url", req.URL.String()).Msg("Dumping all headers for request")
 		for k, v := range req.Header {
@@ -77,7 +77,7 @@ func (h *handler) executeTemplate(w http.ResponseWriter, req *http.Request) {
 		}
 		http.Error(w, "Unauthorized user", http.StatusUnauthorized)
 		return
-	} else if h.config.Authorization.Provider == SIMPLE && req.URL.Path != "login" {
+	} else if h.config.Authorization.Provider == Simple && req.URL.Path != "login" {
 		log.Debug().Str("url", req.URL.String()).Msg("Redirecting to login page")
 		http.Redirect(w, req, path.Clean(h.config.Base+"/login")+"?redirectUrl=/"+req.URL.String(), http.StatusTemporaryRedirect)
 		return

internal/web/logs.go

@@ -49,7 +49,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 	}
 
 	usersLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
+	if h.config.Authorization.Provider != None {
 		user := auth.UserFromContext(r.Context())
 		if user.ContainerLabels.Exists() {
 			usersLabels = user.ContainerLabels
@@ -129,34 +129,30 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 
 		for event := range events {
 			if everything {
+				if _, ok := event.Message.(string); onlyComplex && ok {
+					continue
+				}
 				if err := encoder.Encode(event); err != nil {
 					log.Error().Err(err).Msg("error encoding log event")
 				}
-				continue
-			}
+			} else {
+				if regex != nil {
+					if !search.Search(regex, event) {
+						continue
+					}
+				}
 
-			if onlyComplex {
-				if _, ok := event.Message.(string); ok {
+				if _, ok := levels[event.Level]; !ok {
 					continue
 				}
-			}
 
-			if regex != nil {
-				if !search.Search(regex, event) {
-					continue
+				if lastSeenId != 0 && event.Id == lastSeenId {
+					log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
+					break
 				}
-			}
 
-			if _, ok := levels[event.Level]; !ok {
-				continue
+				buffer.Push(event)
 			}
-
-			if lastSeenId != 0 && event.Id == lastSeenId {
-				log.Debug().Uint32("lastSeenId", lastSeenId).Msg("found last seen id")
-				break
-			}
-
-			buffer.Push(event)
 		}
 
 		if everything || from.Before(containerService.Container.Created) {
@@ -250,7 +246,7 @@ func (h *handler) streamLogsForContainers(w http.ResponseWriter, r *http.Request
 	}
 
 	userLabels := h.config.Labels
-	if h.config.Authorization.Provider != NONE {
+	if h.config.Authorization.Provider != None {
 		user := auth.UserFromContext(r.Context())
 		if user.ContainerLabels.Exists() {
 			userLabels = user.ContainerLabels

internal/web/logs_test.go

@@ -300,6 +300,46 @@ func Test_handler_between_dates_with_fill(t *testing.T) {
 	mockedClient.AssertExpectations(t)
 }
 
+func Test_handler_between_dates_with_everything_complex(t *testing.T) {
+	id := "123456"
+	req, err := http.NewRequest("GET", "/api/hosts/localhost/containers/"+id+"/logs", nil)
+	require.NoError(t, err, "NewRequest should not return an error.")
+
+	q := req.URL.Query()
+	q.Add("jsonOnly", "true")
+	q.Add("stdout", "true")
+	q.Add("stderr", "true")
+	q.Add("everything", "true")
+	q.Add("levels", "info")
+
+	req.URL.RawQuery = q.Encode()
+
+	mockedClient := new(MockedClient)
+
+	first := makeMessage("2020-05-13T18:55:37.772853839Z INFO Testing stdout logs...\n", container.STDOUT)
+	second := makeMessage("2020-05-13T18:56:37.772853839Z {\"msg\":\"a complex log message\"}\n", container.STDOUT)
+	data := append(first, second...)
+
+	mockedClient.On("ContainerLogsBetweenDates", mock.Anything, id, mock.Anything, mock.Anything, container.STDALL).
+		Return(io.NopCloser(bytes.NewReader(data)), nil).
+		Once()
+	mockedClient.On("FindContainer", mock.Anything, id).Return(container.Container{ID: id}, nil)
+	mockedClient.On("Host").Return(container.Host{
+		ID: "localhost",
+	})
+	mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]container.Container{
+		{ID: id, Name: "test", Host: "localhost", State: "running"},
+	}, nil)
+	mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- container.ContainerEvent")).Return(nil)
+
+	handler := createDefaultHandler(mockedClient)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+	reader := strings.NewReader(regexp.MustCompile(`"time":"[^"]*"`).ReplaceAllString(rr.Body.String(), `"time":"<removed>"`))
+	abide.AssertReader(t, t.Name(), reader)
+	mockedClient.AssertExpectations(t)
+}
+
 func makeMessage(message string, stream container.StdType) []byte {
 	data := make([]byte, 8)
 	binary.BigEndian.PutUint32(data[4:], uint32(len(message)))

internal/web/routes.go

@@ -20,9 +20,10 @@ import (
 type AuthProvider string
 
 const (
-	NONE          AuthProvider = "none"
-	SIMPLE        AuthProvider = "simple"
-	FORWARD_PROXY AuthProvider = "forward-proxy"
+	None         AuthProvider = "none"
+	Simple       AuthProvider = "simple"
+	ForwardProxy AuthProvider = "forward-proxy"
+	OpenID       AuthProvider = "openid"
 )
 
 // Config is a struct for configuring the web service
@@ -89,24 +90,26 @@ func createRouter(h *handler) *chi.Mux {
 		r.Use(cspHeaders)
 	}
 
-	if h.config.Authorization.Provider != NONE && h.config.Authorization.Authorizer == nil {
+	if h.config.Authorization.Provider != None && h.config.Authorization.Authorizer == nil {
 		log.Fatal().Msg("Authorization provider is set but no authorizer is provided")
 	}
 
 	r.Route(base, func(r chi.Router) {
-		if h.config.Authorization.Provider != NONE {
+		if h.config.Authorization.Provider != None {
 			r.Use(h.config.Authorization.Authorizer.AuthMiddleware)
 		}
 
 		r.Route("/api", func(r chi.Router) {
 			// Authenticated routes
 			r.Group(func(r chi.Router) {
-				if h.config.Authorization.Provider != NONE {
+				if h.config.Authorization.Provider != None {
 					r.Use(auth.RequireAuthentication)
 				}
 				r.Get("/hosts/{host}/containers/{id}/logs/stream", h.streamContainerLogs)
 				r.Get("/hosts/{host}/logs/stream", h.streamHostLogs)
 				r.Get("/hosts/{host}/containers/{id}/logs", h.fetchLogsBetweenDates)
+				r.Get("/hosts/{host}/containers/{id}/attach", h.attach)
+				r.Get("/hosts/{host}/containers/{id}/exec", h.exec)
 				r.Get("/hosts/{host}/logs/mergedStream/{ids}", h.streamLogsMerged)
 				r.Get("/containers/{hostIds}/download", h.downloadLogs) // formatted as host:container,host:container
 				r.Get("/stacks/{stack}/logs/stream", h.streamStackLogs)
@@ -126,7 +129,7 @@ func createRouter(h *handler) *chi.Mux {
 			})
 
 			// Public API routes
-			if h.config.Authorization.Provider == SIMPLE {
+			if h.config.Authorization.Provider == Simple {
 				r.Post("/token", h.createToken)
 				r.Delete("/token", h.deleteToken)
 			}

internal/web/routes_test.go

@@ -96,5 +96,5 @@ func createHandler(client container.Client, content fs.FS, config Config) *chi.M
 }
 
 func createDefaultHandler(client container.Client) *chi.Mux {
-	return createHandler(client, nil, Config{Base: "/", Authorization: Authorization{Provider: NONE}})
+	return createHandler(client, nil, Config{Base: "/", Authorization: Authorization{Provider: None}})
 }

internal/web/terminal.go

@@ -0,0 +1,120 @@
+package web
+
+import (
+	"net/http"
+
+	"github.com/amir20/dozzle/internal/auth"
+	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/websocket"
+	"github.com/rs/zerolog/log"
+)
+
+var upgrader = websocket.Upgrader{
+	ReadBufferSize:  1024,
+	WriteBufferSize: 1024,
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
+}
+
+func (h *handler) attach(w http.ResponseWriter, r *http.Request) {
+	conn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		log.Error().Err(err).Msg("error while trying to upgrade connection")
+		return
+	}
+	defer conn.Close()
+
+	id := chi.URLParam(r, "id")
+	userLabels := h.config.Labels
+	if h.config.Authorization.Provider != NONE {
+		user := auth.UserFromContext(r.Context())
+		if user.ContainerLabels.Exists() {
+			userLabels = user.ContainerLabels
+		}
+	}
+
+	containerService, err := h.hostService.FindContainer(hostKey(r), id, userLabels)
+
+	if err != nil {
+		log.Error().Err(err).Msg("error while trying to find container")
+		return
+	}
+
+	wsReader := &webSocketReader{conn: conn}
+	wsWriter := &webSocketWriter{conn: conn}
+	if err = containerService.Attach(r.Context(), wsReader, wsWriter); err != nil {
+		log.Error().Err(err).Msg("error while trying to attach to container")
+		conn.WriteMessage(websocket.TextMessage, []byte("🚨 Error while trying to attach to container\r\n"))
+		return
+	}
+}
+
+func (h *handler) exec(w http.ResponseWriter, r *http.Request) {
+	conn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		log.Error().Err(err).Msg("error while trying to upgrade connection")
+		return
+	}
+	defer conn.Close()
+
+	id := chi.URLParam(r, "id")
+	userLabels := h.config.Labels
+	if h.config.Authorization.Provider != NONE {
+		user := auth.UserFromContext(r.Context())
+		if user.ContainerLabels.Exists() {
+			userLabels = user.ContainerLabels
+		}
+	}
+
+	containerService, err := h.hostService.FindContainer(hostKey(r), id, userLabels)
+	if err != nil {
+		log.Error().Err(err).Msg("error while trying to find container")
+		return
+	}
+
+	wsReader := &webSocketReader{conn: conn}
+	wsWriter := &webSocketWriter{conn: conn}
+	if err = containerService.Exec(r.Context(), []string{"sh", "-c", "command -v bash >/dev/null 2>&1 && exec bash || exec sh"}, wsReader, wsWriter); err != nil {
+		log.Error().Err(err).Msg("error while trying to attach to container")
+		conn.WriteMessage(websocket.TextMessage, []byte("🚨 Error while trying to attach to container\r\n"))
+		return
+	}
+}
+
+type webSocketWriter struct {
+	conn *websocket.Conn
+}
+
+func (w *webSocketWriter) Write(p []byte) (int, error) {
+	err := w.conn.WriteMessage(websocket.TextMessage, p)
+	return len(p), err
+}
+
+type webSocketReader struct {
+	conn   *websocket.Conn
+	buffer []byte
+}
+
+func (r *webSocketReader) Read(p []byte) (n int, err error) {
+	if len(r.buffer) > 0 {
+		n = copy(p, r.buffer)
+		r.buffer = r.buffer[n:]
+		return n, nil
+	}
+
+	// Otherwise, read a new message
+	_, message, err := r.conn.ReadMessage()
+	if err != nil {
+		return 0, err
+	}
+
+	n = copy(p, message)
+
+	// If we couldn't copy the entire message, store the rest in our buffer
+	if n < len(message) {
+		r.buffer = message[n:]
+	}
+
+	return n, nil
+}

locales/da.yml

@@ -13,14 +13,9 @@ label:
   containers: Containere
   container: Ingen containere | 1 container | {count} containere
   service: Ingen tjenester | 1 tjeneste | {count} tjenester
+  services: Tjenester
   running-containers: Kørende Containere
   all-containers: Alle Containere
-  total-containers: Samlede Containere
-  running: Kører
-  total-cpu-usage: Samlet CPU Forbrug
-  total-mem-usage: Samlet Hukommelsesforbrug
-  dozzle-version: Dozzle Version
-  all: Alle
   host: Vært
   hosts: Værter
   password: Kodeord
@@ -32,12 +27,9 @@ label:
   avg-mem: Gns. MEM (%)
   pinned: Fastgjort
   per-page: Rækker per side
-  swarm-mode: Swarm Tilstand
-  services: Tjenester
   host-menu: Værter og Containere
   swarm-menu: Tjenester og Stacks
   group-menu: Brugerdefinerede Grupper
-
 tooltip:
   search: Søg containere (⌘ + k, ⌃k)
   pin-column: Fastgør som kolonne
@@ -52,13 +44,11 @@ error:
   events-stream:
     title: Uventet fejl
     message: >-
-      Dozzle UI kunne ikke forbinde til API. Tjek venligst dine netværks indstillinger.
-      Hvis du bruger en reverse proxy, vær sikker på at den er konfigureret korrekt.
+      Dozzle UI kunne ikke forbinde til API. Tjek venligst dine netværks indstillinger. Hvis du bruger en reverse proxy, vær sikker på at den er konfigureret korrekt.
   events-timeout:
     title: Der er noget galt
     message: >-
-      Dozzle UI timed ud inden der blev forbundet til API. Tjek venligst din
-      internet forbindelse og prøv igen.
+      Dozzle UI timed ud inden der blev forbundet til API. Tjek venligst din internet forbindelse og prøv igen.
 alert:
   redirected:
     title: Omdirigeret til ny container
@@ -66,8 +56,7 @@ alert:
   similar-container-found:
     title: Lignende container fundet
     message: >-
-      Dozzle fandt en lignende container {containerId} som kører på den samme
-      host og vil automatisk skifte til den, med mindre du trykker 'Cancel'.
+      Dozzle fandt en lignende container {containerId} som kører på den samme host og vil automatisk skifte til den, med mindre du trykker 'Cancel'.
 title:
   page-not-found: Side ikke fundet
   login: Godkendelse Krævet
@@ -89,9 +78,6 @@ settings:
   show-timesamps: Vis tids stempler
   soft-wrap: Blødt bræk på linjer
   datetime-format: Overskriv dato og tids format
-  12-24-format: >-
-    Som standard vil Dozzle bruge din browsers lokalitet til at formatere tiden. Du kan
-    tvinge 12 eller 24 timers format.
   font-size: Tekststørrelse at bruge til logs
   color-scheme: Farve skema
   options: Muligheder
@@ -100,8 +86,7 @@ settings:
   search: Aktiver søgning med Dozzle ved brug af
   using-version: Du bruger Dozzle {version}.
   update-available: >-
-    Ny version er tilgængelig! Opdater til <a href="{href}" target="_blank"
-    rel="noreferrer noopener">{nextVersion}</a>.
+    Ny version er tilgængelig! Opdater til <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
   show-std: Vis stdout og stderr mærker
   automatic-redirect: Automatisk omdiriger til nye containere med det samme navn
   compact: Slå kompakt tilstand til for logs

locales/de.yml

@@ -12,8 +12,8 @@ toolbar:
 label:
   containers: Container
   container: Keine Container | 1 Container | {count} Container
-  total-containers: Gesamte Container
   service: Kein Service | 1 Service | {count} Services
+  services: Service
   running-containers: Laufende Container
   all-containers: Alle Container
   host: Host
@@ -27,16 +27,9 @@ label:
   avg-mem: Avg. MEM (%)
   pinned: Angepinnt
   per-page: Zeilen pro Seite
-  swarm-mode: Swarm Modus
-  services: Service
-  running: Laufende
   host-menu: Hosts und Container
   swarm-menu: Services und Stacks
   group-menu: Benutzerdefinierte Gruppen
-  total-cpu-usage: Gesamte CPU Auslastung
-  total-mem-usage: Gesamte Speicher Auslastung
-  dozzle-version: Dozzle Version
-  all: Alle
 tooltip:
   search: Suche Container (⌘ + k, ⌃k)
   pin-column: Als Spalte anheften
@@ -51,13 +44,11 @@ error:
   events-stream:
     title: Unerwarteter Fehler
     message: >-
-      Das Dozzle UI konnte keine Verbindung zur API herstellen. Bitte überprüfen Sie Ihre Netzwerkeinstellungen.
-      Wenn Sie einen Reverse-Proxy verwenden, stellen Sie sicher, dass er korrekt konfiguriert ist.
+      Das Dozzle UI konnte keine Verbindung zur API herstellen. Bitte überprüfen Sie Ihre Netzwerkeinstellungen. Wenn Sie einen Reverse-Proxy verwenden, stellen Sie sicher, dass er korrekt konfiguriert ist.
   events-timeout:
     title: Etwas stimmt nicht
     message: >-
-      Das Dozzle UI hat beim Verbinden mit der API eine Zeitüberschreitung. Bitte überprüfen Sie die
-      Netzwerkverbindung und versuchen Sie es erneut.
+      Das Dozzle UI hat beim Verbinden mit der API eine Zeitüberschreitung. Bitte überprüfen Sie die Netzwerkverbindung und versuchen Sie es erneut.
 alert:
   redirected:
     title: Zu neuem Container umgeleitet
@@ -65,8 +56,7 @@ alert:
   similar-container-found:
     title: Ähnlicher Container gefunden
     message: >-
-      Dozzle hat einen ähnlichen Container {containerId} gefunden, der auf dem
-      gleichen Host ausgeführt wird. Möchtest Du zu ihm wechseln?
+      Dozzle hat einen ähnlichen Container {containerId} gefunden, der auf dem gleichen Host ausgeführt wird. Möchtest Du zu ihm wechseln?
 title:
   page-not-found: Seite nicht gefunden
   login: Authentifizierung erforderlich
@@ -88,9 +78,6 @@ settings:
   show-timesamps: Zeige Zeitstempel
   soft-wrap: Zeilenumbruch
   datetime-format: Datums- und Zeitformat
-  12-24-format: >-
-    Standardmäßig verwendet Dozzle die Spracheinstellungen des Browsers, um die
-    Zeit anzuzeigen. Sie können das 12- oder 24-Stunden-Format erzwingen.
   font-size: Schriftgröße für Logs
   color-scheme: Farbschema
   options: Optionen

locales/es.yml

@@ -13,14 +13,9 @@ label:
   containers: Contenedores
   container: No contenedores | 1 contenedor | {count} contenedores
   service: Sin servicios | 1 servicio | {count} servicios
+  services: Servicios
   running-containers: Contenedores en ejecución
   all-containers: Todos los contenedores
-  total-containers: Contenedores Totales
-  running: En ejecución
-  total-cpu-usage: Uso total del Procesador
-  total-mem-usage: Uso total de la Memoria
-  dozzle-version: Versión de Dozzle
-  all: Todo
   host: Host
   hosts: Hosts
   password: Contraseña
@@ -32,8 +27,6 @@ label:
   avg-mem: Promedio de MEM (%)
   pinned: Fijado
   per-page: Filas por página
-  swarm-mode: Modo Swarm
-  services: Servicios
   host-menu: Hosts y Contenedores
   swarm-menu: Servicios y Stacks
   group-menu: Grupos Personalizados
@@ -51,8 +44,7 @@ error:
   events-stream:
     title: Error inesperado
     message: >-
-      Dozzle UI no pudo conectar con la API. Por favor, compruebe la configuración de su red.
-      Si está utilizando un proxy inverso, por favor, asegúrese de que está configurado correctamente.
+      Dozzle UI no pudo conectar con la API. Por favor, compruebe la configuración de su red. Si está utilizando un proxy inverso, por favor, asegúrese de que está configurado correctamente.
   events-timeout:
     title: Algo no está bien
     message: >-
@@ -86,9 +78,6 @@ settings:
   show-timesamps: Mostrar marcas de tiempo
   soft-wrap: Líneas de texto con ajuste suave
   datetime-format: Sobrescribir el formato de fecha y hora
-  12-24-format: >-
-    Por defecto, Dozzle utilizará la configuración regional de tu navegador para formatear la hora. Usted puede
-    forzar el estilo de 12 o 24 horas.
   font-size: Tamaño de letra a utilizar para los registros
   color-scheme: Esquema de colores
   options: Opciones
@@ -97,8 +86,7 @@ settings:
   search: Activar la búsqueda con Dozzle mediante
   using-version: Estás usando Dozzle {version}.
   update-available: >-
-    ¡La nueva versión está disponible! Actualizar a la
-    <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
+    ¡La nueva versión está disponible! Actualizar a la <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
   show-std: Mostrar etiquetas de salida estándar y salida de error estándar
   automatic-redirect: Redireccionar automáticamente a nuevos contenedores con el mismo nombre
   compact: Modo compacto

locales/fr.yml

@@ -7,10 +7,13 @@ toolbar:
   stop: Stop
   start: Démarrer
   restart: Redémarrer
+  show-hostname: Show hostname
+  show-container-name: Show container name
 label:
+  containers: Conteneurs
   container: Pas de conteneur | 1 conteneur | {count} conteneurs
   service: Pas de service | 1 service | {count} services
-  containers: Conteneurs
+  services: Services
   running-containers: Conteneurs en execution
   all-containers: Tous les conteneurs
   host: Hôte
@@ -24,12 +27,9 @@ label:
   avg-mem: Moyenne MEM (%)
   pinned: Epinglé
   per-page: Colonnes par page
-  swarm-mode: Mode Swarm
-  services: Services
   host-menu: Hôtes et Conteneurs
   swarm-menu: Services et Stacks
   group-menu: Groupes Personnalisés
-
 tooltip:
   search: Recherche de conteneurs (⌘ + k, ⌃k)
   pin-column: Epinglé en colonne
@@ -44,13 +44,11 @@ error:
   events-stream:
     title: Erreur inattendue
     message: >-
-      L'interface utilisateur de Dozzle n'a pas pu se connecter à l'API. Veuillez vérifier les paramètres de votre réseau.
-      Si vous utilisez un proxy inversé, assurez-vous qu'il est configuré correctement.
+      L'interface utilisateur de Dozzle n'a pas pu se connecter à l'API. Veuillez vérifier les paramètres de votre réseau. Si vous utilisez un proxy inversé, assurez-vous qu'il est configuré correctement.
   events-timeout:
     title: Quelque chose ne va pas
     message: >-
-      La connexion de l'interface utilisateur de Dozzle à l'API a mis trop de temps. Veuillez vérifier la connexion
-      et réessayez.
+      La connexion de l'interface utilisateur de Dozzle à l'API a mis trop de temps. Veuillez vérifier la connexion et réessayez.
 alert:
   redirected:
     title: Redirigé vers le nouveau conteneur
@@ -58,8 +56,7 @@ alert:
   similar-container-found:
     title: Conteneur similaire trouvé
     message: >-
-      Dozzle a trouvé un conteneur similaire {containerId} qui s'exécute sur le même hôte
-      et basculera automatiquement vers lui à moins que vous ne cliquiez sur "Annuler".
+      Dozzle a trouvé un conteneur similaire {containerId} qui s'exécute sur le même hôte et basculera automatiquement vers lui à moins que vous ne cliquiez sur "Annuler".
 title:
   page-not-found: Page non trouvée
   login: Authentification requise
@@ -69,6 +66,8 @@ button:
   logout: Déconnexion
   login: Connexion
   settings: Paramètres
+  cancel: Cancel
+  redirect: Redirect
 placeholder:
   search-containers: Recherche de conteneurs (⌘ + k, ⌃k)
   search: Recherche
@@ -87,11 +86,10 @@ settings:
   search: Activer la recherche avec Dozzle en utilisant
   using-version: Vous utilisez Dozzle {version}.
   update-available: >-
-    Nouvelle version disponible! Mise à jour de <a href="{href}" target="_blank"
-    rel="noreferrer noopener">{nextVersion}</a>.
+    Nouvelle version disponible! Mise à jour de <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
   show-std: Afficher les étiquettes stdout et stderr
   automatic-redirect: Redirection automatique vers de nouveaux conteneurs portant le même nom
-  cancel: Annuler
+  compact: Activer le mode compact pour les journaux
   log:
     preview: Voici un aperçu des logs
     warning: Un log d'avertissement ressemble à ceci
@@ -101,15 +99,6 @@ settings:
       start-line: Ceci est un message d'erreur multiligne
       middle-line: avec une deuxième ligne
       end-line: et enfin une troisième ligne.
-  compact: Activer le mode compact pour les journaux
-  releases:
-    features: une nouvelle fonctionnalité | {count} fonctionnalités
-    bugFixes: un correctif | {count} correctifs
-    breaking: un changement majeur | {count} changements majeurs
-    three_parts: "{first}, {second} et {third}"
-    two_parts: "{first} avec {second}"
-    latest: Plus récent
-    no_releases: Vous avez la dernière version
 releases:
   features: une nouvelle fonctionnalité | {count} fonctionnalités
   bugFixes: correction d'un bug | {count} bugs

locales/it.yml

@@ -11,14 +11,11 @@ toolbar:
   show-container-name: Mostra nome container
 label:
   containers: Container
+  container: No containers | 1 container | {count} containers
+  service: No services | 1 service | {count} services
+  services: Services
   running-containers: Container in esecuzione
   all-containers: Tutti i Container
-  total-containers: Container Totali
-  running: In esecuzione
-  total-cpu-usage: Utilizzo Totale della CPU
-  total-mem-usage: Utilizzo Totale della Memoria
-  dozzle-version: Versione Dozzle
-  all: Tutto
   host: Host
   hosts: Hosts
   password: Password
@@ -29,15 +26,16 @@ label:
   avg-cpu: CPU (%)
   avg-mem: MEM (%)
   pinned: Spuntato
+  per-page: Rows per page
   host-menu: Host e Container
   swarm-menu: Servizi e Stack
   group-menu: Gruppi Personalizzati
 tooltip:
+  search: Ricerca container (⌘ + k, ⌃k)
+  pin-column: Blocca come colonna
   merge-services: Unisci tutti i servizi in una vista
   merge-containers: Unisci tutti i container in una vista
   merge-hosts: Unisci tutti i container su questo host in una vista
-  search: Ricerca container (⌘ + k, ⌃k)
-  pin-column: Blocca come colonna
 error:
   page-not-found: Questa pagina non esiste
   invalid-auth: Username o password non valide
@@ -46,29 +44,8 @@ error:
   events-stream:
     title: Errore inaspettato
     message: >-
-      Dozzle UI non è stato in grado di connettersi alle API. Controlla la tua configurazione di rete.
-      Se stai utilizzando un reverse proxy, assicurati di averlo configurato correttamente.
+      Dozzle UI non è stato in grado di connettersi alle API. Controlla la tua configurazione di rete. Se stai utilizzando un reverse proxy, assicurati di averlo configurato correttamente.
   events-timeout:
-    alert:
-      redirected:
-        title: Reindirizzato a nuovo container
-        message: Dozzle ti ha automaticamente reindirizzato al nuovo container {containerId}.
-      similar-container-found:
-        title: Trovato container simile
-        message: >-
-          Dozzle ha trovato un container simile {containerId} in esecuzione sullo stesso
-          host e passerà automaticamente ad esso a meno che non si faccia clic su 'Annulla'.
-
-    settings:
-      log:
-        preview: Questa è un'anteprima dei log
-        warning: Un log di avviso appare così
-        complex: Questa è una voce di log complessa in formato json
-        simple: Questo è un messaggio molto lungo che normalmente andrebbe a capo. La disattivazione del soft wrap disabiliterebbe questo comportamento. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        multi-line-error:
-          start-line: Questo è un messaggio di errore multilinea
-          middle-line: con una seconda riga
-          end-line: e infine una terza riga.
     title: Qualcosa non è corretto
     message: >-
       Dozzle UI timed out durante la connessione alle API. Controlla la configurazione di rete e riprova.
@@ -89,6 +66,8 @@ button:
   logout: Logout
   login: Login
   settings: Configurazione
+  cancel: Cancel
+  redirect: Redirect
 placeholder:
   search-containers: Ricerca container (⌘ + k, ⌃k)
   search: Cerca
@@ -107,11 +86,19 @@ settings:
   search: Abilita la ricerca attraverso Dozzle
   using-version: Stai utilizzando Dozzle {version}.
   update-available: >-
-    Nuova versione disponibile! Aggiorna a <a href="{href}" target="_blank"
-    rel="noreferrer noopener">{nextVersion}</a>.
+    Nuova versione disponibile! Aggiorna a <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
   show-std: Visualizza stdout e stderr
   automatic-redirect: Automaticamente reindirizza al nuovo container con lo stesso nome
   compact: Abilita il compact mode per i log
+  log:
+    preview: This is a preview of the logs
+    warning: A warning log looks like this
+    complex: This is a complex log entry as json
+    simple: This is a very very long message which would wrap by default. Disabling soft wraps would disable this. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    multi-line-error:
+      start-line: This is a multi line error message
+      middle-line: with a second line
+      end-line: and finally third line.
 releases:
   features: nuova funzione | {count} funzioni
   bugFixes: nuovo bug fix | {count} fix

locales/pt.yml

@@ -0,0 +1,116 @@
+toolbar:
+  clear: Limpar
+  download: Baixar
+  search: Pesquisar
+  show: Mostrar {std}
+  show-all: Mostrar tudo
+  stop: Parar
+  start: Iniciar
+  restart: Reiniciar
+  show-hostname: Mostrar nome do host
+  show-container-name: Mostrar nome do container
+label:
+  containers: Contêineres
+  container: Nenhum container | 1 container | {count} containers
+  service: Nenhum serviço | 1 serviço | {count} serviços
+  services: Serviços
+  running-containers: Containers em Execução
+  all-containers: Todos os Containers
+  host: Host
+  hosts: Hosts
+  password: Senha
+  username: Usuário
+  container-name: Nome do Container
+  status: Status
+  created: Criado
+  avg-cpu: Média CPU (%)
+  avg-mem: Média MEM (%)
+  pinned: Fixado
+  per-page: Linhas por página
+  host-menu: Hosts e Containers
+  swarm-menu: Serviços e Stacks
+  group-menu: Grupos Personalizados
+tooltip:
+  search: Pesquisar containers (⌘ + k, ⌃k)
+  pin-column: Fixar como coluna
+  merge-services: Mesclar todos os serviços em uma visualização
+  merge-containers: Mesclar todos os containers em uma visualização
+  merge-hosts: Mesclar todos os containers neste host em uma visualização
+error:
+  page-not-found: Esta página não existe
+  invalid-auth: Usuário ou senha inválidos
+  logs-skipped: \{total} entradas ignoradas
+  container-not-found: Container não encontrado
+  events-stream:
+    title: Erro Inesperado
+    message: >-
+      A interface do Dozzle não conseguiu se conectar à API. Verifique suas configurações de rede. Se você estiver usando um proxy reverso, certifique-se de que ele esteja configurado corretamente.
+  events-timeout:
+    title: Algo não está certo
+    message: >-
+      A interface do Dozzle atingiu o tempo limite ao conectar-se à API. Verifique a conexão de rede e tente novamente.
+alert:
+  redirected:
+    title: Redirecionado para novo container
+    message: O Dozzle redirecionou você automaticamente para o novo container {containerId}.
+  similar-container-found:
+    title: Container similar encontrado
+    message: >-
+      O Dozzle encontrou um container similar {containerId} que está em execução no mesmo host e mudará automaticamente para ele, a menos que você clique em 'Cancelar'.
+title:
+  page-not-found: Página não encontrada
+  login: Autenticação Requerida
+  dashboard: 1 container | {count} containers
+  settings: Configurações
+button:
+  logout: Sair
+  login: Entrar
+  settings: Configurações
+  cancel: Cancelar
+  redirect: Redirecionar
+placeholder:
+  search-containers: Pesquisar containers (⌘ + k, ⌃k)
+  search: Pesquisar
+settings:
+  display: Exibição
+  locale: Sobrescrever idioma
+  small-scrollbars: Usar barras de rolagem menores
+  show-timesamps: Mostrar marcas de tempo
+  soft-wrap: Quebrar linhas automaticamente
+  datetime-format: Sobrescrever formato de data e hora
+  font-size: Tamanho da fonte para logs
+  color-scheme: Esquema de cores
+  options: Opções
+  show-stopped-containers: Mostrar containers parados
+  about: Sobre
+  search: Habilitar pesquisa com Dozzle usando
+  using-version: Você está usando Dozzle {version}.
+  update-available: >-
+    Nova versão disponível! Atualize para <a href="{href}" target="_blank" rel="noreferrer noopener">{nextVersion}</a>.
+  show-std: Mostrar rótulos stdout e stderr
+  automatic-redirect: Redirecionar automaticamente para novos containers com o mesmo nome
+  compact: Ativar modo compacto para logs
+  log:
+    preview: Esta é uma prévia dos logs
+    warning: Um log de aviso se parece com isto
+    complex: Esta é uma entrada de log complexa como json
+    simple: Esta é uma mensagem muito longa que seria quebrada por padrão. Desabilitar quebras suaves desabilitaria isso. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    multi-line-error:
+      start-line: Esta é uma mensagem de erro multi-linha
+      middle-line: com uma segunda linha
+      end-line: e finalmente a terceira linha.
+releases:
+  features: uma nova funcionalidade | {count} funcionalidades
+  bugFixes: uma correção de bug | {count} correções
+  breaking: uma mudança incompatível | {count} mudanças incompatíveis
+  three_parts: "{first}, {second} e {third}"
+  two_parts: "{first} com {second}"
+  latest: Mais recente
+  no_releases: Você tem a versão mais recente
+log_actions:
+  copy_log: Copiar log
+  jump_to_context: Ir para contexto
+toasts:
+  copied:
+    title: Copiado
+    message: Log copiado para a área de transferência

locales/ru.yml

@@ -1,21 +1,21 @@
 toolbar:
   clear: Очистить
-  show-hostname: Показать имя хоста
-  show-container-name: Показать имя контейнера
   download: Скачать
   search: Поиск
   show: Показать только {std}
   show-all: Показать все потоки
+  stop: Stop
+  start: Start
+  restart: Restart
+  show-hostname: Показать имя хоста
+  show-container-name: Показать имя контейнера
 label:
   containers: Контейнеры
+  container: No containers | 1 container | {count} containers
+  service: No services | 1 service | {count} services
+  services: Services
   running-containers: Запущенные контейнеры
   all-containers: Все контейнеры
-  total-containers: Всего Контейнеров
-  running: Запущенные
-  total-cpu-usage: Использование процессора
-  total-mem-usage: Использование памяти
-  dozzle-version: Версия Dozzle
-  all: Все
   host: Хост
   hosts: Хосты
   password: Пароль
@@ -25,12 +25,17 @@ label:
   created: Создан
   avg-cpu: средний процессор (%)
   avg-mem: средняя память (%)
+  pinned: Pinned
+  per-page: Rows per page
   host-menu: Хосты и Контейнеры
   swarm-menu: Сервисы и Стеки
   group-menu: Пользовательские Группы
 tooltip:
   search: Поиск контейнеров (⌘ + k, ⌃k)
   pin-column: Закрепить столбец
+  merge-services: Merge all services into one view
+  merge-containers: Merge all containers into one view
+  merge-hosts: Merge all containers on this host into one view
 error:
   page-not-found: Эта страница не доступна.
   invalid-auth: Имя пользователя или пароль неверны.
@@ -39,8 +44,7 @@ error:
   events-stream:
     title: Неожиданная ошибка
     message: >-
-      Dozzle UI не смог подключиться к API. Пожалуйста, проверьте настройки сети.
-      Если вы используете обратный прокси, убедитесь, что он настроен правильно.
+      Dozzle UI не смог подключиться к API. Пожалуйста, проверьте настройки сети. Если вы используете обратный прокси, убедитесь, что он настроен правильно.
   events-timeout:
     title: Что-то не так
     message: >-
@@ -62,6 +66,8 @@ button:
   logout: Выйти
   login: Войти
   settings: Настройки
+  cancel: Cancel
+  redirect: Redirect
 placeholder:
   search-containers: Поиск контейнеров (⌘ + k, ⌃k)
   search: Поиск
@@ -71,13 +77,11 @@ settings:
   small-scrollbars: Уменьшенная полоса прокрутки
   show-timesamps: Показывать временные метки
   soft-wrap: Плавный перенос текста
-  12-24-format: >-
-    Формат времени. По умолчанию, Dozzle будет использовать локализацию вашего браузера.
+  datetime-format: Формат даты и времени
   font-size: Размер шрифта
   color-scheme: Цветовая схема
   options: Опции
   show-stopped-containers: Показывать остановленные контейнеры
-  datetime-format: Формат даты и времени
   about: Информация
   search: Включить поиск с помощью Dozzle, используя
   using-version: Вы используете версию Dozzle {version}.
@@ -95,3 +99,18 @@ settings:
       start-line: Это многострочное сообщение об ошибке
       middle-line: со второй строкой
       end-line: и наконец третьей строкой.
+releases:
+  features: one new feature | {count} features
+  bugFixes: one bug fix | {count} fixes
+  breaking: one breaking change | {count} breaking changes
+  three_parts: "{first}, {second} and {third}"
+  two_parts: "{first} with {second}"
+  latest: Latest
+  no_releases: You have the latest version
+log_actions:
+  copy_log: Copy log
+  jump_to_context: Jump to context
+toasts:
+  copied:
+    title: Copied
+    message: Log copied to clipboard

locales/zh.yml

@@ -10,17 +10,12 @@ toolbar:
   show-hostname: 显示主机名
   show-container-name: 显示容器名称
 label:
-  service: 无服务 | 1 个服务 | {count} 个服务
-  total-containers: 容器总数
-  total-cpu-usage: CPU总使用率
-  total-mem-usage: 内存总使用率
   containers: 容器
   container: 无容器 | 1 容器 | {count} 容器
-  running: 运行中
-  dozzle-version: Dozzle 版本
+  service: 无服务 | 1 个服务 | {count} 个服务
+  services: 服务
   running-containers: 运行中的容器
   all-containers: 所有容器
-  all: 全部
   host: 主机
   hosts: 主机
   password: 密码
@@ -32,9 +27,6 @@ label:
   avg-mem: 平均MEM (%)
   pinned: 固定
   per-page: 每页行数
-  swarm-mode: 集群模式
-  services: 服务
-  custom-groups: 自定义组
   host-menu: 主机和容器
   swarm-menu: 服务和堆栈
   group-menu: 自定义组
@@ -43,6 +35,7 @@ tooltip:
   pin-column: 固定为列
   merge-services: 合并所有服务到一个视图
   merge-containers: 合并所有容器到一个视图
+  merge-hosts: Merge all containers on this host into one view
 error:
   page-not-found: 此页面不存在。
   invalid-auth: 用户名和密码无效。
@@ -51,8 +44,7 @@ error:
   events-stream:
     title: 意外错误
     message: >-
-      Dozzle UI无法连接到API。请检查您的网络设置。
-      如果您使用反向代理，请确保其正确配置。
+      Dozzle UI无法连接到API。请检查您的网络设置。 如果您使用反向代理，请确保其正确配置。
   events-timeout:
     title: 出了点问题
     message: >-

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"embed"
-	"io"
 	"io/fs"
 
 	"net"
@@ -17,7 +16,6 @@ import (
 	"github.com/amir20/dozzle/internal/agent"
 	"github.com/amir20/dozzle/internal/auth"
 	"github.com/amir20/dozzle/internal/docker"
-	"github.com/amir20/dozzle/internal/healthcheck"
 	"github.com/amir20/dozzle/internal/k8s"
 	"github.com/amir20/dozzle/internal/support/cli"
 	docker_support "github.com/amir20/dozzle/internal/support/docker"
@@ -37,122 +35,13 @@ func main() {
 	cli.ValidateEnvVars(cli.Args{}, cli.AgentCmd{})
 	args, subcommand := cli.ParseArgs()
 	if subcommand != nil {
-		switch subcommand.(type) {
-		case *cli.AgentCmd:
-			if args.Mode != "server" {
-				log.Fatal().Msg("Dozzle agent command is only available in server mode")
-			}
-			client, err := docker.NewLocalClient(args.Hostname)
-			if err != nil {
-				log.Fatal().Err(err).Msg("Could not create docker client")
-			}
-			certs, err := cli.ReadCertificates(certs)
-			if err != nil {
-				log.Fatal().Err(err).Msg("Could not read certificates")
-			}
-
-			listener, err := net.Listen("tcp", args.Agent.Addr)
-			if err != nil {
-				log.Fatal().Err(err).Msg("failed to listen")
-			}
-			tempFile, err := os.CreateTemp("./", "agent-*.addr")
-			if err != nil {
-				log.Fatal().Err(err).Msg("failed to create temp file")
-			}
-			io.WriteString(tempFile, listener.Addr().String())
-			go cli.StartEvent(args, "", client, "agent")
-			server, err := agent.NewServer(client, certs, args.Version(), args.Filter)
-			if err != nil {
-				log.Fatal().Err(err).Msg("failed to create agent server")
-			}
-			ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
-			defer stop()
-			go func() {
-				log.Info().Msgf("Dozzle agent version %s", args.Version())
-				log.Info().Msgf("Agent listening on %s", listener.Addr().String())
-
-				if err := server.Serve(listener); err != nil {
-					log.Error().Err(err).Msg("failed to serve")
-				}
-			}()
-			<-ctx.Done()
-			stop()
-			log.Info().Msg("Shutting down agent")
-			server.Stop()
-			log.Debug().Str("file", tempFile.Name()).Msg("Removing temp file")
-			os.Remove(tempFile.Name())
-
-		case *cli.HealthcheckCmd:
-			files, err := os.ReadDir(".")
-			if err != nil {
-				log.Fatal().Err(err).Msg("Failed to read directory")
-			}
-
-			agentAddress := ""
-			for _, file := range files {
-				if match, _ := filepath.Match("agent-*.addr", file.Name()); match {
-					data, err := os.ReadFile(file.Name())
-					if err != nil {
-						log.Fatal().Err(err).Msg("Failed to read file")
-					}
-					agentAddress = string(data)
-					break
-				}
-			}
-			if agentAddress == "" {
-				if err := healthcheck.HttpRequest(args.Addr, args.Base); err != nil {
-					log.Fatal().Err(err).Msg("Failed to make request")
-				}
-			} else {
-				certs, err := cli.ReadCertificates(certs)
-				if err != nil {
-					log.Fatal().Err(err).Msg("Could not read certificates")
-				}
-				ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
-				defer cancel()
-				if err := healthcheck.RPCRequest(ctx, agentAddress, certs); err != nil {
-					log.Fatal().Err(err).Msg("Failed to make request")
-				}
-			}
-
-		case *cli.GenerateCmd:
-			cli.StartEvent(args, "", nil, "generate")
-			if args.Generate.Username == "" || args.Generate.Password == "" {
-				log.Fatal().Msg("Username and password are required")
-			}
-
-			buffer := auth.GenerateUsers(auth.User{
-				Username: args.Generate.Username,
-				Password: args.Generate.Password,
-				Name:     args.Generate.Name,
-				Email:    args.Generate.Email,
-				Filter:   args.Generate.Filter,
-			}, true)
-
-			if _, err := os.Stdout.Write(buffer.Bytes()); err != nil {
-				log.Fatal().Err(err).Msg("Failed to write to stdout")
-			}
-
-		case *cli.AgentTestCmd:
-			certs, err := cli.ReadCertificates(certs)
-			if err != nil {
-				log.Fatal().Err(err).Msg("Could not read certificates")
-			}
-
-			log.Info().Str("endpoint", args.AgentTest.Address).Msg("Connecting to agent")
-
-			agent, err := agent.NewClient(args.AgentTest.Address, certs)
-			if err != nil {
-				log.Fatal().Err(err).Str("endpoint", args.AgentTest.Address).Msg("error connecting to agent")
-			}
-			ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
-			defer cancel()
-			host, err := agent.Host(ctx)
-			if err != nil {
-				log.Fatal().Err(err).Str("endpoint", args.AgentTest.Address).Msg("error fetching host info for agent")
-			}
-
-			log.Info().Str("endpoint", args.AgentTest.Address).Str("version", host.AgentVersion).Str("name", host.Name).Str("id", host.ID).Msg("Successfully connected to agent")
+		runnable, ok := subcommand.(cli.Runnable)
+		if !ok {
+			log.Fatal().Msg("Invalid command")
+		}
+		err := runnable.Run(args, certs)
+		if err != nil {
+			log.Fatal().Err(err).Msg("Failed to run command")
 		}
 
 		os.Exit(0)
@@ -203,7 +92,7 @@ func main() {
 			}
 		}()
 	} else if args.Mode == "k8s" {
-		localClient, err := k8s.NewK8sClient("default")
+		localClient, err := k8s.NewK8sClient(args.Namespace)
 		if err != nil {
 			log.Fatal().Err(err).Msg("Could not create k8s client")
 		}
@@ -213,7 +102,7 @@ func main() {
 			log.Fatal().Err(err).Msg("Could not create k8s cluster service")
 		}
 
-		go cli.StartEvent(args, "k8s", nil, "")
+		go cli.StartEvent(args, "k8s", localClient, "")
 		hostService = clusterService
 	} else {
 		log.Fatal().Str("mode", args.Mode).Msg("Invalid mode")
@@ -243,15 +132,15 @@ func main() {
 func createServer(args cli.Args, hostService web.HostService) *http.Server {
 	_, dev := os.LookupEnv("DEV")
 
-	var provider web.AuthProvider = web.NONE
+	var provider web.AuthProvider = web.None
 	var authorizer web.Authorizer
 	if args.AuthProvider == "forward-proxy" {
 		log.Debug().Msg("Using forward proxy authentication")
-		provider = web.FORWARD_PROXY
+		provider = web.ForwardProxy
 		authorizer = auth.NewForwardProxyAuth(args.AuthHeaderUser, args.AuthHeaderEmail, args.AuthHeaderName, args.AuthHeaderFilter)
 	} else if args.AuthProvider == "simple" {
 		log.Debug().Msg("Using simple authentication")
-		provider = web.SIMPLE
+		provider = web.Simple
 
 		path, err := filepath.Abs("./data/users.yml")
 		if err != nil {

package.json

@@ -1,12 +1,12 @@
 {
   "name": "dozzle",
-  "version": "8.11.1",
+  "version": "8.12.0",
   "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.3.0",
+  "packageManager": "pnpm@10.7.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -30,22 +30,24 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.29.0",
-    "@iconify-json/carbon": "^1.2.7",
+    "@iconify-json/carbon": "^1.2.8",
     "@iconify-json/cil": "^1.2.2",
     "@iconify-json/ic": "^1.2.2",
-    "@iconify-json/material-symbols": "^1.2.14",
+    "@iconify-json/material-symbols": "^1.2.17",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/mdi-light": "^1.2.2",
-    "@iconify-json/octicon": "^1.2.4",
+    "@iconify-json/octicon": "^1.2.5",
     "@iconify-json/ph": "^1.2.2",
-    "@intlify/unplugin-vue-i18n": "^6.0.3",
+    "@intlify/unplugin-vue-i18n": "^6.0.5",
     "@oddbird/css-anchor-positioning": "^0.4.0",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "4.0.6",
-    "@vueuse/components": "^12.5.0",
-    "@vueuse/core": "^12.5.0",
-    "@vueuse/integrations": "^12.5.0",
-    "@vueuse/router": "^12.5.0",
+    "@tailwindcss/vite": "4.0.17",
+    "@vueuse/components": "^13.0.0",
+    "@vueuse/core": "^13.0.0",
+    "@vueuse/integrations": "^13.0.0",
+    "@vueuse/router": "^13.0.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/xterm": "^5.5.0",
     "ansi-to-html": "^0.7.2",
     "d3-array": "^3.2.4",
     "d3-ease": "^3.0.1",
@@ -53,34 +55,36 @@
     "d3-selection": "^3.0.0",
     "d3-shape": "^3.2.0",
     "d3-transition": "^3.0.1",
-    "daisyui": "5.0.0-beta.8",
+    "daisyui": "5.0.9",
     "date-fns": "^4.1.0",
     "entities": "^6.0.0",
     "fuse.js": "^7.1.0",
     "lodash.debounce": "^4.0.8",
     "pinia": "^3.0.1",
     "sortablejs": "^1.15.6",
-    "splitpanes": "^3.1.8",
+    "splitpanes": "^4.0.3",
     "strip-ansi": "^7.1.0",
-    "tailwindcss": "4.0.6",
-    "unplugin-auto-import": "^19.0.0",
-    "unplugin-icons": "^22.0.0",
-    "unplugin-vue-components": "^28.0.0",
-    "unplugin-vue-macros": "^2.14.2",
-    "unplugin-vue-router": "^0.11.2",
-    "vite": "6.1.0",
+    "tailwindcss": "4.0.17",
+    "unplugin-auto-import": "^19.1.2",
+    "unplugin-icons": "^22.1.0",
+    "unplugin-vue-components": "^28.4.1",
+    "unplugin-vue-macros": "^2.14.5",
+    "unplugin-vue-router": "^0.12.0",
+    "vite": "6.2.3",
     "vite-plugin-compression2": "^1.3.3",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-svg-loader": "^5.1.0",
     "vitepress": "1.6.3",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.1",
+    "vue-i18n": "^11.1.2",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@apache-arrow/esnext-esm": "^19.0.0",
+    "@apache-arrow/esnext-esm": "^19.0.1",
+    "@iconify-json/material-symbols-light": "^1.2.17",
+    "@iconify-json/ri": "^1.2.5",
     "@pinia/testing": "^1.0.0",
-    "@playwright/test": "^1.50.1",
+    "@playwright/test": "^1.51.1",
     "@types/d3-array": "^3.2.1",
     "@types/d3-ease": "^3.0.2",
     "@types/d3-scale": "^4.0.9",
@@ -88,24 +92,24 @@
     "@types/d3-shape": "^3.1.7",
     "@types/d3-transition": "^3.0.9",
     "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^22.13.2",
-    "@vitejs/plugin-vue": "5.2.1",
+    "@types/node": "^22.13.14",
+    "@vitejs/plugin-vue": "5.2.3",
     "@vue/compiler-sfc": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
-    "bumpp": "^10.0.3",
+    "bumpp": "^10.1.0",
     "c8": "^10.1.3",
     "concurrently": "^9.1.2",
     "eventsourcemock": "^2.0.0",
     "jsdom": "^26.0.0",
-    "lint-staged": "^15.4.3",
-    "prettier": "^3.5.1",
+    "lint-staged": "^15.5.0",
+    "prettier": "^3.5.3",
     "prettier-plugin-tailwindcss": "^0.6.11",
-    "simple-git-hooks": "^2.11.1",
+    "simple-git-hooks": "^2.12.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.5",
-    "vue-component-type-helpers": "^2.2.0",
-    "vue-tsc": "^2.2.0"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.9",
+    "vue-component-type-helpers": "3.0.0-alpha.2",
+    "vue-tsc": "3.0.0-alpha.2"
   },
   "lint-staged": {
     "*.{js,vue,css,ts,html,md}": [

public/index.html

@@ -2,7 +2,10 @@
 <html class="bg-base-200 text-base-content">
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="theme-color" content="" />
     <title>Dozzle</title>
     <script type="application/json" id="config__json">
       {{ marshal .Config }}
@@ -16,9 +19,10 @@
     <link rel="stylesheet" href="{{ .Base }}/{{ index $css 0}}" />
     <script type="module" src="{{ .Base }}/{{ $js }}"></script>
     {{- end }}
-    <meta name="description" content="Dozzle is a log viewer for Docker" />
+    <meta name="description" content="A log viewer for containers" />
     <meta name="robots" content="noindex" />
     <link rel="apple-touch-icon" href="{{ .Base }}/apple-touch-icon.png" sizes="512x512" />
+    <link rel="manifest" href="{{ .Base }}/manifest.webmanifest" />
   </head>
 
   <body>

public/manifest.webmanifest

@@ -0,0 +1,10 @@
+{
+  "name": "Dozzle",
+  "short_name": "Dozzle",
+  "start_url": "/",
+  "display": "standalone",
+  "lang": "en",
+  "scope": "/",
+  "description": "A log viewer for containers",
+  "icons": [{ "src": "/apple-touch-icon.png", "sizes": "512x512", "type": "image/png" }]
+}

vite.config.ts

@@ -68,7 +68,6 @@ export default defineConfig(() => ({
     }),
     VueI18nPlugin({
       runtimeOnly: true,
-      compositionOnly: true,
       strictMessage: false,
       include: [path.resolve(__dirname, "locales/**")],
     }),