Commit Graph

7539 Commits

Author SHA1 Message Date
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
artica 477d3e62f8 Auto-updated build strings. 2023-09-29 01:00:27 +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
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00
Diego Muñoz-Reja 5fc3ed3338 Merge branch 'ent-9670-mejoras-automonitorizacion' into 'develop'
WIP:Automonitorization Upgrades

See merge request artica/pandorafms!6199
2023-09-27 11:43:38 +00:00
artica da935b6569 Auto-updated build strings. 2023-09-27 01:00:22 +02:00
artica fbeb616eb8 Auto-updated build strings. 2023-09-26 01:00:25 +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
artica 8c19a075c3 Auto-updated build strings. 2023-09-25 01:00:18 +02:00
artica fa2e94eea3 Auto-updated build strings. 2023-09-24 01:00:19 +02:00
artica 7b3b1f9ccc Auto-updated build strings. 2023-09-23 01:00:21 +02:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00
Rafael Ameijeiras d136b7a9e3 Merge branch 'ent-9857-complex-alert-processing' into 'develop'
Ent-9857-complex-alert-processing

Closes pandora_enterprise#9857

See merge request artica/pandorafms!6347
2023-09-21 15:41:24 +00:00
Calvo efb2a3a314 Automonitorization 2023-09-21 15:53:13 +02:00
artica 963664c1d8 Auto-updated build strings. 2023-09-21 01:00:30 +02:00
Calvo 438393ed99 WIP: Automonitorization modules. WUX and Alerts 2023-09-20 18:33:15 +02:00
felix.suarez fbad0d9bcc Fix: Avg. math function for complex alert 2023-09-20 08:18:39 -05:00
felix.suarez b7bc70f4ae Fix: return status for non activated alert 2023-09-20 08:18:39 -05:00
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Rafael Ameijeiras ff2cc62c4f Merge branch 'ent-11921-discovery-2-0-crear-paquetes-especificos-de-server-y-consola-el7-y-el8-con-los-binarios-del' into 'develop'
Add open discovery to packaging

See merge request artica/pandorafms!6448
2023-09-20 11:18:18 +00:00
artica 92b8446110 Auto-updated build strings. 2023-09-20 01:00:27 +02:00
artica 1bb1bb11b2 Auto-updated build strings. 2023-09-19 01:00:29 +02:00
Calvo 361e3225a1 Merge remote-tracking branch 'origin/develop' into ent-9670-mejoras-automonitorizacion 2023-09-18 17:34:53 +02:00
Calvo 7a16163371 WIP: Automonitorization modules 2023-09-18 17:34:28 +02:00
Rafael Ameijeiras 83732250da Merge branch 'ent-11363-automonitoring-alertserver' into 'develop'
Ent-11363-automonitoring-alertserver

Closes pandora_enterprise#11363

See merge request artica/pandorafms!6406
2023-09-18 13:20:37 +00:00
Calvo 34808843e6 Merge remote-tracking branch 'origin/develop' into ent-9670-mejoras-automonitorizacion 2023-09-18 08:07:05 +02:00
artica 2c055a4488 Auto-updated build strings. 2023-09-18 01:00:20 +02:00
artica 4450f4d5fe Auto-updated build strings. 2023-09-17 01:00:20 +02:00
artica 495780b8a8 Auto-updated build strings. 2023-09-16 01:00:25 +02:00
artica 95f9ddba01 Auto-updated build strings. 2023-09-15 01:00:29 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
Rafael Ameijeiras c05178ccf9 Merge branch 'ent-12033-vista-tactica-vista-de-servidores-no-muestra-modulos-de-red' into 'develop'
Fix counters tactical view pandora_enterprise#12033

See merge request artica/pandorafms!6441
2023-09-14 12:34:58 +00:00
Calvo 0435a6998d Merge remote-tracking branch 'origin/develop' into ent-9670-mejoras-automonitorizacion 2023-09-14 13:48:30 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
artica 018938cb8e Auto-updated build strings. 2023-09-14 01:00:27 +02:00
Rafael Ameijeiras 483076c1ee Merge branch 'ent-12014-anadir-a-docker-de-desarrollo-licencia-de-200-agentes-carga-de-agentes-automatica-por' into 'develop'
12014 set agents to 150

See merge request artica/pandorafms!6429
2023-09-13 12:49:07 +00:00
daniel dee6f70703 Merge remote-tracking branch 'origin/develop' into ent-12033-vista-tactica-vista-de-servidores-no-muestra-modulos-de-red 2023-09-13 13:48:10 +02:00
artica a46a43fd89 Auto-updated build strings. 2023-09-13 01:00:30 +02:00
Enrique Martin 8ae2631a56 Add open discovery to packaging 2023-09-12 16:46:05 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 9d70802083 Fix counters tactical view pandora_enterprise#12033 2023-09-12 10:49:02 +02:00
artica 283bb1f571 Auto-updated build strings. 2023-09-12 01:00:27 +02:00
daniel fdaaf1a2e8 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-11 08:47:55 +02:00
artica 7af74d74b3 Auto-updated build strings. 2023-09-11 01:00:20 +02:00
artica 3a836c59dd Auto-updated build strings. 2023-09-10 01:00:20 +02:00
artica 2cc97b37fc Auto-updated build strings. 2023-09-09 01:00:23 +02:00
rafael a78297c61b 12014 set agents to 150 2023-09-08 13:13:03 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00