Daniel Barbero Martin
bd75912a0d
wip special days alerts
2021-11-04 09:55:37 +01:00
Daniel Barbero Martin
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
1e976a8605
alerts special days wip
2021-11-03 10:59:00 +01:00
Daniel Barbero Martin
25268ec9b4
color
2021-11-02 17:49:45 +01:00
Daniel Barbero Martin
89680907fd
wip special days
2021-10-29 13:45:18 +02:00
Daniel Barbero Martin
c2cce3990a
special days template alerts
2021-10-28 17:30:03 +02:00
Daniel Maya
6520f95fcf
#7947 Fixed integria IMS ticket in metaconsole
2021-10-20 17:06:24 +02:00
marcos
795d5c055a
merge conflict
2021-10-07 09:56:17 +02:00
fbsanchez
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
Calvo
4a9f523468
Added unlinked icon to alerts in unlinked module
2021-09-23 19:02:31 +02:00
fbsanchez
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
Daniel Rodriguez
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
alejandro.campos@artica.es
21e15752cf
fixed select2 search in action update
2021-08-16 11:04:52 +02:00
Daniel Rodriguez
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
alejandro.campos@artica.es
5acd64bbf7
fixed text inputs in add action modals
2021-08-05 13:05:53 +02:00
Daniel Rodriguez
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
Daniel Rodriguez
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
Junichi Satoh
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
fbsanchez
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
Junichi Satoh
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
marcos
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
fbsanchez
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
Daniel Barbero Martin
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
Marcos Alconada
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
Daniel Barbero Martin
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
Daniel Barbero Martin
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
Calvo
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02:00
Alejandro Campos
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
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
Daniel Maya
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
José González
68e1e72b46
Controlled if Integria IMS is selected for show Create workunit switch
2021-04-23 13:43:16 +02:00
Marcos Alconada
317bf0da3d
minnor error fixed
2021-04-15 10:33:31 +00:00
Daniel Rodriguez
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
Daniel Rodriguez
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
Daniel Rodriguez
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
Junichi Satoh
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
marcos
e689813e2c
fixed icons
2021-03-16 13:37:13 +01:00
alejandro.campos@artica.es
373ab32bb5
Add pagination to commands view
2021-03-16 11:54:40 +01:00
Alejandro Campos
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
alejandro.campos@artica.es
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
alejandro.campos@artica.es
2f7a826253
minor fixes
2021-03-11 17:54:20 +01:00
Marcos Alconada
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
alejandro.campos@artica.es
f833429695
restricted action creation on alerts created from policy
2021-03-11 12:38:42 +01:00
Daniel Rodriguez
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
alejandro.campos@artica.es
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
alejandro.campos@artica.es
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +01:00
Alejandro Campos
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
alejandro.campos@artica.es
af680b5d92
permissions limitation for command management
2021-03-01 13:58:04 +01:00
Daniel Rodriguez
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
alejandro.campos@artica.es
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
marcos
74bdab5d00
add status filter on alert list
2021-01-25 11:00:24 +01:00
Daniel Rodriguez
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
marcos
dc455636d9
add status filter alert list
2021-01-22 14:15:26 +01:00
marcos
d9309616c4
updates new filter
2021-01-21 17:13:49 +01:00
marcos
642258e1a3
add status filter on alert list filter
2021-01-21 13:38:03 +01:00
alejandro-campos
731d486455
changed behavior of All group and fixed acl vulnerability
2021-01-20 18:22:43 +01:00
Daniel Maya
adf4c988ec
Added warning
2021-01-19 16:03:34 +01:00
alejandro-campos
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
Daniel Rodriguez
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
José González
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
Jose Gonzalez
3fd983fb72
Fix
2020-12-03 15:51:40 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
Daniel Maya
1cf3381797
Fixed update alert actions
2020-11-26 10:33:32 +01:00
Marcos Alconada
94cfd51501
Ent 6512 error en acls de alertas
2020-10-28 11:41:30 +01:00
alejandro-campos
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
fbsanchez
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
fbsanchez
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
Daniel Rodriguez
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
Daniel Rodriguez
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
Daniel Rodriguez
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
Jose Gonzalez
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
alejandro-campos
5bd208a95c
checkd option by default on creation
2020-09-14 13:43:18 +02:00
Jose Gonzalez
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
daniel
fe8e7b7d0c
Add new filter search actions
2020-08-31 12:48:00 +02:00
manuel.montes
f477919433
Fixed entities in query
2020-08-28 13:56:15 +02:00
Jose Gonzalez
5565d839c3
Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp
2020-08-26 09:00:35 +02:00
Jose Gonzalez
516de686cf
Fixed issue
2020-08-25 15:03:19 +02:00
Jose Gonzalez
1b14d83fd4
Added None value
2020-08-25 10:58:26 +02:00
José González
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
Daniel Rodriguez
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
Luis
35f231ac8c
Restored alert actions help (needed for macros)
2020-08-07 09:36:43 +02:00
Daniel Rodriguez
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
daniel
f3ad52e0fa
Ent 5532 edicion creacion de templates acciones comandos modo centralizado
2020-07-13 12:23:46 +02:00
Daniel Rodriguez
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
Jose Gonzalez
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
alejandro-campos
0ef7ff1198
fix empty check condition
2020-07-06 14:35:22 +02:00
marcos
1f4de3ee4d
ignore keys xss special days
2020-06-19 10:53:14 +02:00
marcos
40c0d4ea09
fixed error
2020-06-18 17:09:22 +02:00
Jose Gonzalez
1805a0910e
Changed query for get default actions in templates
2020-06-18 16:53:32 +02:00
marcos
9ddfde1774
fixed error with update event comments
2020-06-09 12:02:31 +02:00
marcos
cfe30d5b7d
fixed vulnerability on special days
2020-06-09 10:37:11 +02:00
fbsanchez
b3cf532c16
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
2020-05-29 12:30:49 +02:00
Manuel Montes
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
fbsanchez
f3d9f2d75e
Cluster view RC1
2020-05-22 13:13:19 +02:00
marcos
f229dada52
fixed minnnor error
2020-04-02 19:02:14 +02:00
Daniel Maya
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
Tatiana Llorente
8c86019037
Ent 5583 bug comando de alerta
2020-03-18 12:25:29 +01:00
Daniel Rodriguez
e1e76595a5
Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop'
...
Ent 5365 pestana de acciones de alertas sin paginacion
See merge request artica/pandorafms!3087
2020-03-16 17:19:32 +01:00
Daniel Maya
fc88d265d4
Added group filter in alert list
2020-03-16 15:42:10 +01:00
Tatiana Llorente
d799ac0739
Added pagination and filter box in alert actions - #5365
2020-03-02 16:17:45 +01:00