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
9ddfde1774
fixed error with update event comments
2020-06-09 12:02:31 +02:00
cfe30d5b7d
fixed vulnerability on special days
2020-06-09 10:37:11 +02:00
b3cf532c16
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
2020-05-29 12:30:49 +02:00
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
f3d9f2d75e
Cluster view RC1
2020-05-22 13:13:19 +02:00
f229dada52
fixed minnnor error
2020-04-02 19:02:14 +02:00
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
8c86019037
Ent 5583 bug comando de alerta
2020-03-18 12:25:29 +01:00
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
fc88d265d4
Added group filter in alert list
2020-03-16 15:42:10 +01:00
d799ac0739
Added pagination and filter box in alert actions - #5365
2020-03-02 16:17:45 +01:00
0980c9a74a
Ent 5261 cambio de control de intervalo en alertas
2020-01-16 13:50:39 +01:00
95600412e1
Minor visual changes in alert list
2020-01-14 13:14:09 +01:00
7f61caaa15
Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop'
...
Ent 5034 bug al copiar acción de alerta
See merge request artica/pandorafms!2921
2019-12-23 10:51:10 +01:00
85f4301e4c
Fixed bugs in alert actions
2019-12-05 16:43:26 +01:00
810fe8f860
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
...
This reverts merge request !2886
2019-12-03 15:59:08 +01:00
809628560b
Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
...
Ent 4968 comandos de alerta con saltos de linea
See merge request artica/pandorafms!2886
2019-12-03 15:53:23 +01:00
0420a439d1
Send params to copy and delete action alert by post
2019-11-28 11:51:32 +01:00
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01:00
65f5223698
validation alerts
2019-11-11 14:26:04 +01:00
c5be8e55ae
Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
...
Ent 3807 html special chars conversion
See merge request artica/pandorafms!2320
2019-06-25 12:19:01 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
0f35923073
Recovered event criticity field from event alert
...
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
9347fc17aa
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
12c9952e4a
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
7d8f9f7798
fix lint errors
...
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
2019-05-03 13:54:39 +02:00
5b3dfcbf74
add feature to enable obfuscation on command fields when creating or updating commands
...
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
2019-05-03 13:46:52 +02:00
d16b96309b
Fixed pagination in Alert templates
...
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
2019-04-29 14:45:11 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
41ea1a4c66
Fixed minor visual bug - #3707
...
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
4c95a160de
Changed Jquery .text for .html for html conversion
...
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
2019-04-01 17:57:22 +02:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
8d3644b002
Merge branch '3112-Bug-en-creacion-de-alertas-en-cluster' into 'develop'
...
fix duplicated table in active-passive cluster's alert builder
See merge request artica/pandorafms!2010
Former-commit-id: 5b92294a64c3ba4baa65f6eba4087edebd450ed9
2019-01-09 10:34:30 +01:00
561579580e
Merge branch '2958-Bug-en-filtrado-de-módulos-en-la-creación-de-alertas' into 'develop'
...
Added parameter width id agent - #2958
See merge request artica/pandorafms!1891
Former-commit-id: 3288ce807e8ab67daab9d6f4795a263c8467bc7f
2019-01-08 13:38:35 +01:00
9a8197ea1e
fix duplicated table in active-passive cluster's alert builder
2018-11-22 13:03:41 +01:00
a3aa84bf92
fixed errors in session with send mail alerts graph API
2018-11-21 15:16:52 +01:00
8735e6e1a3
Added a translation
2018-11-20 11:18:57 +01:00
d63666cbbc
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
2018-11-08 14:00:49 +01:00
294553941d
Fixed add button on alerts
2018-10-29 16:41:55 +01:00
08a8165b93
Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop'
...
Added number of times an alert is fired - #2827
See merge request artica/pandorafms!1823
2018-10-29 09:15:32 +01:00
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
e0f7d1310b
Merge branch '2858-Mensaje-de-error-poco-descriptivo-en-alertas' into 'develop'
...
2858 mensaje de error poco descriptivo en alertas
See merge request artica/pandorafms!1825
2018-10-25 11:14:31 +02:00
d12791c03f
Added parameter width id agent - #2958
2018-10-25 10:41:40 +02:00
4308c3f92e
Added acl to alert commands select
2018-10-23 10:53:09 +02:00
e24794d6ea
Fixed alert command creation error management
2018-10-22 16:54:22 +02:00
7e8fbb4568
Added warning icon to actions that does not match with their commands
2018-10-22 16:48:24 +02:00
d8a7ebea08
Only change the group to all grupo if neccesary when command is changed
2018-10-22 16:26:58 +02:00
f537dbb961
Validate the group command on action creation
2018-10-22 16:19:29 +02:00
1f299cad52
Added copy button to alert commands
2018-10-22 12:01:29 +02:00
b50b1c9f34
Added group icon to alerts commands view
2018-10-22 10:08:25 +02:00
8b0b23dc27
Added group to alert commands update and creation
2018-10-22 09:49:06 +02:00
c3bcb84293
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-15 08:58:55 +02:00
f3c8b14b32
Merge branch '2457-Formulario-de-creacion-repetido' into 'develop'
...
added check to prevent alert creation form from being printed in alert cluster for step 5
See merge request artica/pandorafms!1854
2018-10-15 00:06:41 +02:00
aa33522670
added check to prevent alert creation form from being printed in alert cluster for step 5
2018-10-11 15:22:36 +02:00
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
edadc60957
Merge branch '2737-Optimización-de-tags-dev' into 'develop'
...
2737 optimización de tags dev
See merge request artica/pandorafms!1815
2018-10-11 12:14:10 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
7fcbc6ece9
added check whto skip alert creation table printing in cluster alert only when step is 5
2018-10-10 18:54:46 +02:00
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
0855d09156
Fixed a minor mistake - #2858
2018-10-03 16:46:35 +02:00
61a3d147af
Added descriptive error messages - #2858
2018-10-03 16:41:58 +02:00
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
2dd10a4328
Added number of times an alert is fired - #2827
2018-10-02 12:35:20 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
d5b9ddec46
Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop'
...
Added new funcionality to cluster alert configuration: update alert
See merge request artica/pandorafms!1634
2018-09-28 10:50:44 +02:00
13ad7b4fc7
Fixed group all alert templates visualization
2018-08-13 11:24:32 +02:00
a9bb538e1a
Fixed permissions in alert_actions
2018-08-02 12:47:42 +02:00
c70475cd38
Added new funcionality to cluster alert configuration: update alert
2018-07-26 10:24:45 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
88e060893a
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts resolved:
pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
acad8d537b
[Rebranding] Added tooltip to avoid Monitoring Event name will be changed
2018-05-24 11:37:26 +02:00
9d558fb7cb
Removed some duplicated html entities
2018-05-22 16:30:33 +02:00
358847ecef
[Rebranding] Open godmode/<others>
2018-05-10 15:43:46 +02:00
5ee01aa70f
Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop'
...
Cluster monitoring 2 - #2007
See merge request artica/pandorafms!1378
2018-04-20 10:31:57 +02:00
60f7a0ab79
Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
...
Conflicts:
pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
e4f24b2452
Fixed json in audit log
2018-04-05 16:57:26 +02:00
88375a2460
[Secondary groups] Fixed some problems in agent view
2018-03-27 16:38:17 +02:00
db16a797f3
[Secondary Groups] Assign secondary groups by AJAX on agent edit view
2018-03-22 13:34:15 +01:00
8690aa908a
Cluster monitoring 2 - #2007
2018-03-19 10:05:29 +01:00
3a3de49802
Fixed text/html option in alert action
2018-01-15 11:04:53 +01:00
3a4ed1671b
Merge branch '1410-Traducción-en-filtro-de-Alertas' into 'develop'
...
Change manage alerts list enabled / disabled select text - #1410
See merge request artica/pandorafms!973
2017-11-29 16:59:57 +01:00
29c69b1dbc
add send mail plain/text
2017-11-07 11:43:46 +01:00
47c7f23208
Change manage alerts list enabled / disabled select text - #1410
2017-10-25 16:40:21 +02:00
27746eedc0
Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'"
...
This reverts merge request !862
2017-10-16 16:44:44 +02:00
9a66aa52f2
add send mail plain/text
2017-09-27 13:42:02 +02:00
4bdc0df5c4
Changed agent name by alias in alerts details
2017-06-08 17:55:04 +02:00
b506e47150
Merge branch '622-fixed-qick-guide' into 'develop'
...
Remove temporality links to help. And in future chenge this help
See merge request !386
2017-05-17 17:28:46 +02:00
600f4bc364
Changed bad jquery get call in alert actions and alerts snmp.
2017-05-08 15:54:35 +02:00
b11865ccae
Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop'
...
Not use group filter sql if not exist filter_group data - #782
See merge request !412
2017-04-27 16:31:45 +02:00
d2b409d276
Not use group filter sql if not exist filter_group data - #782
2017-04-26 12:09:35 +02:00
bf2485ec25
fixed errors send email text-plain
2017-04-26 12:00:08 +02:00
fcf3da2acf
Remove temporality links to help. And in future chenge this help
2017-04-20 12:10:52 +02:00
15749e323f
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562
2017-03-24 13:07:49 +01:00
a1978e93b1
Inserted alias in pandora audit
2017-02-22 16:52:42 +01:00
83776e46d1
Changed some texts in pandora. Ticket #347
2017-02-22 12:36:30 +01:00
d39b108c1f
Merge branch 'develop' into feature/alias_freandly_name
...
Conflicts:
pandora_agents/unix/pandora_agent
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/modificar_agente.php
pandora_console/godmode/agentes/planned_downtime.editor.php
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/godmode/massive/massive_edit_modules.php
pandora_console/include/class/Tree.class.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_treeview.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
1f1023db92
Added new fields to alert macros (snmp as well). Ticket #233
2017-02-07 10:41:48 +01:00
3e0b0f231b
Added more fields to alert macro fields. Ticket #233
2017-02-06 16:20:39 +01:00
0fec55fd82
Timethreshold_alert_edition_fix - #25
2017-01-23 15:27:22 +01:00
34f4b434c2
Set default module action threshold to 0.
2017-01-18 10:56:08 +09:00
5ec7e1ae0f
Fixed broken header of alert list.
2016-10-11 12:28:58 +09:00
cf3d44872f
Changed agent name
2016-10-06 12:10:10 +02:00
e48e1ddd7e
ticket: 4069 add actions for defect in templates html #4069
2016-09-29 14:30:07 +02:00
331a4e01d6
visually enhance dialog box events, assignment alerts, alert list #58#52#57
...
(cherry picked from commit 95d73ceb88
2016-09-20 17:31:42 +02:00
581d3835db
Fixed acl's permmissions. Ticket #3912
2016-09-08 16:06:12 +02:00
e914b3c87c
Feature to update action assignate a alert and module. Internal Ticket: #3994
2016-09-01 09:09:03 +02:00
8b06931715
Ticket 3462: Provided snmp help/std help based on referer
2016-07-29 15:46:27 +02:00
2882c320a9
Fixed wrong privileges for special days creation.
2016-07-15 16:16:17 +09:00
73775b09dc
Removed an unnecessary argument for users_can_manage_group_all().
2016-07-12 16:46:27 +09:00
04c1304a5d
Fixed help of action alerts. Tiquet: #3889
2016-06-27 13:09:23 +02:00
b40f0848e0
Fixed help alert command. Ticket #3415 .
2016-06-15 15:52:29 +02:00
b6164485b6
Improved special day's UI. Special days are now shown in calendar style.
...
And, iCalendar(.ics) files can also be uploaded.
2016-06-07 13:43:30 +09:00
e2ad075152
Added a new feature to the alert template.
...
It allows to reset minimum number of alert when the alert status is not
continuously.
2016-03-09 11:33:01 +09:00
cfcc6b40ea
Fixed view and call funtions, dont work in Oracle's DB. Tiquet: #3231
...
(cherry picked from commit 64b2ad8f6b
2016-01-22 09:29:45 +01:00
13b480ec92
Fixed width of field in alerts template. Tiquet: #2951
...
(cherry picked from commit 005da0e3e2
2015-11-04 11:12:51 +01:00
fdff5ca98b
Changed alerts list table
2015-10-26 12:46:26 +01:00
5fb981377d
Fixed lost filter in alerts list. Ticket#2919
2015-10-26 12:21:54 +01:00
d3339c95c3
Fixed alert list table
2015-10-22 11:13:06 +02:00
01ac115a29
Fixed alert list table
2015-10-22 10:20:48 +02:00
7aed427a7a
Fixed special days in oracle. Ticket#2904
2015-10-21 13:31:17 +02:00
2b7c74f1d9
Changed bad help message in alert macros. Ticket#2863
2015-10-21 10:05:56 +02:00
1f99733ac8
Fixed problems with data from database when db is oracle
2015-10-19 08:32:37 +02:00
523cb7bf65
Add break to switch to last commit
2015-10-14 11:16:10 +02:00
e94618db62
Fixed problems with data when database is in Oracle. Tiquet: #2864
2015-10-14 11:10:44 +02:00
c4644b4a4b
Fixed problems with query when have chief operation permission and show administration of alets. Tiquet: #2839
2015-10-02 11:08:22 +02:00
72c5a47fcc
Solved nonexistent help message in the field 1, alerts section. Ticket #2799
2015-09-23 09:11:01 +02:00
e9d61ab644
Fixed error in snmp alerts whit PandoraFMS event. Ticket#1592
2015-09-14 13:41:54 +02:00
be7e8aa567
Change form of search data in orcle
2015-09-11 12:58:13 +02:00
0e090c27c5
Fixed list of alerts when dbengine is Oracle. Tiquet: #2699
2015-09-07 11:50:35 +02:00
3c08c32482
Fixed an ajax error
2015-07-14 18:34:16 +02:00
09f6b7a29a
Fixed styles metaconsole
2015-07-07 13:57:47 +02:00
3498e9e1e7
Killing some unicorns and magic numbers.
2015-06-29 16:49:48 +02:00
94c742bfbe
Merge from Develop
2015-06-25 10:40:35 +02:00
5b4214277b
Changed of visual
2015-06-25 10:07:53 +02:00
447c4ccd6d
Some fixes in the code.
2015-06-22 16:10:15 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +02:00
e5685dfe07
Fixed errors for oracle databases
2015-06-16 15:39:27 +02:00
9e528d0459
Change visual of console
2015-06-12 15:50:46 +02:00
7574f6ed09
Clean the source code style.
2015-06-08 13:13:09 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
b96fdad6d8
Sanitized the project (clean code and removed the deprecated htmLaWed)
2015-06-08 09:18:00 +02:00
8fbe1175b5
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/DEBIAN/control
pandora_console/DEBIAN/make_deb_package.sh
pandora_console/include/config_process.php
pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
84fb973c6f
Change privilege in call function to return groups of view this user. Tiquet: #2259
...
(cherry picked from commit 73ae001a3f
2015-06-01 10:13:42 +02:00
137acdb232
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
d212fd5543
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-14 11:09:37 +02:00
73e0a74a1a
Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
50e6fd2bab
Fixed error when load data in action alert in manage alerts, tiquet: #2088
2015-05-06 13:09:45 +02:00
c95f70dde7
Error fixes related with the improved oracle compatibility
2015-05-04 18:27:23 +02:00
b2ef7bc304
Changed visual of any views
2015-04-23 17:52:16 +02:00
514ab2556b
Change visual of agents detail and admin agent
2015-04-21 17:41:33 +02:00
2d9168ac8f
Changed styles from views in nodo
2015-04-15 09:45:13 +02:00
e29497c394
Changed style of Nodo
2015-04-10 09:43:44 +02:00
f84863540f
Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).
2015-04-10 00:58:24 +02:00
0213cd7405
Change views and styles in Console
2015-04-01 13:24:53 +02:00
c7b3104224
In alert command preview is not array but contain data, create textarea instead of select
2015-03-26 15:33:37 +01:00
7e1b707b64
Changed visual of metaconsole
2015-03-11 15:57:05 +01:00
6986fe0993
Changed visual of metaconsole
2015-03-11 11:31:46 +01:00
db6e59c9bb
Fixed the preview alert action in the form editor. TICKET: #1944
...
(cherry picked from commit b7264f61c3
2015-03-10 15:38:56 +01:00
7883e08af5
Working in the files for the next cherry pick.
2015-03-10 15:36:23 +01:00
e38f31caaa
Changed visual of metaconsole
2015-03-09 16:33:27 +01:00
d2accaae68
Fixed the update of alert command usability.
...
(cherry picked from commit f475dc80bd
2015-03-09 16:25:58 +01:00
58722a5891
Changed visual of metaconsole
2015-03-06 12:28:05 +01:00
0473856048
Killing pink unicorns and magic numbers.
2015-02-16 18:37:16 +01:00
a3783f70e1
Now the alert action command fields can have a HTML wysiwyg editor
2015-02-04 16:52:28 +01:00
0023caf6ea
Fixed an error that prevented the creation of a template when a template was selected
2015-02-02 19:53:08 +01:00
340c965f92
Fixed alert command previews in 'Configure alert action' when variable contained a double or single quotes
...
(cherry picked from commit 443440f998
2015-01-29 13:41:33 +01:00
82c794a14e
add links in agent name and alert name
2015-01-23 12:21:57 +01:00
Daniel Barbero Martin
Calvo
Alejandro Campos
Daniel Maya
José González
Marcos Alconada
Daniel Rodriguez
Junichi Satoh
José González
fbsanchez
manuel.montes
Tatiana Llorente
Alejandro Fraguas
vgilc
Alejandro Gallardo Escobar
artica
fermin831
enriquecd
Arturo Gonzalez
m-lopez-f
mdtrooper
Alejandro Gallardo Escobar