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

24855 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 748bd206ad implemented modules inventory report 2022-08-24 19:23:10 +02:00
alejandro.campos@artica.es af52895150 implemented modules inventory report 2022-08-24 19:22:20 +02:00
artica f0911021ab Auto-updated build strings. 2022-08-24 01:00:21 +02:00
Daniel Rodriguez c50d6a6c3b Merge branch 'ent-9442-14113-Sql-error-en-la-vista-de-consola' into 'develop' 
Ent 9442 14113 sql error en la vista de consola

See merge request artica/pandorafms!5064
 2022-08-23 13:42:02 +00:00
Daniel Rodriguez 3e7a21fe2e Merge branch 'ent-9426-Error-SQL-en-eventos-con-usuario-no-admin' into 'develop' 
fixed event filter

See merge request artica/pandorafms!5063
 2022-08-23 13:38:18 +00:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
alejandro.campos@artica.es 82bf0bd4f6 fixed event filter 2022-08-23 11:42:52 +02:00
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
artica 59906ded78 Auto-updated build strings. 2022-08-23 01:00:18 +02:00
artica c4119fe0d3 Auto-updated build strings. 2022-08-22 01:00:17 +02:00
artica 58f3f3ab72 Auto-updated build strings. 2022-08-21 01:00:17 +02:00
artica fb751e7d24 Auto-updated build strings. 2022-08-20 01:00:18 +02:00
artica 96413af66e Auto-updated build strings. 2022-08-19 01:00:20 +02:00
Rafael Ameijeiras 2fdb4f0302 clean old dockerfiles open 2022-08-18 11:31:00 +02:00
artica 7e0b74be0c Auto-updated build strings. 2022-08-18 01:00:23 +02:00
alejandro.campos@artica.es 9f28e6f7fb minor fix 2022-08-17 13:31:12 +02:00
Daniel Maya b58b0d6c51 #9348 fixed update relations 2022-08-17 12:52:02 +02:00
Daniel Maya c2d058a131 #9347 node deletion 2022-08-17 12:43:24 +02:00
artica 4c743e7565 Auto-updated build strings. 2022-08-17 01:00:18 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Maya 6cf8fdad39 #9348 improved usability 2022-08-16 14:07:25 +02:00
Daniel Rodriguez 1295db63bb Merge branch 'ent-9398-falta-campo-fixed_ip-en-tmetaconsole_agent' into 'develop' 
Ent 9398 falta campo fixed ip en tmetaconsole agent

See merge request artica/pandorafms!5059
 2022-08-16 10:51:53 +00:00
edu.corral 86a0847f2a ent 9398 fixed ip tmetaconsole_agent 2022-08-16 12:37:40 +02:00
edu.corral 0d5640bf9b ent 9398 fixed ip field tmetaconsole_agent 2022-08-16 12:31:42 +02:00
alejandro.campos@artica.es e6739e16b8 fixed 500 2022-08-16 11:56:05 +02:00
artica a8e10e4c26 Auto-updated build strings. 2022-08-16 01:00:11 +02:00
artica 29e07520c8 Auto-updated build strings. 2022-08-15 01:00:09 +02:00
artica f2c8ddaf85 Auto-updated build strings. 2022-08-14 01:00:13 +02:00
artica 363b86271a Auto-updated build strings. 2022-08-13 01:00:07 +02:00
artica 42df214771 Updated version and build strings. 2022-08-12 12:44:29 +02:00
Daniel Barbero 50bb50418d fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:34:35 +02:00
Daniel Barbero cd1dfa6361 fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:32:07 +02:00
Daniel Maya 4d7329f1fd #9347 central node deletion 2022-08-12 09:44:16 +02:00
artica ec33fdcd3e Auto-updated build strings. 2022-08-12 01:00:22 +02:00
Jimmy Olano e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Daniel Barbero 9b3d7ba763 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 14:05:01 +02:00
Daniel Barbero de922dd0b2 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 13:52:34 +02:00
Daniel Maya 2f9d1de8b4 #9343 Not closing the modal window 2022-08-11 12:46:25 +02:00
Diego Muñoz-Reja 5d5ed8c719 Merge branch 'ent-9277-Traducción-de-nuevas-cadenas' into 'develop' 
Ent 9277 traducción de nuevas cadenas

See merge request artica/pandorafms!5045
 2022-08-11 09:51:59 +00:00
Daniel Maya 08da6de1da #8898 Added options icon 2022-08-11 09:36:08 +02:00
artica 815e466ee2 Auto-updated build strings. 2022-08-11 01:00:21 +02:00
Calvo 1ad4b96d4e Fix font notification redirection on meta 2022-08-10 15:58:35 +02:00
Calvo 9f8796580f Fix font notification redirection on meta 2022-08-10 15:55:06 +02:00
Daniel Rodriguez 6aa99d8d0a Revert "Merge branch 'ent-9191-Titulo-Notificaciones-de-usuario-mal' into 'develop'" 
This reverts merge request !4975
 2022-08-10 14:18:34 +02:00
Daniel Maya e408b4258b resolved conflict 2022-08-10 14:11:05 +02:00
Daniel Maya 9b3661bca1 #9344 Fix fictional node 2022-08-10 13:59:48 +02:00
Daniel Maya 665fac3e4a #8898 Fixed Holding area 2022-08-10 13:55:20 +02:00
Jimmy Olano b10b9186bf Merge branch 'ent-9151-Ensanchar-los-boxes-de-agentes-módulos-en-paradas-planificadas' into 'develop' 
Ent 9151 ensanchar los boxes de agentes módulos en paradas planificadas

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9151

See merge request artica/pandorafms!5044
 2022-08-10 11:54:00 +00:00
Diego Muñoz-Reja cd1491fe9d Merge branch 'ent-9191-Titulo-Notificaciones-de-usuario-mal' into 'develop' 
Fix issue with header

See merge request artica/pandorafms!4975
 2022-08-10 11:45:37 +00:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
Daniel Barbero f81ab65d5e fix error pandora_enterprise#9367 2022-08-10 12:20:14 +02:00
Daniel Barbero 8772dfe017 add historical database setup in metaconsole pandora_enterprise#8791 2022-08-10 11:18:27 +02:00
artica 1dcf52273e Auto-updated build strings. 2022-08-10 01:00:21 +02:00
Diego Muñoz-Reja 23070102bc Merge branch 'ent-8545-gestion-de-agentes-del-satelite-desde-la-consola-consola' into 'develop' 
Ent 8545 gestion de agentes del satelite desde la consola consola

See merge request artica/pandorafms!5043
 2022-08-09 12:44:46 +00:00
Daniel Rodriguez b1ff477780 Merge branch 'ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val' into 'develop' 
new console report pandora_enterprise#6367

See merge request artica/pandorafms!5013
 2022-08-09 12:09:26 +00:00
Daniel Barbero 67f3a9c088 fix console report pandora_enterprise#6367 2022-08-09 14:01:55 +02:00
Daniel Barbero 0428aeab23 Merge remote-tracking branch 'origin/develop' into ent-9282-13952-bug-en-filtrado-ipam 2022-08-09 07:26:52 +02:00
artica 0579dc9162 Auto-updated build strings. 2022-08-09 01:00:20 +02:00
Daniel Barbero d9227fae0e fix console report pandora_enterprise#6367 2022-08-08 13:51:07 +02:00
Daniel Barbero 743b1c295f Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-08 12:26:27 +02:00
Daniel Barbero 1e4fa95730 discovery server to none pandora_enterprise#9282 2022-08-08 12:24:04 +02:00
Daniel Maya 626d5b1d0d #9277 new translations 2022-08-08 12:11:56 +02:00
Daniel Maya ea18fda67a #9151 resize multiselect 2022-08-08 12:04:29 +02:00
Calvo ced2a0837c Fix fixed ip switch issues 2022-08-08 10:23:11 +02:00
Calvo db72108b0e Satellite agent management 2022-08-08 09:53:03 +02:00
artica ca73c60579 Auto-updated build strings. 2022-08-08 01:00:17 +02:00
artica 5ca696572a Auto-updated build strings. 2022-08-07 01:00:18 +02:00
artica 362a86740a Auto-updated build strings. 2022-08-06 01:00:19 +02:00
Calvo 2c8b9b3aa5 Satellite agent management 2022-08-05 21:49:42 +02:00
José González f1979e30c2 Fix URL Typo 2022-08-05 11:03:10 +02:00
artica e9668c1746 Auto-updated build strings. 2022-08-05 01:00:20 +02:00
alejandro.campos@artica.es 120003ab20 added dynamic token filter to view 2022-08-04 14:05:06 +02:00
Daniel Barbero 057ffc5003 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-04 11:44:38 +02:00
Daniel Barbero 38c7bcc061 fix errors ipam pandora_enterprise#9282 2022-08-04 10:10:20 +02:00
alejandro.campos@artica.es af63bfe948 implemented visual editor for satellite conf and added some changes on editor 2022-08-04 09:14:05 +02:00
artica 56196b12c7 Auto-updated build strings. 2022-08-04 01:00:20 +02:00
artica 5ffd966c7a Auto-updated build strings. 2022-08-03 01:00:21 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
artica 4d2f892160 Auto-updated build strings. 2022-08-02 01:00:21 +02:00
Jimmy Olano 8d7b02069a Merge branch 'ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado' into 'develop' 
not group by event status pandora_enterprise#8043

pandora_enterprise#8043

See merge request artica/pandorafms!5031
 2022-08-01 18:46:38 +00:00
Diego Muñoz-Reja 4cbd23d911 Merge branch 'ent-8836-post-macros-para-custom-data-de-eventos-no-funcionan-sin-base64' into 'develop' 
Ent 8836 post macros para custom data de eventos no funcionan sin base64

See merge request artica/pandorafms!4879
 2022-08-01 13:02:00 +00:00
Daniel Barbero c4d085c24c fixed error dashboards pandora_enterprise#9229 2022-08-01 13:46:11 +02:00
Daniel Barbero 13c1f78463 Merge remote-tracking branch 'origin/develop' into ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados 2022-08-01 13:00:49 +02:00
Daniel Barbero e11d46ea60 Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado 
Conflicts:
	pandora_console/include/ajax/events.php
 2022-08-01 07:08:00 +02:00
Jimmy Olano 2a5d075d03 Merge branch 'ent-9290-pete-sql-al-buscar-eventos-por-custom-data' into 'develop' 
fix error collation events pandora_enterprise#9290

pandora_enterprise#9290

See merge request artica/pandorafms!5030
 2022-08-01 00:22:53 +00:00
artica 59bb85e931 Auto-updated build strings. 2022-08-01 01:00:18 +02:00
Jimmy Olano 1b07631f5f Merge branch 'ent-9305-comentarios-se-agrupan-incorrectamente-en-vista-de-eventos' into 'develop' 
fix error custom data show all in tab events pandora_enterprise#9305

pandora_enterprise#9305

See merge request artica/pandorafms!5028
 2022-07-31 22:20:00 +00:00
artica f4c686844b Auto-updated build strings. 2022-07-31 01:00:16 +02:00
artica 04e9c8de43 Auto-updated build strings. 2022-07-30 01:00:20 +02:00
Luis 33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
Daniel Rodriguez 9751167f56 Merge branch 'ent-9273-comprobacion-base-de-datos-de-historico-del-setup-provoca-error-504' into 'develop' 
fixed history timeout pandora_enterprise#9273

See merge request artica/pandorafms!5034
 2022-07-29 08:38:12 +00:00
Daniel Barbero Martin bd69105d7e fix label color vc black theme pandora_enterprise#9321 2022-07-29 09:37:38 +02:00
Daniel Barbero Martin fe1a2cd962 collation mysql8 pandora_enterprise#9290 2022-07-29 08:46:17 +02:00
Daniel Barbero Martin b60ab583bf Merge remote-tracking branch 'origin/develop' into ent-9290-pete-sql-al-buscar-eventos-por-custom-data 2022-07-29 08:43:58 +02:00
artica 7d4ba6191c Auto-updated build strings. 2022-07-29 01:00:22 +02:00
Jimmy Olano 86ad06a3bb Merge branch 'ent-9304-columna-custom-data-se-muestra-incorrectamente-en-vista-de-eventos' into 'develop' 
fix error custom data events list pandora_enterprise#9304

pandora_enterprise#9304

See merge request artica/pandorafms!5027
 2022-07-28 16:25:27 +00:00
Daniel Barbero Martin d8bac6dde9 fixed show modal label VC in list item pandora_enterprise#9321 2022-07-28 14:30:08 +02:00
Daniel Barbero Martin 72614130a8 fixed widget dashboards no exist item pandora_enterprise#9229 2022-07-28 14:25:31 +02:00
Daniel Rodriguez e726a55091 Merge branch 'ent-9079-Metaconsola-no-puede-sacar-queries-con-datos-historicos-de-nodo' into 'develop' 
fixed access to history db from metaconsole

See merge request artica/pandorafms!5032
 2022-07-28 11:48:04 +00:00
artica e1bdde1aa9 Auto-updated build strings. 2022-07-28 01:00:20 +02:00
Daniel Barbero Martin 770933a2dd fixed history timeout pandora_enterprise#9273 2022-07-27 14:28:50 +02:00
Daniel Barbero Martin e5d1145f0a move bulk operations services pandora_enterprise#7749 2022-07-27 11:37:23 +02:00
artica 95d369cca0 Auto-updated build strings. 2022-07-27 01:00:20 +02:00
alejandro.campos@artica.es 3b50d84abd fixed access to history db from metaconsole 2022-07-26 12:50:57 +02:00
Daniel Barbero Martin e3e9f86119 not group by event status pandora_enterprise#8043 2022-07-26 10:55:11 +02:00
Daniel Barbero Martin 35333422b4 fix errors massive operations pandora_enterprise#8564 2022-07-26 09:53:30 +02:00
Daniel Barbero Martin 526e5a9b34 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-26 08:00:28 +02:00
Daniel Barbero Martin 9d33fa08fe fix error collation events pandora_enterprise#9290 2022-07-26 07:57:04 +02:00
artica e30eff5e6e Auto-updated build strings. 2022-07-26 01:00:17 +02:00
artica f9aa8676bc Auto-updated build strings. 2022-07-25 01:00:16 +02:00
artica 5bf282fe05 Auto-updated build strings. 2022-07-24 01:00:12 +02:00
artica f6aa9d64ae Auto-updated build strings. 2022-07-23 01:00:20 +02:00
Jimmy Olano 7b411ae0de Merge branch 'ent-9045-mensaje-de-error-por-falta-de-acceso-fallos-de-formato' into 'develop' 
Ent 9045 mensaje de error por falta de acceso fallos de formato

#9045 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9045

See merge request artica/pandorafms!5004
 2022-07-22 14:39:18 +00:00
Daniel Barbero Martin 57f82b0c31 fix 550 error evnts mobile php 7.2 pandora_enterprise#9307 2022-07-22 12:27:58 +02:00
Daniel Barbero Martin bdd9612812 fix error custom data show all in tab events pandora_enterprise#9305 2022-07-22 10:13:57 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02:00
Jimmy Olano 33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' 
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
 2022-07-22 02:39:35 +00:00
artica fa23c453a1 Auto-updated build strings. 2022-07-22 01:00:21 +02:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Calvo e286793e95 Fix alert list agent link in metaconsole 2022-07-21 11:52:45 +02:00
Daniel Barbero Martin ac23665244 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-21 10:58:37 +02:00
Jimmy Olano 673798a43e Merge branch 'ent-9279-doble-refresco-en-vista-de-eventos-de-metaconsola-al-tener-autorrefresco-activado' into 'develop' 
double refresh page events pandora_enterprise#9279

pandora_enterprise#9279

See merge request artica/pandorafms!5021
 2022-07-21 01:36:33 +00:00
artica b76dc9d062 Auto-updated build strings. 2022-07-21 01:00:17 +02:00
Jimmy Olano 7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
Junichi Satoh 44cc9898c2 Fixed deb package creation scripts to work with recent Ubuntu, 20.04 LTS and 22.04 LTS. 2022-07-20 14:10:37 +09:00
artica 385610fef6 Auto-updated build strings. 2022-07-20 01:00:21 +02:00
Jimmy Olano b512a359d4 Merge branch 'ent-8522-13078-edicion-de-elementos-de-un-servicio-2' into 'develop' 
fix error services items pandora_enterprise#8522

pandora_enterprise#8522

See merge request artica/pandorafms!5024
 2022-07-19 22:16:56 +00:00
Jimmy Olano 97132edd4f Merge branch 'ent-9284-13964-fallo-en-creacion-de-eventos-via-api-create_event-a-la-hora-de-guardar-timestamp-del' into 'develop' 
fix time api create event pandora_enterprise#9284

pandora_enterprise#9284

See merge request artica/pandorafms!5022
 2022-07-19 14:43:54 +00:00
Diego Muñoz-Reja 288e6f3a53 Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop' 
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados

See merge request artica/pandorafms!4993
 2022-07-19 13:07:45 +00:00
Daniel Barbero Martin 1e9ca202f0 fix error services items pandora_enterprise#8522 2022-07-19 11:09:49 +02:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Daniel Barbero Martin 44a2bb2bdb fix mobile index access user to node pandora_enterprise#9280 2022-07-19 10:13:43 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Daniel Rodriguez 93e9992b19 Merge branch 'ent-9156-13785-cuadro-processing-ocupa-demasiado-en-eventos' into 'develop' 
loading events pandora_enterprise#9156

See merge request artica/pandorafms!5014
 2022-07-19 06:31:49 +00:00
Daniel Rodriguez 958f851af5 Merge branch 'ent-8929-Mejora-en-widget-dasboard-General-group-stats' into 'develop' 
Ent 8929 mejora en widget dasboard general group stats

See merge request artica/pandorafms!4892
 2022-07-19 06:30:27 +00:00
Jimmy Olano a296a58b61 Merge branch 'ent-9104-selector-multiple-a-veces-escoge-elementos-incorrectos' into 'develop' 
Ent 9104 selector multiple a veces escoge elementos incorrectos

#9104 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9104

See merge request artica/pandorafms!5006
 2022-07-19 01:33:57 +00:00
Jimmy Olano 3bbd08ec11 Merge branch 'ent-8249-12679-Incluir-filtrado-por-nombre-en-vista-de-arbol-de-servicios' into 'develop' 
Ent 8249 12679 incluir filtrado por nombre en vista de arbol de servicios

Ref pandora_enterprise#8249

See merge request artica/pandorafms!4899
 2022-07-19 01:06:53 +00:00
artica 672abbde79 Auto-updated build strings. 2022-07-19 01:00:18 +02:00
Jimmy Olano 8f00e9da6c Merge branch 'ent-9044-Mejorar-interfaz-de-herramienta-de-copia-de-configuraciones-remotas' into 'develop' 
Added Go Back input function

pandora_enterprise#9044

See merge request artica/pandorafms!4997
 2022-07-18 22:35:09 +00:00
Daniel Barbero Martin 13832dcfa2 fix time api create event pandora_enterprise#9284 2022-07-18 17:06:12 +02:00
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
artica 00d4f66dc3 Auto-updated build strings. 2022-07-18 01:00:16 +02:00
artica 914c12465b Auto-updated build strings. 2022-07-17 01:00:17 +02:00
artica 72a86aca26 Auto-updated build strings. 2022-07-16 01:00:18 +02:00
Diego Muñoz-Reja ab38cfa836 Merge branch 'ent-9274-error-500-vista-agente-al-entrar-por-consola-mobile-en-un-agente' into 'develop' 
fix agents mobile pandora_enterprise#9274

See merge request artica/pandorafms!5015
 2022-07-15 12:27:15 +00:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Calvo 34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
artica 99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
Diego Muñoz-Reja 889d80fbdb Merge branch 'ent-8889-Redirecciones-usuarios-en-Carrefour' into 'develop' 
Ent 8889 redirecciones usuarios en carrefour

See merge request artica/pandorafms!4885
 2022-07-14 14:59:12 +00:00
Daniel Maya 0ff688f6fa #8889 Fixed url location 2022-07-14 16:50:26 +02:00
Daniel Barbero Martin e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Maya 4011ca99fe #8769 Resolved conflict 2 2022-07-14 13:02:39 +02:00
Diego Muñoz-Reja 0f770edc13 Merge branch 'ent-8732-giss-13230-aplicar-reglas-de-autoconfiguracion-de-forma-programada' into 'develop' 
Ent 8732 giss 13230 aplicar reglas de autoconfiguracion de forma programada

See merge request artica/pandorafms!5011
 2022-07-14 10:35:52 +00:00
artica 47e28e283b Auto-updated build strings. 2022-07-14 01:00:14 +02:00
Diego Muñoz-Reja 74d19b3dbd Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop' 
Ent 9029 mejora estética en header vista agente

See merge request artica/pandorafms!5003
 2022-07-13 12:54:54 +00:00
Daniel Barbero Martin 644164040f fix agents mobile pandora_enterprise#9274 2022-07-13 12:34:29 +02:00
Daniel Barbero Martin 1f394907c9 loading events pandora_enterprise#9156 2022-07-13 12:28:18 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31:18 +02:00
artica 85c66a390c Auto-updated build strings. 2022-07-13 01:00:19 +02:00
Daniel Maya 9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Maya 4f7918114b #9029 Added starmap 2 2022-07-12 13:45:01 +02:00
Daniel Barbero Martin 628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin fc37f158d1 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-12 08:55:30 +02:00
artica d601ca88ca Auto-updated build strings. 2022-07-12 01:00:19 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 8987f733d3 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-11 08:37:50 +02:00
Diego Muñoz-Reja 289646a9b9 Merge branch 'ent-9230-no-se-muestra-la-version-de-codigo-instalada-en-el-footer-al-actualizar-a-763' into 'develop' 
Addded pandora_version and build_version globals

See merge request artica/pandorafms!4994
 2022-07-11 06:19:41 +00:00
artica 92936b5267 Auto-updated build strings. 2022-07-11 01:00:52 +02:00
artica c72bf4fc9e Auto-updated build strings. 2022-07-10 01:00:19 +02:00
artica be923c8838 Auto-updated build strings. 2022-07-09 01:00:37 +02:00
Diego Muñoz-Reja b276af9de3 Merge branch 'ent-9226-Cambio-en-MR-de-tabla-Enterprise' into 'develop' 
Ent 9226 cambio en mr de tabla enterprise

See merge request artica/pandorafms!5000
 2022-07-08 12:03:22 +00:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya 994c76a39b #8732 Added autoconfiguration scheduled 2022-07-08 11:02:58 +02:00
artica 66cb2b42c2 Auto-updated build strings. 2022-07-08 01:00:24 +02:00
Diego Muñoz-Reja bdb1fda92e Merge branch 'ent-9019-13559-Bug-en-logueo-con-AD-con-el-nombre' into 'develop' 
Ent 9019 13559 bug en logueo con ad con el nombre

See merge request artica/pandorafms!4910
 2022-07-07 10:44:46 +00:00
artica 6e30b7cc0e Auto-updated build strings. 2022-07-07 01:00:27 +02:00
Diego Muñoz-Reja c756f804a7 Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' 
modal sound events pandora_enterprise#9095

See merge request artica/pandorafms!4998
 2022-07-06 14:57:44 +00:00
edu.corral 53fa3c8b8d ent-9185 tree view alerts modal window 2022-07-06 12:15:31 +02:00
edu.corral 36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +02:00
Diego Muñoz-Reja c0705fcce4 Merge branch 'ent-9257-13892-Error-al-mostrar-reporte-sin-datos' into 'develop' 
Ent 9257 13892 error al mostrar reporte sin datos

See merge request artica/pandorafms!5005
 2022-07-06 08:02:21 +00:00
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
artica 0421b3aebd Auto-updated build strings. 2022-07-06 01:00:31 +02:00
Daniel Maya a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00
Diego Muñoz-Reja a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Diego Muñoz-Reja 3ebcf710ee Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' 
fix error events pandora_enterprise#9245

See merge request artica/pandorafms!5002
 2022-07-05 15:14:18 +00:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
edu.corral 4673a253f9 ent-9104 selector multiple 2022-07-05 13:38:59 +02:00
Daniel Maya a1aa179031 #9257 Fixed return array 2022-07-05 13:12:29 +02:00
artica 45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Diego Muñoz-Reja 08a9761046 Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' 
bugs events pandora_enterprise#9239

See merge request artica/pandorafms!4995
 2022-07-04 11:04:04 +00:00
edu.corral 4764b4ea3d ent-9045 error message v2 2022-07-04 12:38:50 +02:00
edu.corral 81283e2626 ent-9045 error message 2022-07-04 10:46:55 +02:00
Daniel Barbero Martin 15363b1ac5 Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos 2022-07-04 09:12:10 +02:00
artica 225da0dac5 Auto-updated build strings. 2022-07-04 01:00:25 +02:00
artica 5ad9178bc4 Auto-updated build strings. 2022-07-03 01:00:26 +02:00
artica a8a1069aaa Auto-updated build strings. 2022-07-02 01:00:31 +02:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 8bb1263fa9 fix error report top n pandora_enterprise#9129 2022-07-01 13:37:39 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00:00
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00
artica 219d82c230 Auto-updated build strings. 2022-07-01 01:00:22 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Diego Muñoz-Reja ef48206e7f Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' 
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica

See merge request artica/pandorafms!4937
 2022-06-30 12:54:40 +00:00
Daniel Barbero Martin a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
José González d0622e7a3b Added Go Back input function 2022-06-30 13:41:56 +02:00
Daniel Barbero Martin 95fca17fa9 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-30 12:52:49 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Calvo fe46bb9235 Addded pandora_version and build_version globals 2022-06-30 11:24:17 +02:00
Jimmy Olano fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop' 
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
 2022-06-29 23:54:48 +00:00
artica 87837d7c8f Auto-updated build strings. 2022-06-30 01:00:33 +02:00
Jimmy Olano efa0640d8c Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop' 
legend combined graph module view pandora_enterprise#9121

pandora_enterprise#9121

See merge request artica/pandorafms!4986
 2022-06-29 22:37:25 +00:00
Jimmy Olano f07ed9e4e9 Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop' 
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125

See merge request artica/pandorafms!4946
 2022-06-29 22:25:00 +00:00
Jimmy Olano 1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop' 
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
 2022-06-29 17:55:51 +00:00
Jimmy Olano 2220125250 Merge branch 'ent-9213-widget-de-reports-en-dashboards' into 'develop' 
delete item into widget pandora_enterprise#9213

See merge request artica/pandorafms!4987
 2022-06-29 16:32:49 +00:00
Daniel Maya ebe1965ca0 #8763 Fixed height 2022-06-29 17:31:46 +02:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Diego Muñoz-Reja bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' 
Resized alert action list and refactor

See merge request artica/pandorafms!4980
 2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja 0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop' 
fixed vc elements edition

See merge request artica/pandorafms!4963
 2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja b9b074404c Merge branch 'ent-9158-Reloj-digital-en-consola-visual-se-descuadra-al-cambiar-de-tamaño' into 'develop' 
Ent 9158 reloj digital en consola visual se descuadra al cambiar de tamaño

See merge request artica/pandorafms!4965
 2022-06-29 14:13:24 +00:00
Diego Muñoz-Reja a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop' 
Improved error message

See merge request artica/pandorafms!4939
 2022-06-29 14:01:49 +00:00
Daniel Maya 43b2a3d47e #9140 Fixed comments 2022-06-29 15:34:09 +02:00
Daniel Barbero Martin 2ff94b319c Merge remote-tracking branch 'origin/develop' into ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales 2022-06-29 13:54:27 +02:00
José González 7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
José González ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González ef3dd0e741 Improved error message 2022-06-29 10:20:17 +02:00
Daniel Barbero Martin e3dfbf2bb2 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-29 09:14:17 +02:00
Jimmy Olano f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop' 
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
 2022-06-29 02:40:08 +00:00
Jimmy Olano 5f5ca9ac13 Merge branch 'ent-9009-dashboards-widget-Estado-del-Módulo-pone-icono-inexistente' into 'develop' 
Ent 9009 dashboards widget estado del módulo pone icono inexistente

See merge request artica/pandorafms!4900
 2022-06-29 01:18:35 +00:00
Jimmy Olano aeb40bacc9 Merge branch 'ent-9101-13724-Fallo-operator-read-en-dashboard' into 'develop' 
Ent 9101 13724 fallo operator read en dashboard

See merge request artica/pandorafms!4945
 2022-06-29 01:11:44 +00:00
artica 87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
Daniel Barbero Martin c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Diego Muñoz-Reja 4d48bdec36 Merge branch 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' into 'develop' 
Changed strings and improve code

See merge request artica/pandorafms!4935
 2022-06-28 15:22:08 +00:00
Diego Muñoz-Reja b73389fff0 Merge branch 'ent-9033-Vista-de-eventos-Validar-eventos-repetidos' into 'develop' 
Ent 9033 vista de eventos validar eventos repetidos

See merge request artica/pandorafms!4953
 2022-06-28 15:17:13 +00:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-28 17:02:01 +02:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Barbero Martin 2632816e13 top n regex pandora_enterprise#9129 2022-06-28 16:32:37 +02:00
Diego Muñoz-Reja 3fe66d9a9b Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop' 
fixed permissions

See merge request artica/pandorafms!4934
 2022-06-28 14:32:31 +00:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
daniel 4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' 
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
 2022-06-28 13:47:05 +00:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +00:00
Daniel Maya 90c5155c1c #8939 conflict resolved 2 2022-06-28 11:26:08 +02:00
Daniel Barbero Martin 6d1121602a delete item into widget pandora_enterprise#9213 2022-06-28 11:09:47 +02:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Barbero Martin 9612bd69f1 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-28 09:17:58 +02:00
Daniel Barbero Martin 7a93861a2b fixed size modal pandora_enterprise#8827 2022-06-28 09:14:11 +02:00
Daniel Barbero Martin 6edc6e1014 Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-28 08:51:22 +02:00
artica 6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +02:00
Daniel Barbero Martin 3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
artica beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica 036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
Junichi Satoh 8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop' 
Change collapsed filename

See merge request artica/pandorafms!4977
 2022-06-23 12:29:26 +00:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Barbero Martin 6a614847a2 refactor events meta pandora_enterprise#9086 2022-06-23 11:49:04 +02:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
artica 7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
José González 82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
Daniel Rodriguez 428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop' 
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
 2022-06-22 14:44:20 +00:00
José González f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
José González 5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00
Daniel Rodriguez 7e206716d7 Merge branch 'ent-9181-problema-al-borrar-agentes-cuando-hay-modulos-delete-pending' into 'develop' 
Ent 9181 problema al borrar agentes cuando hay modulos delete pending

See merge request artica/pandorafms!4973
 2022-06-22 12:29:19 +00:00
José González 38ecfd5b62 Added message for control return code in WMI 2022-06-22 14:25:08 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 962f223670 new images update manager online pandora_enterprise#9192 2022-06-22 12:21:51 +02:00
José González 5f05b79e66 Fix issue with header 2022-06-22 12:06:34 +02:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Rodriguez 7798e0cd63 Merge branch 'ent-9179-actualizar-traducciones' into 'develop' 
Ent 9179 actualizar traducciones

See merge request artica/pandorafms!4969
 2022-06-22 09:07:30 +00:00
Daniel Rodriguez f35a802c44 Merge branch 'ent-7926-giss-12134-token-para-cambiar-comportamiento-de-evaluacion-de-servicios' into 'develop' 
#7926 Added asynchronous mode

See merge request artica/pandorafms!4972
 2022-06-22 09:06:40 +00:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
edu.corral 19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin 4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
artica a17232fb86 Auto-updated build strings. 2022-06-22 01:00:51 +02:00
Daniel Maya 44fdf1c321 #7926 Added asynchronous mode 2022-06-21 16:31:56 +02:00
Daniel Rodriguez 2ab8918463 Merge branch 'ent-9034-Alert-SNMP-como-agent-name-vista-tactica' into 'develop' 
Clean unnecesary message

See merge request artica/pandorafms!4970
 2022-06-21 14:18:16 +00:00
edu.corral 28d25acbcb ent-9179 translations 2022-06-21 15:19:33 +02:00
José González b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González 4480455258 Clean unnecesary message 2022-06-21 14:45:17 +02:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
 2022-06-21 14:43:47 +02:00
Daniel Barbero Martin 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Barbero Martin f93e141aac refactor events meta pandora_enterprise#9086 2022-06-21 11:22:56 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 9421cd46f5 Merge branch 'ent-8857-llamada-set-new_agent-api-meta' into 'develop' 
Api create agent meta support

See merge request artica/pandorafms!4860
 2022-06-21 08:39:22 +00:00
Daniel Rodriguez 529ce88d00 Merge branch 'ent-9131-Falla-carga-de-eventos-v762-ante-eventos-especificos' into 'develop' 
Fix possible custom_data with null strings

See merge request artica/pandorafms!4952
 2022-06-21 08:31:53 +00:00
José González 036505fa68 Fix DB issue 2022-06-21 09:38:13 +02:00
José González 346ac640e4 Merge 2022-06-21 09:32:57 +02:00
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop' 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
 2022-06-20 15:07:01 +00:00
Luis 71326bf8bb Update pandoradb_migrate_6.0_to_759.mysql.sql 2022-06-20 14:57:45 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop' 
Fix black theme issues

See merge request artica/pandorafms!4873
 2022-06-20 09:38:25 +00:00
Daniel Rodriguez f4761e5c0f Merge branch 'ent-9067-no-estan-funcionando-los-enlaces-sistema-de-notificacion' into 'develop' 
Ent 9067 no estan funcionando los enlaces sistema de notificacion

See merge request artica/pandorafms!4964
 2022-06-20 09:09:16 +00:00
Calvo 5a6fc5630e Add transaltion to discovery message 2022-06-20 10:37:25 +02:00
Daniel Rodriguez a7c61d9ee8 Merge branch 'ent-9139-Widget-Top-N-sale-mal-Continuacion' into 'develop' 
Fix

See merge request artica/pandorafms!4956
 2022-06-20 08:36:56 +00:00
Ramon Novoa 9b5b4deb67 Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-20 10:25:22 +02:00
Daniel Barbero Martin ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica 7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02:00
Calvo 291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González 6f903023a7 Fix 2022-06-17 12:42:24 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Calvo 5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
José González 7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' 
# Conflicts:
#   pandora_console/install.php
 2022-06-17 07:37:01 +00:00
José González 93b9e6142e DB Changes #8912 2022-06-17 09:00:35 +02:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Maya 6d1f03a633 #9158 Fixed digital clock 2022-06-17 08:17:55 +02:00
artica ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
José González 6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
José González 4c2ad2822f Fix visual issue 2022-06-16 16:04:22 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00