27237 Commits

Author SHA1 Message Date
fbsanchez
0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos
eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
Daniel Rodriguez
9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop'
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
2021-03-24 11:57:47 +00:00
Jose Gonzalez
af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez
ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop'
Command center

See merge request artica/pandorafms!3887
2021-03-24 11:43:52 +00:00
daniel
774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez
6cd393edef Style fix 2021-03-24 12:33:36 +01:00
Daniel Rodriguez
22492f39a8 Merge branch 'ent-7010-nexcon-mejoras-widget-de-eventos' into 'develop'
Event widget and some notices fixed

See merge request artica/pandorafms!3828
2021-03-24 11:28:39 +00:00
fbsanchez
9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
fbsanchez
c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2021-03-24 09:55:31 +01:00
artica
00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
José González
561060cdda Reverted change over mysqldriver 2021-03-23 20:37:28 +00:00
Daniel Rodriguez
2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop'
fixed visual error

See merge request artica/pandorafms!3940
2021-03-23 15:56:02 +00:00
Daniel Rodriguez
61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop'
add tooltip service name

See merge request artica/pandorafms!3783
2021-03-23 15:55:28 +00:00
Marcos Alconada
302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez
910154389e Fix 2021-03-23 16:15:57 +01:00
Jose Gonzalez
3cb504397f Solve issues for compilation 2021-03-23 15:15:07 +01:00
marcos
90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
Daniel Rodriguez
fbd41b086d Merge branch 'ent-7102-ventana-de-refresco-visual-console-no-desaparece' into 'develop'
Fixed refresh auto hide on visual console

See merge request artica/pandorafms!3883
2021-03-23 12:04:28 +00:00
José González
6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-23 12:00:45 +00:00
Daniel Rodriguez
0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop'
fixed visual error

See merge request artica/pandorafms!3942
2021-03-23 09:29:39 +00:00
Daniel Rodriguez
f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop'
Removed extra verbosity

See merge request artica/pandorafms!3899
2021-03-23 09:29:05 +00:00
Daniel Maya
131a04a4ce Fixed api get all agents 2021-03-23 09:55:57 +01:00
Daniel Maya
64c3e35e85 Added target port 2021-03-23 08:56:52 +01:00
artica
b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
fbsanchez
659c1b4503 Wizard Aws.S3 RC1 2021-03-22 19:21:05 +01:00
Daniel Rodriguez
67c0968864 Merge branch 'ent-7190-bug-icono-wux-en.vista-de-modulos' into 'develop'
fixed visual error

See merge request artica/pandorafms!3941
2021-03-22 16:59:57 +00:00
Jose Gonzalez
4ee0c580bb WIP: Backup upload 2021-03-22 17:52:11 +01:00
Jose Gonzalez
4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Jose Gonzalez
d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
marcos
51ea2d569d fixed visual error 2021-03-22 17:02:30 +01:00
marcos
69fe389afc fixed visual error 2021-03-22 16:42:19 +01:00
marcos
adadd40399 fixed visual error 2021-03-22 16:34:29 +01:00
marcos
b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
fbsanchez
d73ba6a2e5 Merge remote-tracking branch 'origin/develop' into ent-6377-proyectos-amazon-s3-en-el-discovery 2021-03-22 15:16:10 +01:00
Daniel Rodriguez
6294910e29 Merge branch 'ent-6583-Bug-estado-de-elementos-consola-visual' into 'develop'
Mode ghost for disabled modules and agents

See merge request artica/pandorafms!3889
2021-03-22 14:10:14 +00:00
daniel
b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
marcos
31e6d75229 fixed error with label reporting views 2021-03-22 14:28:12 +01:00
Daniel Rodriguez
390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop'
fixed visuals errors black theme

See merge request artica/pandorafms!3937
2021-03-22 12:48:39 +00:00
Daniel Rodriguez
8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop'
fixed visual error

See merge request artica/pandorafms!3911
2021-03-22 12:46:58 +00:00
Daniel Rodriguez
8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop'
fixed spinner bug

See merge request artica/pandorafms!3933
2021-03-22 12:46:02 +00:00
Daniel Rodriguez
a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +00:00
marcos
c9f0b138b0 fixed error with label reporting views 2021-03-22 12:24:58 +01:00
marcos
d5df7bf9ce fixed error with label reporting views 2021-03-22 12:01:17 +01:00
fbsanchez
e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
artica
49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica
2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica
db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica
3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos
ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00