tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,466 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

2616 Commits

Author SHA1 Message Date
Jonathan d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
daniel e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde 
Conflicts:
	pandora_console/index.php
 2023-12-19 14:56:04 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Daniel Maya 971db37147 #12649 remove trace 2023-12-15 10:19:52 +01:00
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
Diego Muñoz-Reja b545cfec23 Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop' 
Optimiized monitors view

See merge request artica/pandorafms!6627
 2023-12-15 07:18:13 +00:00
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-14 11:05:29 +01:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-13 10:39:48 +01:00
Jonathan 5279bb3e17 Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes 2023-12-13 08:24:43 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop' 
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
 2023-12-11 14:27:39 +00:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
Rafael Ameijeiras 1e2f573a3b Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop' 
Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona

See merge request artica/pandorafms!6673
 2023-12-11 08:28:56 +00:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-05 08:02:55 +01:00
Jorge Rincon cc1c138552 #12518 Fixed up custom field type link 2023-12-04 11:23:43 +01:00
Jonathan 1fb98d34ae #12296 fix conflict merge develop 2023-12-01 11:59:03 +01:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
Jorge Rincon 03fea82124 #12524 fixed opening items in new tabs Monitoring and Alerts view 2023-11-30 08:45:34 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' 
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
 2023-11-29 14:26:53 +00:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
 2023-11-28 08:29:10 +01:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
Rafael Ameijeiras 4ac9316391 Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop' 
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas

See merge request artica/pandorafms!6475
 2023-11-27 14:51:02 +00:00
miguel angel rasteu cac31cc482 #12137 Resolve conflicts 2023-11-27 13:05:43 +01:00
Matias Didier c7d28b9a77 Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop' 
Fix pagination interfaces pandora_enterprise#12356

See merge request artica/pandorafms!6626
 2023-11-27 11:38:19 +00:00
miguel angel rasteu b0125d943e #12138 Resolve conflict 2023-11-27 11:51:00 +01:00
Rafael Ameijeiras 5d94be5e7f Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop' 
Ent 12134 contador de agentes modulos en las vistas

See merge request artica/pandorafms!6566
 2023-11-27 10:42:01 +00:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
Jorge Rincon b4e07c8ce7 #12067 Added easter egg, think green 2023-11-23 17:31:11 +01:00
miguel angel rasteu 99c5da677d #12137 Fix entities 2023-11-16 08:37:41 +01:00
miguel angel rasteu 8b9d52646c Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente 2023-11-16 08:06:20 +01:00
Daniel Maya 804970719d #12385 Fixed group 2023-11-15 16:32:02 +01:00
Daniel Maya 6059f4dea0 #12453 Changed string 2023-11-15 13:10:19 +01:00
Jonathan 4fec6a1ccb #12296 restyling agent detail filters 2023-11-14 17:04:31 +01:00
Daniel Rodriguez 7fdca7aa12 Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop' 
Add support for inventory vulnerability scans.

See merge request artica/pandorafms!6487
 2023-11-13 08:24:48 +00:00
Ramon Novoa 8ec1432414 Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner 2023-11-10 09:53:17 +01:00
daniel 9ccb6a98c6 fix alert details pandora_enterprise#12423 2023-11-08 12:49:45 +01:00
daniel c81b42cc95 Remove filter group for alert pandora_enterprise#12423 2023-11-07 16:17:13 +01:00
Calvo 92ee718f91 Optimiized monitors view 2023-11-03 17:48:15 +01:00
daniel 84d450e35e Fix pagination interfaces pandora_enterprise#12356 2023-11-03 13:10:09 +01:00
miguel angel rasteu 88f1b964e3 Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente 2023-11-02 15:22:57 +01:00
miguel angel rasteu 3822ffc0f0 #12137 Fix agent view 2023-11-02 15:22:49 +01:00
miguel angel rasteu 47aeb3cc39 #12137 Fix Description 2023-11-02 13:22:42 +01:00
Daniel Maya 4c368e5da5 #12344 Fixed filter 3 2023-11-02 12:33:30 +01:00
Daniel Maya ed1ae83770 #12344 Fixed log source 2023-10-30 15:15:53 +01:00
Jonathan c01af3e9b6 Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 08:37:37 +01:00
Jorge Rincon 407a505a3e #8365 Added reports for ncm backups. 2023-10-27 14:32:48 +02:00
daniel 04a8717aed Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
 2023-10-25 15:58:10 +02:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02:00
Daniel Cebrian 490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02:00
daniel d8dfaf0fe3 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-23 17:02:51 +02:00
alejandro.campos@artica.es a747b8fa56 fix 2023-10-23 14:09:38 +02:00
Daniel Cebrian b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
daniel 4fb7e1719b add periodicity graph pandora_enterprise#9640 2023-10-18 12:49:47 +02:00
miguel angel rasteu 7b443414ca #12137 Fix graph events height 2023-10-17 09:52:56 +02:00
miguel angel rasteu 1c609374a8 #12134 Count total modules 2023-10-17 09:27:53 +02:00
miguel angel rasteu be99b512e2 #12137 Fix events graph 2023-10-17 08:41:06 +02:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
Daniel Cebrian 2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +02:00
Rafael Ameijeiras 2c76e30591 Merge branch 'ent-11075-cambiar-apostrofe-en-apartado-de-creacion-de-mapas-de-red' into 'develop' 
Ent 11075 cambiar apostrofe en apartado de creacion de mapas de red

See merge request artica/pandorafms!6510
 2023-10-16 10:07:13 +00:00
Daniel Cebrian 533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
Daniel Cebrian 2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +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
miguel angel rasteu f27d4176ea #12137 Fix OS version 2023-10-03 10:58:59 +02:00
miguel angel rasteu 2b416382a4 #12138 Fix agent main view 2023-10-03 10:26:57 +02:00
miguel angel rasteu 384a66dc0d #12137 Fix refact 2023-10-03 09:35:10 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
miguel angel rasteu 340288d785 #12137 visual refactoring for main agent view 2023-10-02 15:25:24 +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
miguel angel rasteu a4345c8ae4 #11075 Fix apostrophe 2023-09-27 16:08:55 +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
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
miguel angel rasteu 98bdee7037 #12079 Apply the filter automatic 2023-09-21 09:24:35 +02: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
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
miguel angel rasteu d83c1a81d2 #12052 Fix filter alter detail view 2023-09-19 13:50:06 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +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
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
Pablo Aragon 18d4f700f4 11801-Change message no filter in Monitor status 2023-09-07 13:54:41 +02:00
Pablo Aragon 87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Rafael Ameijeiras e3a5fe0fb6 Merge branch 'ent-10602-Inventory-Widget' into 'develop' 
Ent 10602 inventory widget

See merge request artica/pandorafms!6301
 2023-09-06 07:08:19 +00:00
alejandro.campos@artica.es c21fba3aec minor fix 2023-09-05 13:45:02 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Pablo Aragon 4d3b558e97 11801-Monitors detail/view Start disabled (enable on filter) 2023-09-01 09:37:16 +02:00
Pablo Aragon 9010d079d3 11801-Datatables add parameter Start disabled (enable on filter) 2023-08-31 14:58:47 +02:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Gorka Sanchez 66eaf39645 Merge branch 'ent-10637-mejora-informe-grupo' into 'develop' 
Ent 10637 mejora informe grupo

See merge request artica/pandorafms!6206
 2023-08-31 06:47:57 +00:00
Pablo Aragon a27f5e129a 11958-Fix Recover alert icon size 2023-08-29 12:35:06 +02:00
Pablo Aragon c967211830 11958-Fix Recover alert icon size 2023-08-29 12:33:35 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00