-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Refactor monitoring resources and enhance dashboard filters #3754
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Darkace01
wants to merge
4
commits into
Dokploy:canary
from
Darkace01:feat/monitoring-project-resource-filters
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b3d5d1d
feat: enhance monitoring dashboard with project and resource filters
Darkace01 4d8791f
style: format code for improved readability in monitoring dashboard
Darkace01 90157dc
Initial dev container setup
Darkace01 fad952f
refactor(monitoring): extract monitoring resources builder and add un…
Darkace01 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| # Dockerfile for DevContainer | ||
| FROM node:24.4.0-bullseye-slim | ||
|
|
||
| # Install essential packages | ||
| RUN apt-get update && apt-get install -y \ | ||
| curl \ | ||
| bash \ | ||
| git \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # Set up PNPM | ||
| ENV PNPM_HOME="/pnpm" | ||
| ENV PATH="$PNPM_HOME:$PATH" | ||
| RUN corepack enable && corepack prepare pnpm@10.22.0 --activate | ||
|
|
||
| # Create workspace directory | ||
| WORKDIR /workspaces/dokploy | ||
|
|
||
| # Set up user permissions | ||
| # Dockerfile for DevContainer | ||
| FROM node:24.4.0-bullseye-slim | ||
| # Install essential packages | ||
| RUN apt-get update && apt-get install -y \ | ||
| curl \ | ||
| bash \ | ||
| git \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| # Set up PNPM | ||
| ENV PNPM_HOME="/pnpm" | ||
| ENV PATH="$PNPM_HOME:$PATH" | ||
| RUN corepack enable && corepack prepare pnpm@10.22.0 --activate | ||
| # Create workspace directory | ||
| WORKDIR /workspaces/dokploy | ||
| # Set up user permissions | ||
| USER node |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,54 @@ | ||
| { | ||
| "name": "Dokploy development container", | ||
| "build": { | ||
| "dockerfile": "Dockerfile", | ||
| "context": ".." | ||
| }, | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": { | ||
| "moby": true, | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers/features/git:1": { | ||
| "ppa": true, | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers/features/go:1": { | ||
| "version": "1.20" | ||
| } | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-vscode.vscode-typescript-next", | ||
| "bradlc.vscode-tailwindcss", | ||
| "ms-vscode.vscode-json", | ||
| "biomejs.biome", | ||
| "golang.go", | ||
| "redhat.vscode-xml", | ||
| "github.vscode-github-actions", | ||
| "github.copilot", | ||
| "github.copilot-chat" | ||
| ] | ||
| } | ||
| }, | ||
| "forwardPorts": [3000, 5432, 6379], | ||
| "portsAttributes": { | ||
| "3000": { | ||
| "label": "Dokploy App", | ||
| "onAutoForward": "notify" | ||
| }, | ||
| "5432": { | ||
| "label": "PostgreSQL", | ||
| "onAutoForward": "silent" | ||
| }, | ||
| "6379": { | ||
| "label": "Redis", | ||
| "onAutoForward": "silent" | ||
| } | ||
| }, | ||
| "remoteUser": "node", | ||
| "workspaceFolder": "/workspaces/dokploy", | ||
| "runArgs": ["--name", "dokploy-devcontainer"] | ||
| } | ||
| { | ||
| "name": "Dokploy development container", | ||
| "build": { | ||
| "dockerfile": "Dockerfile", | ||
| "context": ".." | ||
| }, | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": { | ||
| "moby": true, | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers/features/git:1": { | ||
| "ppa": true, | ||
| "version": "latest" | ||
| }, | ||
| "ghcr.io/devcontainers/features/go:1": { | ||
| "version": "1.20" | ||
| }, | ||
| "ghcr.io/devcontainers/features/python:1": { "version": "3.11" } | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-vscode.vscode-typescript-next", | ||
| "bradlc.vscode-tailwindcss", | ||
| "ms-vscode.vscode-json", | ||
| "biomejs.biome", | ||
| "golang.go", | ||
| "redhat.vscode-xml", | ||
| "github.vscode-github-actions", | ||
| "github.copilot", | ||
| "github.copilot-chat" | ||
| ] | ||
| } | ||
| }, | ||
| "forwardPorts": [3000, 5432, 6379], | ||
| "portsAttributes": { | ||
| "3000": { | ||
| "label": "Dokploy App", | ||
| "onAutoForward": "notify" | ||
| }, | ||
| "5432": { | ||
| "label": "PostgreSQL", | ||
| "onAutoForward": "silent" | ||
| }, | ||
| "6379": { | ||
| "label": "Redis", | ||
| "onAutoForward": "silent" | ||
| } | ||
| }, | ||
| "remoteUser": "node", | ||
| "workspaceFolder": "/workspaces/dokploy", | ||
| "runArgs": ["--name", "dokploy-devcontainer"] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| node_modules | ||
| .git | ||
| .gitignore | ||
| *.md | ||
| node_modules | ||
| .git | ||
| .gitignore | ||
| *.md | ||
| dist |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| # These owners will be the default owners for everything in | ||
| * @siumauricio | ||
| # These owners will be the default owners for everything in | ||
| * @siumauricio |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| # These are supported funding model platforms | ||
|
|
||
| github: [siumauricio] | ||
| patreon: # | ||
| open_collective: dokploy | ||
| ko_fi: # Replace with a single Ko-fi username | ||
| tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel | ||
| community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry | ||
| liberapay: # Replace with a single Liberapay username | ||
| issuehunt: # Replace with a single IssueHunt username | ||
| otechie: # Replace with a single Otechie username | ||
| lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry | ||
| custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] | ||
| # These are supported funding model platforms | ||
| github: [siumauricio] | ||
| patreon: # | ||
| open_collective: dokploy | ||
| ko_fi: # Replace with a single Ko-fi username | ||
| tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel | ||
| community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry | ||
| liberapay: # Replace with a single Liberapay username | ||
| issuehunt: # Replace with a single IssueHunt username | ||
| otechie: # Replace with a single Otechie username | ||
| lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry | ||
| custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,95 +1,95 @@ | ||
| name: Bug Report | ||
| description: Create a bug report | ||
| labels: ["needs-triage🔍"] | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| Before opening a new issue, please do a search of existing issues. | ||
|
|
||
| If you need help with your own project, you can start a discussion in the [Q&A Section](https://github.com/Dokploy/dokploy/discussions). | ||
| - type: textarea | ||
| attributes: | ||
| label: To Reproduce | ||
| description: | | ||
| A detailed, step-by-step description of how to reproduce the issue is required. | ||
| Please ensure your report includes clear instructions using numbered lists. | ||
|
|
||
| If possible, provide a link to a repository or project where the issue can be reproduced. | ||
| placeholder: | | ||
| 1. Create a application | ||
| 2. Click X | ||
| 3. Y will happen | ||
|
|
||
| Make sure to: | ||
| - Use numbered lists to outline steps clearly. | ||
| - Include all relevant commands and configurations. | ||
| - Provide a link to a reproducible repository if applicable. | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Current vs. Expected behavior | ||
| description: A clear and concise description of what the bug is, and what you expected to happen. | ||
| placeholder: "Following the steps from the previous section, I expected A to happen, but I observed B instead" | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Provide environment information | ||
| description: Please provide the following information about your environment. | ||
| render: bash | ||
| placeholder: | | ||
| Operating System: | ||
| OS: Ubuntu 20.04 | ||
| Arch: arm64 | ||
| Dokploy version: 0.2.2' | ||
| VPS Provider: DigitalOcean, Hetzner, Linode, etc. | ||
| What applications/services are you tying to deploy? | ||
| eg - Database, Nextjs App, laravel, etc. | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| attributes: | ||
| label: Which area(s) are affected? (Select all that apply) | ||
| multiple: true | ||
| options: | ||
| - "Installation" | ||
| - "Application" | ||
| - "Databases" | ||
| - "Docker Compose" | ||
| - "Traefik" | ||
| - "Docker" | ||
| - "Remote server" | ||
| - "Local Development" | ||
| - "Cloud Version" | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| attributes: | ||
| label: Are you deploying the applications where Dokploy is installed or on a remote server? | ||
| options: | ||
| - "Same server where Dokploy is installed" | ||
| - "Remote server" | ||
| - "Both" | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Additional context | ||
| description: | | ||
| Any extra information that might help us investigate. | ||
| placeholder: | | ||
| I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12. | ||
|
|
||
| - type: dropdown | ||
| attributes: | ||
| label: Will you send a PR to fix it? | ||
| description: Let us know if you are planning to submit a pull request to address this issue. | ||
|
|
||
| options: | ||
| - "Yes" | ||
| - "No" | ||
| - "Maybe, need help" | ||
| validations: | ||
| required: true | ||
| name: Bug Report | ||
| description: Create a bug report | ||
| labels: ["needs-triage🔍"] | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| Before opening a new issue, please do a search of existing issues. | ||
| If you need help with your own project, you can start a discussion in the [Q&A Section](https://github.com/Dokploy/dokploy/discussions). | ||
| - type: textarea | ||
| attributes: | ||
| label: To Reproduce | ||
| description: | | ||
| A detailed, step-by-step description of how to reproduce the issue is required. | ||
| Please ensure your report includes clear instructions using numbered lists. | ||
| If possible, provide a link to a repository or project where the issue can be reproduced. | ||
| placeholder: | | ||
| 1. Create a application | ||
| 2. Click X | ||
| 3. Y will happen | ||
| Make sure to: | ||
| - Use numbered lists to outline steps clearly. | ||
| - Include all relevant commands and configurations. | ||
| - Provide a link to a reproducible repository if applicable. | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Current vs. Expected behavior | ||
| description: A clear and concise description of what the bug is, and what you expected to happen. | ||
| placeholder: "Following the steps from the previous section, I expected A to happen, but I observed B instead" | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Provide environment information | ||
| description: Please provide the following information about your environment. | ||
| render: bash | ||
| placeholder: | | ||
| Operating System: | ||
| OS: Ubuntu 20.04 | ||
| Arch: arm64 | ||
| Dokploy version: 0.2.2' | ||
| VPS Provider: DigitalOcean, Hetzner, Linode, etc. | ||
| What applications/services are you tying to deploy? | ||
| eg - Database, Nextjs App, laravel, etc. | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| attributes: | ||
| label: Which area(s) are affected? (Select all that apply) | ||
| multiple: true | ||
| options: | ||
| - "Installation" | ||
| - "Application" | ||
| - "Databases" | ||
| - "Docker Compose" | ||
| - "Traefik" | ||
| - "Docker" | ||
| - "Remote server" | ||
| - "Local Development" | ||
| - "Cloud Version" | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| attributes: | ||
| label: Are you deploying the applications where Dokploy is installed or on a remote server? | ||
| options: | ||
| - "Same server where Dokploy is installed" | ||
| - "Remote server" | ||
| - "Both" | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Additional context | ||
| description: | | ||
| Any extra information that might help us investigate. | ||
| placeholder: | | ||
| I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12. | ||
| - type: dropdown | ||
| attributes: | ||
| label: Will you send a PR to fix it? | ||
| description: Let us know if you are planning to submit a pull request to address this issue. | ||
| options: | ||
| - "Yes" | ||
| - "No" | ||
| - "Maybe, need help" | ||
| validations: | ||
| required: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Questions? | ||
| url: https://github.com/Dokploy/dokploy/discussions | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Questions? | ||
| url: https://github.com/Dokploy/dokploy/discussions | ||
| about: Ask your questions here. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PR description does not explain why Python 3.11 is being added to the development container. This addition appears unrelated to the monitoring refactoring work and lacks justification in the PR context.