19098 Commits

Author SHA1 Message Date
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
artica
e9668c1746 Auto-updated build strings. 2022-08-05 01:00:20 +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
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
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
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
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
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
bdd9612812 fix error custom data show all in tab events pandora_enterprise#9305 2022-07-22 10:13:57 +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
artica
b76dc9d062 Auto-updated build strings. 2022-07-21 01:00:17 +02: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