+
+
+
+
+
diff --git a/resources/views/metrics/partials/filter.blade.php b/resources/views/metrics/partials/filter.blade.php
new file mode 100644
index 0000000..af9d898
--- /dev/null
+++ b/resources/views/metrics/partials/filter.blade.php
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+ 10 Minutes
+
+
+ 30 Minutes
+
+
+ 1 Hour
+
+
+ 12 Hours
+
+
+ 1 Day
+
+
+ 7 Days
+
+ Custom
+
+
+
+
+
diff --git a/resources/views/servers/partials/create-server.blade.php b/resources/views/servers/partials/create-server.blade.php
index 630858b..c32b837 100644
--- a/resources/views/servers/partials/create-server.blade.php
+++ b/resources/views/servers/partials/create-server.blade.php
@@ -239,6 +239,7 @@ class="mt-1 block w-full"
+
+
+
+
+
+
-
+
name . ".svg") }}"
- class="h-20 w-20"
+ class="h-[70px] w-[70px]"
alt=""
/>
diff --git a/resources/views/services/partials/status.blade.php b/resources/views/services/partials/status.blade.php
index fa2812e..6fa62ef 100644
--- a/resources/views/services/partials/status.blade.php
+++ b/resources/views/services/partials/status.blade.php
@@ -11,7 +11,7 @@
@endif
@if ($status == \App\Enums\ServiceStatus::UNINSTALLING)
- {{ $status }}
+ {{ $status }}
@endif
@if ($status == \App\Enums\ServiceStatus::FAILED)
diff --git a/resources/views/services/partials/unit-actions.blade.php b/resources/views/services/partials/unit-actions.blade.php
deleted file mode 100644
index b7d03ea..0000000
--- a/resources/views/services/partials/unit-actions.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/resources/views/services/partials/unit-actions/disable.blade.php b/resources/views/services/partials/unit-actions/disable.blade.php
new file mode 100644
index 0000000..8b71fc6
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/disable.blade.php
@@ -0,0 +1,7 @@
+
+
diff --git a/resources/views/services/partials/unit-actions/enable.blade.php b/resources/views/services/partials/unit-actions/enable.blade.php
new file mode 100644
index 0000000..8ae0523
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/enable.blade.php
@@ -0,0 +1,8 @@
+
+
diff --git a/resources/views/services/partials/unit-actions/restart.blade.php b/resources/views/services/partials/unit-actions/restart.blade.php
new file mode 100644
index 0000000..25463e2
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/restart.blade.php
@@ -0,0 +1,7 @@
+
+
diff --git a/resources/views/services/partials/unit-actions/start.blade.php b/resources/views/services/partials/unit-actions/start.blade.php
new file mode 100644
index 0000000..5a33531
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/start.blade.php
@@ -0,0 +1,8 @@
+
+
diff --git a/resources/views/services/partials/unit-actions/stop.blade.php b/resources/views/services/partials/unit-actions/stop.blade.php
new file mode 100644
index 0000000..6c55d3b
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/stop.blade.php
@@ -0,0 +1,8 @@
+
+
diff --git a/resources/views/services/partials/unit-actions/uninstall.blade.php b/resources/views/services/partials/unit-actions/uninstall.blade.php
new file mode 100644
index 0000000..921f929
--- /dev/null
+++ b/resources/views/services/partials/unit-actions/uninstall.blade.php
@@ -0,0 +1,33 @@
+
+
+@push("modals")
+
+
+
+@endpush
diff --git a/routes/api.php b/routes/api.php
index 7e5a574..377de32 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,9 +1,13 @@
name('api.health');
Route::any('git-hooks', GitHookController::class)->name('api.git-hooks');
+
+Route::post('servers/{server}/agent/{id}', AgentController::class)->name('api.servers.agent');
diff --git a/routes/server.php b/routes/server.php
index 5789068..c32921e 100644
--- a/routes/server.php
+++ b/routes/server.php
@@ -7,6 +7,7 @@
use App\Http\Controllers\DatabaseController;
use App\Http\Controllers\DatabaseUserController;
use App\Http\Controllers\FirewallController;
+use App\Http\Controllers\MetricController;
use App\Http\Controllers\PHPController;
use App\Http\Controllers\QueueController;
use App\Http\Controllers\ServerController;
@@ -127,6 +128,10 @@
Route::get('/{server}/services/{service}/enable', [ServiceController::class, 'enable'])->name('servers.services.enable');
Route::get('/{server}/services/{service}/disable', [ServiceController::class, 'disable'])->name('servers.services.disable');
Route::post('/{server}/services/install', [ServiceController::class, 'install'])->name('servers.services.install');
+ Route::delete('/{server}/services/{service}/uninstall', [ServiceController::class, 'uninstall'])->name('servers.services.uninstall');
+
+ // metrics
+ Route::get('/{server}/metrics', [MetricController::class, 'index'])->name('servers.metrics');
// console
Route::get('/{server}/console', [ConsoleController::class, 'index'])->name('servers.console');
diff --git a/scripts/install.sh b/scripts/install.sh
index 19612f6..f73d1e9 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -192,7 +192,6 @@ touch /home/${V_USERNAME}/.logs/workers/worker.log
echo "${V_WORKER_CONFIG}" | tee /etc/supervisor/conf.d/worker.conf
supervisorctl reread
supervisorctl update
-supervisorctl start worker:*
# setup cronjobs
echo "* * * * * cd /home/${V_USERNAME}/vito && php artisan schedule:run >> /dev/null 2>&1" | sudo -u ${V_USERNAME} crontab -
@@ -203,6 +202,9 @@ chown -R ${V_USERNAME}:${V_USERNAME} /home/${V_USERNAME}
# cache
php artisan config:cache
+# start worker
+supervisorctl start worker:*
+
# print info
echo "🎉 Congratulations!"
echo "✅ SSH User: ${V_USERNAME}"
diff --git a/tests/Feature/MetricsTest.php b/tests/Feature/MetricsTest.php
new file mode 100644
index 0000000..cfb1cc1
--- /dev/null
+++ b/tests/Feature/MetricsTest.php
@@ -0,0 +1,40 @@
+actingAs($this->user);
+
+ Service::factory()->create([
+ 'server_id' => $this->server->id,
+ 'name' => 'vito-agent',
+ 'type' => 'monitoring',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->get(route('servers.metrics', ['server' => $this->server]))
+ ->assertSee('CPU Load')
+ ->assertSee('Memory Usage')
+ ->assertSee('Disk Usage')
+ ->assertSee('Resource Usage');
+ }
+
+ public function test_cannot_visit_metrics(): void
+ {
+ $this->actingAs($this->user);
+
+ $this->get(route('servers.metrics', ['server' => $this->server]))
+ ->assertRedirect(route('servers.services', ['server' => $this->server]));
+ }
+}
diff --git a/tests/Feature/ServicesTest.php b/tests/Feature/ServicesTest.php
index c7a8586..20a9509 100644
--- a/tests/Feature/ServicesTest.php
+++ b/tests/Feature/ServicesTest.php
@@ -4,7 +4,10 @@
use App\Enums\ServiceStatus;
use App\Facades\SSH;
+use App\Models\Server;
use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Http;
use Tests\TestCase;
class ServicesTest extends TestCase
@@ -22,6 +25,7 @@ public function test_see_services_list(): void
->assertSee('php')
->assertSee('supervisor')
->assertSee('redis')
+ ->assertSee('vito-agent')
->assertSee('ufw');
}
@@ -235,6 +239,45 @@ public function test_failed_to_disable_service(string $name): void
$this->assertEquals(ServiceStatus::FAILED, $service->status);
}
+ /**
+ * @dataProvider installData
+ */
+ public function test_install_service(string $name, string $type, string $version): void
+ {
+ Http::fake([
+ 'https://api.github.com/repos/vito/vito-agent/releases/latest' => Http::response([
+ 'tag_name' => '0.1.0',
+ ]),
+ ]);
+ SSH::fake('Active: active');
+
+ $this->actingAs($this->user);
+
+ $server = Server::factory()->create([
+ 'user_id' => $this->user->id,
+ 'project_id' => $this->user->current_project_id,
+ ]);
+
+ $keys = $server->sshKey();
+ if (! File::exists($keys['public_key_path']) || ! File::exists($keys['private_key_path'])) {
+ $server->provider()->generateKeyPair();
+ }
+ $this->post(route('servers.services.install', [
+ 'server' => $server,
+ ]), [
+ 'name' => $name,
+ 'type' => $type,
+ 'version' => $version,
+ ])->assertSessionDoesntHaveErrors();
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $server->id,
+ 'name' => $name,
+ 'type' => $type,
+ 'status' => ServiceStatus::READY,
+ ]);
+ }
+
public static function data(): array
{
return [
@@ -247,4 +290,50 @@ public static function data(): array
['mysql'],
];
}
+
+ public static function installData(): array
+ {
+ return [
+ [
+ 'nginx',
+ 'webserver',
+ 'latest',
+ ],
+ [
+ 'php',
+ 'php',
+ '7.4',
+ ],
+ [
+ 'supervisor',
+ 'process_manager',
+ 'latest',
+ ],
+ [
+ 'redis',
+ 'memory_database',
+ 'latest',
+ ],
+ [
+ 'mysql',
+ 'database',
+ '8.0',
+ ],
+ [
+ 'mariadb',
+ 'database',
+ '10.4',
+ ],
+ [
+ 'postgresql',
+ 'database',
+ '16',
+ ],
+ [
+ 'vito-agent',
+ 'monitoring',
+ 'latest',
+ ],
+ ];
+ }
}
diff --git a/tests/Unit/Actions/Service/InstallTest.php b/tests/Unit/Actions/Service/InstallTest.php
new file mode 100644
index 0000000..a1efeda
--- /dev/null
+++ b/tests/Unit/Actions/Service/InstallTest.php
@@ -0,0 +1,156 @@
+ Http::response([['name' => '0.1.0']]),
+ ]);
+
+ $service = app(Install::class)->install($this->server, [
+ 'type' => 'monitoring',
+ 'name' => 'vito-agent',
+ 'version' => 'latest',
+ ]);
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'vito-agent',
+ 'type' => 'monitoring',
+ 'version' => '0.1.0',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->assertNotNull($service->type_data);
+ }
+
+ public function test_install_vito_agent_failed(): void
+ {
+ $this->expectExceptionMessage('Failed to fetch tags');
+ SSH::fake('Active: inactive');
+ Http::fake([
+ 'https://api.github.com/repos/vitodeploy/agent/tags' => Http::response([]),
+ ]);
+ app(Install::class)->install($this->server, [
+ 'type' => 'monitoring',
+ 'name' => 'vito-agent',
+ 'version' => 'latest',
+ ]);
+ }
+
+ public function test_install_nginx(): void
+ {
+ $this->server->webserver()->delete();
+
+ SSH::fake('Active: active');
+
+ $service = app(Install::class)->install($this->server, [
+ 'type' => 'webserver',
+ 'name' => 'nginx',
+ 'version' => 'latest',
+ ]);
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'nginx',
+ 'type' => 'webserver',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->assertNotNull($service->type_data);
+ }
+
+ public function test_install_mysql(): void
+ {
+ $this->server->database()->delete();
+
+ SSH::fake('Active: active');
+
+ $service = app(Install::class)->install($this->server, [
+ 'type' => 'database',
+ 'name' => 'mysql',
+ 'version' => '8.0',
+ ]);
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'mysql',
+ 'type' => 'database',
+ 'version' => '8.0',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->assertNotNull($service->type_data);
+ }
+
+ public function test_install_mysql_failed(): void
+ {
+ $this->expectException(ValidationException::class);
+ app(Install::class)->install($this->server, [
+ 'type' => 'database',
+ 'name' => 'mysql',
+ 'version' => '8.0',
+ ]);
+ }
+
+ public function test_install_supervisor(): void
+ {
+ $this->server->processManager()->delete();
+
+ SSH::fake('Active: active');
+
+ $service = app(Install::class)->install($this->server, [
+ 'type' => 'process_manager',
+ 'name' => 'supervisor',
+ 'version' => 'latest',
+ ]);
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'supervisor',
+ 'type' => 'process_manager',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->assertNotNull($service->type_data);
+ }
+
+ public function test_install_redis(): void
+ {
+ $this->server->memoryDatabase()->delete();
+
+ SSH::fake('Active: active');
+
+ $service = app(Install::class)->install($this->server, [
+ 'type' => 'memory_database',
+ 'name' => 'redis',
+ 'version' => 'latest',
+ ]);
+
+ $this->assertDatabaseHas('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'redis',
+ 'type' => 'memory_database',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ $this->assertNotNull($service->type_data);
+ }
+}
diff --git a/tests/Unit/Actions/Service/UninstallTest.php b/tests/Unit/Actions/Service/UninstallTest.php
new file mode 100644
index 0000000..1f3173a
--- /dev/null
+++ b/tests/Unit/Actions/Service/UninstallTest.php
@@ -0,0 +1,86 @@
+create([
+ 'server_id' => $this->server->id,
+ 'name' => 'vito-agent',
+ 'type' => 'monitoring',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+
+ app(Uninstall::class)->uninstall($this->server->monitoring());
+
+ $this->assertDatabaseMissing('services', [
+ 'server_id' => $this->server->id,
+ 'name' => 'vito-agent',
+ 'type' => 'monitoring',
+ 'version' => 'latest',
+ 'status' => ServiceStatus::READY,
+ ]);
+ }
+
+ /**
+ * Cannot uninstall nginx because some sites using it
+ */
+ public function test_cannot_uninstall_nginx(): void
+ {
+ SSH::fake();
+
+ $this->expectException(ValidationException::class);
+
+ app(Uninstall::class)->uninstall($this->server->webserver());
+ }
+
+ /**
+ * Cannot uninstall mysql because some databases exist
+ */
+ public function test_cannot_uninstall_mysql(): void
+ {
+ SSH::fake();
+
+ Database::factory()->create([
+ 'server_id' => $this->server->id,
+ ]);
+
+ $this->expectException(ValidationException::class);
+
+ app(Uninstall::class)->uninstall($this->server->database());
+ }
+
+ /**
+ * Cannot uninstall supervisor because some queues exist
+ */
+ public function test_cannot_uninstall_supervisor(): void
+ {
+ SSH::fake();
+
+ Queue::factory()->create([
+ 'server_id' => $this->server->id,
+ 'site_id' => $this->site->id,
+ ]);
+
+ $this->expectException(ValidationException::class);
+
+ app(Uninstall::class)->uninstall($this->server->processManager());
+ }
+}