Commit Graph

1286 Commits

Author SHA1 Message Date
Rafael Ameijeiras c48414ac8a Merge branch 'ent-12278-meter-por-defecto-las-integraciones-de-alertas-en-el-paquete-de-pandora-y-generar-comando-y' into 'develop'
Added messaging alerts to pandoradb_data.sql and 66.sql

See merge request artica/pandorafms!6599
2023-10-30 12:45:02 +00:00
Enrique Martin f8c56c5c5c Fixed misstype in pandoradb_data.sql 2023-10-30 13:40:11 +01:00
Enrique Martin 0d0ea46f7d Added messaging alerts to pandoradb_data.sql and 66.sql 2023-10-24 15:50:37 +02:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
Jonathan 33d20a0dae #12264 update translates and MR upload 2023-10-17 17:14:36 +02:00
Matias Didier f0a3b3af63 Merge branch 'ent-11848-meter-modulos-de-seguridad-hardening-y-auditoria-con-el-grupo-de-modulos-security' into 'develop'
Case insensitive option for get module id

See merge request artica/pandorafms!6551
2023-10-16 10:36:23 +00:00
Rafael Ameijeiras f8c99c6ada Merge branch 'ent-11213-plugin-sap-para-discovery-2-0' into 'develop'
Added SAP plugin to MR

See merge request artica/pandorafms!6511
2023-10-11 10:15:20 +00:00
Calvo 8557c68ecd Fix pandoradb bug 2023-10-10 20:01:51 +02:00
Calvo 71c4016d63 Case insensitive option for get module id 2023-10-10 17:58:29 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Enrique Martin 22769342b8 Merge remote-tracking branch 'origin/develop' into ent-11213-plugin-sap-para-discovery-2-0
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/pandoradb_data.sql
2023-10-02 10:24:31 +02:00
Enrique Martin c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop'
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
2023-10-02 07:54:54 +00:00
alejandro fd6757dbde added discovery cloud plugins in MR 2023-09-28 11:08:38 +02:00
Enrique Martin 59024fa846 Added SAP plugin to MR 2023-09-28 09:18:36 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-25 14:08:43 +00:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Enrique Martin 7a725d0c16 Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco'
Conflicts:
   pandora_console/extras/mr/66.sql
2023-09-19 08:42:38 +00:00
Enrique Martin 64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Enrique Martin 6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Calvo 43fe130529 Changed CPU Load modules critical max value from 100 to 0 2023-09-01 16:18:28 +02:00
Calvo 8406fb7d3e Added missing field to pandoradb_data.sql and fix minor bug 2023-09-01 14:12:01 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
Jorge Rincon baa63eac77 Merge branch develop into ent-11595-tip-de-bienvenida-planned-stops 2023-08-18 09:02:14 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
Jorge Rincon ec738436eb #11881 the lts_name token is set empty 2023-08-14 13:54:09 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon 1669859f03 #11881 lts_name token has been cleaned. 2023-08-14 13:18:31 +02:00
Daniel Rodriguez 95b1daf8c3 Merge branch 'ent-11849-actualizacion-traducciones' into 'develop'
Ent 11849 Actualización traducciones

See merge request artica/pandorafms!6332
2023-08-14 10:28:47 +00:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Cebrian 5d5c956a5b #11849 translates and upload mr 2023-08-11 12:12:48 +02:00
Daniel Cebrian 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix'
# Conflicts:
#   pandora_console/extras/mr/65.sql
2023-07-10 09:43:28 +00:00
alejandro e744e60da3 Merge remote-tracking branch 'origin/develop' into ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix 2023-06-29 16:24:04 +02:00
alejandro 51b67aa46c added inventory solarix modules in pandoradb_data.sql 2023-06-29 16:16:55 +02:00
Félix Suárez 4ac36b7754 Replace "[á,a]rtica PFMS" 2023-06-23 15:59:49 -06:00
Jorge Rincon 89355f07a4 #11595 The title and the url of the Tip are updated in the English language. 2023-06-16 12:03:44 +02:00