2c57873898
fix alert deletion from agent alerts
2022-10-13 12:03:15 +02:00
d833c7ba39
Merge branch 'ent-9485-14165-filtrado-alertas-metaconsola' into 'develop'
...
Ent 9485 14165 filtrado alertas metaconsola
See merge request artica/pandorafms!5128
2022-10-13 09:24:11 +00:00
c1b4501da5
resolved conflict
2022-10-03 14:41:14 +02:00
a13c2a24a9
ent 9485 metaconsole alert filter
2022-09-21 09:46:31 +02:00
d1cc2458b6
implemented alert commands and actions to send report by email
2022-09-13 12:16:53 +02:00
03504fe7c5
ent 9183 agent alerts filter
2022-09-02 11:26:24 +02:00
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
7edcd3b0a6
Improve code and fix update alerts
2022-06-29 11:05:50 +02:00
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
237de0ee97
Resized alert action list and refactor
2022-06-23 12:21:00 +02:00
5138756525
Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop'
...
Ent 8958 13577 error al quitar un comando de una acción
See merge request artica/pandorafms!4878
2022-06-06 12:16:15 +00:00
1379ca43b0
#8984 Fixed pagination
2022-05-23 17:10:00 +02:00
37c8fe73df
#9017 Fixed alert list
2022-05-23 16:36:16 +02:00
a2de9121b7
#8958 remove the option none
2022-05-10 15:15:40 +02:00
3f7067fe48
Merge branch 'ent-I-do-now-like-procedures' into 'develop'
...
Allow both behaviours in alert time slots
See merge request artica/pandorafms!4711
2022-02-24 09:55:40 +00:00
237a7feb98
remove procedure and retrocompatibility pandora_enterprise#3943
2022-02-22 13:20:53 +01:00
ffc7cb2b44
Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop'
...
Increased field size
Closes pandora_enterprise#8455
See merge request artica/pandorafms!4706
2022-02-22 12:08:46 +00:00
93cad269c8
fixed json entities pandora_enterprise#3943
2022-02-22 12:03:22 +01:00
e2621f6230
Increased field size
2022-02-18 11:18:01 +01:00
4d912fbd34
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-11 09:55:34 +01:00
6bb754d5d2
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/pandoradb.sql
2022-02-08 13:02:22 +01:00
fc4b702db0
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
...
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
ba6d6f9107
calendar not editable pandora_enterprise#3943
2022-02-08 09:38:42 +01:00
0e0e737283
calendar not editable pandora_enterprise#3943
2022-02-07 13:07:48 +01:00
1129a801c4
Fix alert commands
2022-02-03 13:49:26 +01:00
2f356541ea
Fixed alert management log
2022-02-03 12:54:50 +01:00
3d951749f5
alert template schedule pandora_enterprise#3943
2022-02-02 13:03:52 +01:00
5060d0b8f7
alert template schedule pandora_enterprise#3943
2022-02-02 10:09:31 +01:00
b62566af49
alert template schedule pandora_enterprise#3943
2022-02-01 16:50:53 +01:00
d81e6571ec
New audit logs
2022-02-01 13:39:18 +01:00
645257f9dc
alert template schedule pandora_enterprise#3943
2022-02-01 11:29:25 +01:00
15ada66942
alert template schedule pandora_enterprise#3943
2022-01-31 16:50:48 +01:00
c02abbc508
alert template schedule pandora_enterprise#3943
2022-01-31 13:45:44 +01:00
392a9223e8
alert template schedule pandora_enterprise#3943
2022-01-28 14:06:31 +01:00
a4f092f0a0
alert template schedule pandora_enterprise#3943
2022-01-27 17:02:24 +01:00
89931ef564
alert template schedule #3943
2022-01-26 16:52:48 +01:00
e6a4eb3059
alert template schedule
2022-01-26 10:30:38 +01:00
1a6127624e
alert template schedule
2022-01-26 08:07:00 +01:00
1207463f16
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
2519335637
Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
...
Conflicts:
pandora_console/include/styles/pandora.css
2022-01-25 10:40:37 +01:00
3252832cc7
WIP: Check audit logs
2022-01-20 10:55:23 +01:00
fee3f4ab96
php8 review + mdpf update
2022-01-12 14:22:16 +01:00
4899d68ec2
Merge branch 'ent-8388-bug-en-eventos-generados-a-partir-alerta' into 'develop'
...
fixed bugged selectors in action editor
See merge request artica/pandorafms!4618
2022-01-11 10:10:59 +00:00
d04d127734
fixed bugged selectors in action editor
2022-01-07 13:01:23 +01:00
64f29e5be6
Fix select2 action search on alert list
2022-01-04 14:47:51 +01:00
31a90c4170
Merge branch 'ent-8255-Al-editar-una-acción-de-alerta-no-se-cargan-los-boxes-de-los-fields-creados-con-tags' into 'develop'
...
Ent 8255 al editar una acción de alerta no se cargan los boxes de los fields creados con tags
See merge request artica/pandorafms!4561
2021-12-23 11:59:58 +00:00
04f06b13be
Merge branch 'ent-8262-12695-Bug-en-paginación-de-accciones-de-alerta-META' into 'develop'
...
Ent 8262 12695 bug en paginación de accciones de alerta meta
See merge request artica/pandorafms!4552
2021-12-23 10:09:37 +00:00
b8a1602aaf
Merge branch 'ent-8260-Bug-en-edición-de-acción-de-alerta-Create-Integria-IMS-ticket-metaconsola' into 'develop'
...
Ent 8260 bug en edición de acción de alerta create integria ims ticket metaconsola
See merge request artica/pandorafms!4553
2021-12-23 10:03:51 +00:00
0ae657e415
WIP #3943
2021-12-17 13:40:42 +01:00
a803b5fa90
WIP #3943
2021-12-17 13:38:53 +01:00
44446673e4
#8255 Fixed select2
2021-11-30 09:56:42 +01:00
8fac24a469
Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop'
...
Ent 8277 12706 lista de alertas no filtra correctamente
See merge request artica/pandorafms!4539
2021-11-26 07:58:38 +00:00
4211327275
#8260 Fixed Integria IMS Ticket edit in metaconsole
2021-11-25 13:17:12 +01:00
b3fcb689a8
#8262 Fixed pagination
2021-11-24 15:27:53 +01:00
3bfce928c4
#7902 Fixed add and update actions
2021-11-23 10:53:51 +01:00
131be55be1
#8277 Fixed search by agent
2021-11-22 16:18:53 +01:00
13835582d2
Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'
...
Ent 8210 bug al editar acciones ya configuradas en alertas
See merge request artica/pandorafms!4536
2021-11-22 12:44:51 +00:00
8ce1a500ea
#8210 Fixed dialog
2021-11-19 14:57:56 +01:00
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
6f7b35a3b4
#8210 Fixed dropdown select2
2021-11-18 11:48:19 +01:00
93aad130cb
wip special days alerts
2021-11-04 10:20:03 +01:00
bd75912a0d
wip special days alerts
2021-11-04 09:55:37 +01:00
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
1e976a8605
alerts special days wip
2021-11-03 10:59:00 +01:00
25268ec9b4
color
2021-11-02 17:49:45 +01:00
89680907fd
wip special days
2021-10-29 13:45:18 +02:00
c2cce3990a
special days template alerts
2021-10-28 17:30:03 +02:00
6520f95fcf
#7947 Fixed integria IMS ticket in metaconsole
2021-10-20 17:06:24 +02:00
795d5c055a
merge conflict
2021-10-07 09:56:17 +02:00
8c1838abb7
Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
...
Conflicts:
pandora_console/install.php
2021-09-29 13:47:10 +02:00
4a9f523468
Added unlinked icon to alerts in unlinked module
2021-09-23 19:02:31 +02:00
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
44dcdb03bc
Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop'
...
Ent 7542 11882 buscador de acciones no funciona
See merge request artica/pandorafms!4343
2021-08-17 07:09:26 +00:00
21e15752cf
fixed select2 search in action update
2021-08-16 11:04:52 +02:00
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
5acd64bbf7
fixed text inputs in add action modals
2021-08-05 13:05:53 +02:00
39d4466658
Merge branch 'ent-fix-alert-action-creation' into 'develop'
...
Fixed alert action creation problem.
See merge request artica/pandorafms!4313
2021-08-05 07:56:22 +00:00
801f8fc3c4
Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop'
...
Fixed alert command hide on update
See merge request artica/pandorafms!4164
2021-08-03 06:47:41 +00:00
4115bd0cba
Fixed an issue where alert actions belonging to the "All" group could be created by restricted users.
2021-07-21 15:34:46 +09:00
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
e7079dd4c4
Fixed all alert actions are shown after alert action creation/edition even if user has access rights only for specific groups.
2021-07-13 09:53:23 +09:00
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
eec373e896
Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url
2021-06-24 19:48:07 +02:00
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
68e1e72b46
Controlled if Integria IMS is selected for show Create workunit switch
2021-04-23 13:43:16 +02:00
317bf0da3d
minnor error fixed
2021-04-15 10:33:31 +00:00
a93a3b7967
Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop'
...
Fixed and improved alert functions.
See merge request artica/pandorafms!3957
2021-04-14 13:15:29 +00:00
aaded121a4
Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop'
...
restricted action creation on alerts created from policy
See merge request artica/pandorafms!3891
2021-04-06 17:46:47 +00:00
43cfa383ac
Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop'
...
Add pagination to commands view
See merge request artica/pandorafms!3919
2021-04-06 17:44:54 +00:00
d4b8916c54
Fixed following problems.
...
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.
And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
2021-03-26 17:11:10 +09:00
e689813e2c
fixed icons
2021-03-16 13:37:13 +01:00
373ab32bb5
Add pagination to commands view
2021-03-16 11:54:40 +01:00
0ad3e3fd8b
Merge branch 'develop' into 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas'
...
# Conflicts:
# pandora_console/godmode/alerts/alert_list.list.php
2021-03-16 08:41:55 +00:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
2f7a826253
minor fixes
2021-03-11 17:54:20 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
f833429695
restricted action creation on alerts created from policy
2021-03-11 12:38:42 +01:00
38cc8d2ab9
Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop'
...
permissions limitation for command management
See merge request artica/pandorafms!3872
2021-03-10 15:54:31 +00:00
71e9452988
Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora
2021-03-10 10:28:45 +01:00
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +01:00
d4054f15d0
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
...
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
af680b5d92
permissions limitation for command management
2021-03-01 13:58:04 +01:00
8ff36ef66f
Merge branch 'ent-5269-añadir-elemento-al-filtro-de-la-vista-de-administracion-general-de-alertas' into 'develop'
...
Ent 5269 añadir elemento al filtro de la vista de administracion general de alertas
See merge request artica/pandorafms!3796
2021-03-01 10:38:51 +00:00
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
74bdab5d00
add status filter on alert list
2021-01-25 11:00:24 +01:00
7a614fcf48
Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop'
...
Ent 6354 bug de creacion de dashboard con permisos no all
See merge request artica/pandorafms!3780
2021-01-25 10:02:41 +01:00
dc455636d9
add status filter alert list
2021-01-22 14:15:26 +01:00
d9309616c4
updates new filter
2021-01-21 17:13:49 +01:00
642258e1a3
add status filter on alert list filter
2021-01-21 13:38:03 +01:00
731d486455
changed behavior of All group and fixed acl vulnerability
2021-01-20 18:22:43 +01:00
adf4c988ec
Added warning
2021-01-19 16:03:34 +01:00
366d02f203
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
2021-01-14 09:22:06 +01:00
b9a2998c49
Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
...
Ent 6490 errores en edicion de acciones de alertas
See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
02475d25b6
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
3fd983fb72
Fix
2020-12-03 15:51:40 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
1cf3381797
Fixed update alert actions
2020-11-26 10:33:32 +01:00
94cfd51501
Ent 6512 error en acls de alertas
2020-10-28 11:41:30 +01:00
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
12bc9e2b4e
Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop'
...
Ent 6195 10482 entities en tabla de auditoria
See merge request artica/pandorafms!3411
2020-09-23 09:38:29 +02:00
0d19f500b1
Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
...
checkd option by default on creation
See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
4c8414cda5
Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
...
Solved issue with TinyMCE status bar. Now can view it properly
See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
5bd208a95c
checkd option by default on creation
2020-09-14 13:43:18 +02:00
8f477b1833
Avoid XSS in List of special days. Added control for only show help tip if description has data
2020-09-09 12:49:43 +02:00
fe8e7b7d0c
Add new filter search actions
2020-08-31 12:48:00 +02:00
f477919433
Fixed entities in query
2020-08-28 13:56:15 +02:00
5565d839c3
Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp
2020-08-26 09:00:35 +02:00
516de686cf
Fixed issue
2020-08-25 15:03:19 +02:00
1b14d83fd4
Added None value
2020-08-25 10:58:26 +02:00
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
1ab4e89a14
Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
...
fix empty check condition
See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
35f231ac8c
Restored alert actions help (needed for macros)
2020-08-07 09:36:43 +02:00
51f2db16cb
Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop'
...
Changed query for get default actions in templates
Closes pandora_enterprise#5587
See merge request artica/pandorafms!3320
2020-07-20 07:54:08 +02:00
f3ad52e0fa
Ent 5532 edicion creacion de templates acciones comandos modo centralizado
2020-07-13 12:23:46 +02:00
492c7f90cf
Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
...
fixed error
See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
0ef7ff1198
fix empty check condition
2020-07-06 14:35:22 +02:00
1f4de3ee4d
ignore keys xss special days
2020-06-19 10:53:14 +02:00
40c0d4ea09
fixed error
2020-06-18 17:09:22 +02:00
1805a0910e
Changed query for get default actions in templates
2020-06-18 16:53:32 +02:00
alejandro.campos@artica.es
Daniel Rodriguez
Daniel Maya
edu.corral
Diego Muñoz-Reja
José González
Jimmy Olano
Daniel Maya
Daniel Barbero Martin
fbsanchez
José González
Calvo
marcos
Junichi Satoh
José González
manuel.montes