40efaa157d
Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs
2022-02-01 13:42:30 +01:00
d81e6571ec
New audit logs
2022-02-01 13:39:18 +01:00
3252832cc7
WIP: Check audit logs
2022-01-20 10:55:23 +01:00
daf0b4e6e9
Fix alert view with default actions node and meta
2021-12-27 19:01:53 +01:00
1dec1e468c
Merge remote-tracking branch 'origin/develop' into ent-8208-bug-filtros-en-vista-de-alertas
2021-12-27 10:44:25 +01:00
c20b3bacc8
wip reports alert actions
2021-12-07 11:00:48 +01:00
eb8b89f22e
wip reports alert actions
2021-12-02 17:17:21 +01:00
94bd55fd39
wip reports alert actions
2021-12-02 16:55:53 +01:00
ec21d9d08a
wip reports alert actions
2021-12-02 14:27:24 +01:00
d030b3b924
wip reports alert actions
2021-12-02 14:16:01 +01:00
abedd87910
wip reports alert actions
2021-12-02 14:04:33 +01:00
a02c8a7988
wip reports alert actions
2021-12-01 15:15:45 +01:00
40fc8c7308
wip reports alert actions
2021-11-30 13:07:37 +01:00
33d9db657e
wip reports alert actions
2021-11-29 20:45:35 +01:00
e8bf86a789
wip reports alert actions
2021-11-29 17:55:09 +01:00
c8fcd511bf
Fix monitoring alert detail filter for defautl actions
2021-11-29 11:07:11 +01:00
960c2de6c3
wip reports alert actions
2021-11-26 14:06:10 +01:00
780d2bf87d
wip reports alert actions
2021-11-26 11:43:57 +01:00
dae6182ef0
wip reports alert actions
2021-11-25 17:28:00 +01:00
7a5f91188b
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
...
Conflicts:
pandora_console/include/functions_html.php
2021-11-24 08:39:03 +01:00
e70ecd461e
WIP new report alert fired actions
2021-11-12 13:11:49 +01:00
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
c08806374e
removed deprecated get_magic_quotes_gpc function and dependent code
2021-10-04 17:37:06 +02:00
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
533a94b09e
Fixed issue with alert actions update
2021-07-19 14:34:48 +02:00
2f536c7577
Wip command center
2021-06-01 19:36:56 +02:00
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +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
58d5c2bc69
Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop'
...
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules
See merge request artica/pandorafms!3881
2021-04-06 17:30:27 +00:00
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +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
f8d9c00183
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules
2021-03-04 20:15:40 +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
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
c2c29c0d4a
Update functions_alerts.php with correction
2021-01-15 09:58:18 +01:00
579b8d4965
Solve issue and added correct headers
2021-01-14 19:08:01 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
45e8efa089
minor fix
2020-10-29 18:47:34 +01:00
742cbcb5c5
fix group alert report
2020-10-29 17:54:40 +01:00
0deff70f8b
Alert report (group) Group + secondary groups + recursion
2020-10-07 14:07:17 +02:00
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
6c90a4dd53
Fixed bug in alerts details view
2019-08-07 13:04:37 +02:00
ce1231eae6
Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
...
Added option in massive delete alerts to show alerts on disabled modules
See merge request artica/pandorafms!2396
2019-06-24 09:55:44 +02:00
98eb1acf00
Add name alert to message
2019-06-19 17:55:09 +02:00
358c3f6a55
Changed message to module name
2019-06-19 16:04:08 +02:00
e9e24505fe
Added option in massive delete alerts to show alerts on disabled modules
...
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
b11d1a6687
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
2019-02-13 12:03:46 +01:00
Jose Gonzalez
Calvo
Daniel Barbero Martin
José González
alejandro.campos@artica.es
Jose Gonzalez
Daniel Maya
Daniel Rodriguez
Junichi Satoh
fbsanchez
manuel
Alejandro Fraguas
marcos.alconada