Remove button 'Monitor Server' and its associated endpoint

computablefacts · Oct 10, 2024 · a0cf5a6 · a0cf5a6
1 parent d433474
commit a0cf5a6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 77 deletions.
diff --git a/app/Contracts/Requests/MonitorServer.php b/app/Contracts/Requests/MonitorServer.php
diff --git a/app/Http/Controllers/YnhServerController.php b/app/Http/Controllers/YnhServerController.php
@@ -20,7 +20,6 @@
 use App\Http\Requests\DownloadBackupRequest;
 use App\Http\Requests\ExecuteShellCommandRequest;
 use App\Http\Requests\InstallAppRequest;
-use App\Http\Requests\MonitorServerRequest;
 use App\Http\Requests\PullServerInfosRequest;
 use App\Http\Requests\RemoveHostRequest;
 use App\Http\Requests\RemoveUserPermissionRequest;
@@ -195,20 +194,6 @@ public function configure(YnhServer $server, ConfigureHostRequest $request)
         return response()->json(['success' => "Your host is being configured!"]);
     }
 
-    public function monitorServer(YnhServer $server, MonitorServerRequest $request)
-    {
-        if ($server->isFrozen()) {
-            return response()->json(['error' => "The server configuration is frozen."]);
-        }
-
-        $uid = Str::random(10);
-        $ssh = $server->sshConnection($uid, Auth::user());
-        if ($server->sshMonitorServer($ssh)) {
-            return response()->json(['success' => "Osquery has been installed!"]);
-        }
-        return response()->json(['error' => "An error occurred."]);
-    }
-
     public function create(CreateHostRequest $request)
     {
         $orderId = $request->input('order', 0);

diff --git a/app/Http/Requests/MonitorServerRequest.php b/app/Http/Requests/MonitorServerRequest.php
diff --git a/app/Models/YnhServer.php b/app/Models/YnhServer.php
@@ -357,12 +357,12 @@ public function sshTestConnection(): bool
     public function sshMonitorServer(SshConnection2 $ssh): bool
     {
         $installScript = YnhOsquery::monitorServer($this);
-        $ssh->newTrace(SshTraceStateEnum::IN_PROGRESS, 'Installing Osquery...');
+        $ssh->newTrace(SshTraceStateEnum::IN_PROGRESS, 'Installing tools for monitoring servers...');
         $filename = 'install-yunohost-' . Str::random(10);
         $isOk = $ssh->upload($filename, $installScript);
         $isOk = $isOk && $ssh->executeScript($filename, true);
         if ($isOk) {
-            $ssh->newTrace(SshTraceStateEnum::DONE, 'Osquery installed.');
+            $ssh->newTrace(SshTraceStateEnum::DONE, 'Tools for monitoring servers installed.');
         }
         return $isOk;
     }

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -125,7 +125,6 @@
   "Overview": "Aperçu",
   "Settings": "Paramètres",
   "Server Settings": "Paramètres serveurs",
-  "Monitor Host": "Surveiller l'hôte",
   "Configure Host": "Configurer l'hôte",
   "Monitor >": "Surveiller >",
   "User's name": "Nom de l'utilisateur",

diff --git a/resources/views/home/forms/_servers.blade.php b/resources/views/home/forms/_servers.blade.php
@@ -143,11 +143,6 @@ class="bi bi-clipboard" viewBox="0 0 16 16">
         {{ __('Configure Host') }}
       </button>
       @endif
-      @if(Auth::user()->canManageServers() && !$server->addedWithCurl())
-      <button type="button" onclick="monitorHost()" class="btn btn-outline-primary mx-4">
-        {{ __('Monitor Host') }}
-      </button>
-      @endif
     </div>
     @if(Auth::user()->canManageServers())
     <div>
@@ -208,18 +203,6 @@ function setupHost() {
     }).catch(error => toaster.toastAxiosError(error));
   }
 
-  function monitorHost() {
-    axios.post("{{ route('ynh.servers.monitor-server', $server) }}", {}).then(function (response) {
-      if (response.data.success) {
-        toaster.toastSuccess(response.data.success);
-      } else if (response.data.error) {
-        toaster.toastError(response.data.error);
-      } else {
-        console.log(response.data);
-      }
-    }).catch(error => toaster.toastAxiosError(error));
-  }
-
   function removeFromInventory() {
 
     const response = confirm(`Are you sure you want to remove {{ $server->name }} from the inventory?`);

diff --git a/routes/web.php b/routes/web.php
@@ -320,7 +320,6 @@
         Route::post('{server}/pull-server-infos', 'YnhServerController@pullServerInfos')->name('pull-server-infos');
         Route::post('{server}/test-ssh-connection', 'YnhServerController@testSshConnection')->name('test-ssh-connection');
         Route::post('{server}/configure', 'YnhServerController@configure')->name('configure');
-        Route::post('{server}/monitor-server', 'YnhServerController@monitorServer')->name('monitor-server');
         Route::post('{server}/backup', 'YnhServerController@createBackup')->name('create-backup');
         Route::get('{server}/backup/{backup}', 'YnhServerController@downloadBackup')->name('download-backup');
         Route::post('{server}/execute-shell-command', 'YnhServerController@executeShellCommand')->name('execute-shell-command');