Skip to content

Develop - #10

Merged
stawan15 merged 9 commits into
mainfrom
develop
Jul 19, 2026
Merged

Develop#10
stawan15 merged 9 commits into
mainfrom
develop

Conversation

@stawan15

Copy link
Copy Markdown
Owner

No description provided.

stawan15 and others added 8 commits July 19, 2026 12:45
feat: add header bar with project name and git branch, and update log…
style: update action menu titles with Nerd Font icons
feat: replace action list panel with a centered keyboard-driven menu …
# Conflicts:
#	kamal.go
#	main.go
#	styles.go
- Add dashboard.go with SSH-based docker stats polling
- Parse config/deploy.yml to get remote server hosts
- SSH into each server in parallel and run docker stats
- Show CPU%, MEM%, NET I/O, Block I/O per container per server
- Color-coded metrics (ok/warn/crit thresholds)
- Auto-refresh every 8s, manual refresh with 'r'
- Fallback to local docker stats if no config found
- Wire 'p' keybinding to open dashboard in main.go
- Add gopkg.in/yaml.v3 for deploy config parsing
@stawan15

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in main.go by merging origin/main into develop and keeping the dashboard feature changes from the develop branch. The conflicts were in 7 places, all related to the showDashboard feature (key handlers for q/esc/tab/shift+tab, the p:dashboard shortcut, the dashboard overlay in View(), and the status bar hint text). The build passes cleanly — commit 791254d.

@stawan15
stawan15 merged commit 622c7a1 into main Jul 19, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants