Merge branch 'ent-13535-cli-pfms-el-comando-get_agents-no-funciona-con-nombres-de-sistema-operativos-guardados-con' into 'develop'

Ent-13535-cli-pfms-el-comando-get_agents-no-funciona-con-nombres-de-sistema-operativos-guardados

See merge request artica/pandorafms!7296
This commit is contained in:
Matias Didier 2024-05-08 15:18:10 +00:00
commit 34858fdc15
3 changed files with 5 additions and 3 deletions

View File

@ -7769,4 +7769,6 @@ UPDATE `tdiscovery_apps` SET `version` = '1.5' WHERE `short_name` = 'pandorafms.
-- Delete Create incident from event, from tevent_response
DELETE FROM tevent_response WHERE name = 'Create incident from event';
UPDATE tconfig_os SET `name` = 'Web Server' WHERE `id_os` = 12;
COMMIT;

View File

@ -176,7 +176,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`, `previous
(9,'Windows','Microsoft Windows OS','windows@os.svg', ''),
(10,'Other','Other SO','other-OS@os.svg', ''),
(11,'Network','Network Agent','network-server@os.svg', ''),
(12,'Web Server','Web Server/Application','network-server@os.svg', ''),
(12,'Web Server','Web Server/Application','network-server@os.svg', ''),
(13,'Sensor','Hardware Agent (Sensor)','network-server@os.svg', ''),
(14,'Embedded','Embedded device running an agent','embedded@os.svg', ''),
(15,'Android','Android agent','android@os.svg', ''),

View File

@ -5772,8 +5772,8 @@ sub cli_get_agents() {
}
if($os_name ne '') {
$id_os = get_os_id($dbh, $os_name);
exist_check($id_os,'operative system',$os_name);
$id_os = get_os_id($dbh, safe_input($os_name));
exist_check($id_os,'operative system', $os_name);
$condition .= " AND id_os = $id_os ";
}