jaro/remotesupport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make parallel and serial checks

Browse Source
This commit is contained in:
skjaro
2021-12-22 19:50:52 +01:00
parent 1dc3c4a557
commit 68e726fae3
3 changed files with 111 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,5 +1,5 @@
# RemoteSupport # RemoteSupport
GLPI Plugin for direct VNC connection from browser inside computer from server GLPI Plugin for direct VNC connection from browser inside computer from server and update status of online computers, it checks computer with go program in glpi cron and with fusion inventory agent...
This Plugin add a simple button inside computer: This Plugin add a simple button inside computer:

BIN
bin/check_status
View File

Binary file not shown.

42
inc/remotesupport.class.php
View File

@@ -11,8 +11,9 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
$config = Config::getConfigurationValues('plugin:Remotesupport'); $config = Config::getConfigurationValues('plugin:Remotesupport');
if ($config["show_in_computers"] == false) if ($config["show_in_computers"] == false) {
return true; return true;
}
if ($config["fusion"] == true && $config["easy_novnc"] == true) { if ($config["fusion"] == true && $config["easy_novnc"] == true) {
$pfInventoryComputerComputer = new PluginFusioninventoryInventoryComputerComputer(); $pfInventoryComputerComputer = new PluginFusioninventoryInventoryComputerComputer();
@@ -34,7 +35,7 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
echo '<tr class="tab_bg_1">'; echo '<tr class="tab_bg_1">';
echo '<td>'; echo '<td>';
$url = "<a target=\"_blank\" href=\"". $href ."\"><li class=\"document\"><i class=\"fa fa-laptop-medical\"></i>" . $name . "</li></a>"; $url = "<a target=\"_blank\" href=\"" . $href . "\"><li class=\"document\"><i class=\"fa fa-laptop-medical\"></i>" . $name . "</li></a>";
if ($url != "") { if ($url != "") {
echo "<div><ul class=\"timeline_choices\"><h2>VNC connect : </h2>"; echo "<div><ul class=\"timeline_choices\"><h2>VNC connect : </h2>";
@@ -83,10 +84,13 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
$config = Config::getConfigurationValues('plugin:Remotesupport'); $config = Config::getConfigurationValues('plugin:Remotesupport');
if ($config["fusion"]) if ($config["fusion"] || $config["run_mode"] == "None") {
return 0; return 0;
}
Toolbox::logInFile("remotsupport", "Starting search of agents\n"); Toolbox::logInFile("remotsupport", "Starting search of agents\n");
if ($config["run_mode"] == "Parallel") {
$pfConfig = new PluginFusioninventoryConfig(); $pfConfig = new PluginFusioninventoryConfig();
$port = $pfConfig->getValue('agent_port'); $port = $pfConfig->getValue('agent_port');
$rs_path = Plugin::getPhpDir('remotesupport'); $rs_path = Plugin::getPhpDir('remotesupport');
@@ -139,6 +143,32 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
Toolbox::logInFile("remotsupport", "command returned $return_value\n"); Toolbox::logInFile("remotsupport", "command returned $return_value\n");
} }
} else {
$agents = [];
$data_set = [];
$checked = [];
foreach (getAllDataFromTable(PluginFusioninventoryAgent::getTable()) as $a) {
$data_set[] = $a["id"];
$agents[$a["id"]] = $a;
}
foreach ($data_set as $id) {
$agent = new PluginFusioninventoryAgent;
$agent->getFromDB((int) $id);
$st = $agent->getStatus();
if ($st["message"] != "noanswer") {
$check = new stdClass();
$check->computers_id = $agents[$id]["computers_id"];
$checked[] = $check;
}
}
}
$stids = self::getStatesIds(); $stids = self::getStatesIds();
$DB->update("glpi_computers", [ $DB->update("glpi_computers", [
@@ -148,6 +178,7 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
$ids = []; $ids = [];
$cids = self::getContactArray(); $cids = self::getContactArray();
foreach ($checked as $s) { foreach ($checked as $s) {
$comp = new Computer(); $comp = new Computer();
@@ -157,11 +188,10 @@ class PluginRemotesupportRemotesupport extends CommonDBTM
} }
$DB->update("glpi_computers", [ $DB->update("glpi_computers", [
'states_id' => $stids["Online"] ], 'states_id' => $stids["Online"]],
['id' => $ids ] ['id' => $ids]
); );
return 0; return 0;
} }