6260 Commits

Author SHA1 Message Date
Jose Gonzalez
995095afc7 Fixed issue with web_available token 2022-02-08 11:56:12 +01:00
Luis
352e0992d6 Event response creation name required 2022-02-08 10:58:23 +01:00
Luis
611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Daniel Barbero Martin
ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
fbsanchez
f1a3d40309 removed policy stuff from massive edition (agents) 2022-02-07 18:58:00 +01:00
fbsanchez
e9249d550a removed policy stuff from configurar_agente 2022-02-07 18:53:31 +01:00
fbsanchez
838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
Daniel Barbero Martin
0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Barbero Martin
dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
Daniel Barbero Martin
d47190c234 report SLA services to metaconsole pandora_enterprise#7063 2022-02-04 13:44:20 +01:00
fbsanchez
e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
fbsanchez
a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +01:00
Daniel Barbero Martin
1146afe94c bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 13:52:40 +01:00
Jose Gonzalez
1129a801c4 Fix alert commands 2022-02-03 13:49:26 +01:00
Daniel Barbero Martin
a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
Jose Gonzalez
2f356541ea Fixed alert management log 2022-02-03 12:54:50 +01:00
Daniel Rodriguez
9240533de5 Merge branch 'ent-7430-Fallos-visuales-en-Mapas-GIS' into 'develop'
Ent 7430 fallos visuales en mapas gis

See merge request artica/pandorafms!4657
2022-02-02 14:05:11 +00:00
Daniel Barbero Martin
3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Jose Gonzalez
bc6175abad Added audit log in massive operations 2022-02-02 12:45:43 +01:00
fbsanchez
17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Calvo
f1dca5e525 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-02 10:38:53 +01:00
Daniel Rodriguez
110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop'
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
2022-02-02 09:37:15 +00:00
Daniel Rodriguez
2ed2fdfd6c Merge branch 'ent-8276-copiado-paradas-planificadas' into 'develop'
Planned downtime copy.

See merge request artica/pandorafms!4662
2022-02-02 09:36:18 +00:00
Daniel Barbero Martin
5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin
b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
Daniel Barbero Martin
b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
fbsanchez
5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
fbsanchez
592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/pandoradb.sql
2022-02-01 15:16:21 +01:00
Daniel Rodriguez
91797c7112 Merge branch 'ent-8470-POST-ocultar-comando-en-respuestas-de-eventos-2' into 'develop'
added token to display or hide command in event response execution

See merge request artica/pandorafms!4671
2022-02-01 13:42:14 +00:00
alejandro.campos@artica.es
74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
José González
36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
2022-02-01 12:45:17 +00:00
Jose Gonzalez
40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez
d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Barbero Martin
0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
Conflicts:
	pandora_console/include/styles/pandora.css
2022-02-01 11:36:33 +01:00
Daniel Barbero Martin
645257f9dc alert template schedule pandora_enterprise#3943 2022-02-01 11:29:25 +01:00
Daniel Maya
f4c92c4854 #7430 Fixed url 2022-02-01 11:17:20 +01:00
Daniel Rodriguez
d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop'
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
2022-02-01 09:38:12 +00:00
Calvo
34a9c2f1f2 Added token local user to allow enabling local auth at user level 2022-02-01 09:37:02 +01:00
Daniel Barbero Martin
15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
Daniel Barbero Martin
c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
alejandro.campos@artica.es
b9c78bbfb1 show agent and module name tip 2022-01-31 13:18:26 +01:00
Daniel Barbero Martin
392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
Calvo
11dc743dac Planned downtime copy. 2022-01-28 10:59:08 +01:00
Calvo
0b119af949 WIP:Planned downtime copy. 2022-01-27 18:24:14 +01:00
Calvo
a92fe64b64 WIP:Planned downtime copy. 2022-01-27 18:23:07 +01:00
alejandro.campos@artica.es
d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
Daniel Barbero Martin
a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Maya
8a868c9fde Fixed GIs map 2022-01-26 17:15:39 +01:00
Daniel Barbero Martin
89931ef564 alert template schedule #3943 2022-01-26 16:52:48 +01:00
Daniel Barbero Martin
d76745cc9f chrome never autocomplete 2022-01-26 12:17:07 +01:00