Commit Graph

36247 Commits

Author SHA1 Message Date
Daniel Rodriguez eaf24a9798 Merge branch 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' into 'develop'
Ent 11114 gestion de versiones obsolescencia planeada

See merge request artica/pandorafms!6418
2023-10-03 15:41:20 +00:00
Calvo 5a985aabac Removed total_agent_access module from automonitorization 2023-10-03 17:13:40 +02:00
Daniel Maya a842c8249f #12087 Fixed report with fatal error 2023-10-03 15:44:27 +02:00
Jorge Rincon a685a04493 #12166 fixed calendar button and border styles 2023-10-03 15:42:57 +02:00
Daniel Cebrian c2bc53bbd9 #10194 graph adjusted and fixed bug 2023-10-03 15:32:53 +02:00
rafael 29fe86c007 adding .gitignore 2023-10-03 15:25:50 +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
Calvo 1817f2ebeb Automonitorization in one agent pandora.internals 2023-10-03 13:38:02 +02:00
Diego Muñoz-Reja 7408da9a5a Merge branch 'ent-12129-generar-evento-de-tipo-system-criticidad-major-xxxx-server-cannot-process-monitoring-data' into 'develop'
Add support for critical_on_error.

See merge request artica/pandorafms!6507
2023-10-03 11:32:24 +00:00
rafael 95f62f4f77 adding sourcecode for pandora_gotty_exec 2023-10-03 12:47:29 +02:00
Calvo 134aa82330 Deleted mysql app added by mistake 2023-10-03 12:12:50 +02:00
Calvo 7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Enrique Martin 67df5ee92a Fixed vmware app issue, updated migrate code and removed xenserver insert sql 2023-10-03 11:45:59 +02:00
Matias Didier 9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
2023-10-03 08:52:21 +00:00
Enrique Martin cd2fce36c1 Fixed not hash JSON output in discovery plugins 2023-10-03 10:49:47 +02:00
Daniel Cebrian e64eadcb37 #10194 hide widget not activated 2023-10-03 10:31:57 +02:00
rafael 60983ea839 adding vonage integration requirements file for python 2023-10-03 09:33:24 +02:00
Rafael Ameijeiras 01c98ebc77 Merge branch 'ent-11686-15865-tarea-programada-en-windows-para-el-reinicio-de-agentes-windows-erronea' into 'develop'
Added windows restart service update

See merge request artica/pandorafms!6508
2023-10-03 07:17:54 +00:00
artica 19821c4a40 Auto-updated build strings. 2023-10-03 01:00:30 +02:00
rafael ea2901a07e adding vonage integration plugin 2023-10-02 18:04:16 +02:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
rafael 5faee5a8d9 adding ilert integration plugin requirements and .gitignore 2023-10-02 16:26:19 +02:00
rafael b92f8d1584 adding ilert integration plugin 2023-10-02 15:47:30 +02:00
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +02:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop'
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
2023-10-02 11:23:35 +00:00
Daniel Maya 06e42de207 #11391 Fixed date 2023-10-02 12:39:40 +02:00
Rafael Ameijeiras 958c428e91 Merge branch 'ent-12142-error-500-cuando-la-consola-no-conecta-con-la-DB' into 'develop'
Ent 12142 error 500 cuando la consola no conecta con la db

See merge request artica/pandorafms!6515
2023-10-02 10:02:50 +00:00
Daniel Maya 528c5a726a Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs 2023-10-02 10:27:14 +02: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
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop'
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
2023-10-02 07:08:52 +00:00
artica 323572a4c7 Auto-updated build strings. 2023-10-02 01:00:18 +02:00
artica f6fdd587e7 Auto-updated build strings. 2023-10-01 01:00:18 +02:00
artica 7a890d5820 Auto-updated build strings. 2023-09-30 01:00:22 +02:00
Calvo 1073d492f7 Deleted mysql app added by mistake 2023-09-29 15:22:02 +02:00
Calvo bfe9bcaac0 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-29 15:18:08 +02:00
Calvo 33d9badd3e Added md5 check to server path for migrating discovery apps 2023-09-29 15:17:43 +02:00
Jorge Rincon 418624000f #12142 Caught bd exception in php version 8.0 and 8.2 2023-09-29 09:21:08 +02:00
Daniel Cebrian 63bd979855 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-29 08:55:59 +02:00
Daniel Cebrian e7e27855a6 #10194 fixed name empty in agents y monitoring 2023-09-29 08:55:24 +02:00
artica 477d3e62f8 Auto-updated build strings. 2023-09-29 01:00:27 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Daniel Cebrian 9f5836e2cc #10194 new sections in general tactical view 2023-09-28 16:10:57 +02:00
Diego Muñoz-Reja b84ffc124b Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
fix show comment events ticket pandora_enterprise#12066

See merge request artica/pandorafms!6488
2023-09-28 14:06:30 +00:00
alejandro.campos@artica.es 70ad1ea986 minor changes 2023-09-28 13:08:33 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
Jonathan a1d170cf0f #12145 remove maxlength 2023-09-28 11:47:58 +02:00
Jonathan c577fedff4 #12145 remove maxlength 2023-09-28 11:46:15 +02:00