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
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01: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
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
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +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
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +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
e24794d6ea
Fixed alert command creation error management
2018-10-22 16:54:22 +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
61a3d147af
Added descriptive error messages - #2858
2018-10-03 16:41:58 +02:00
e4f24b2452
Fixed json in audit log
2018-04-05 16:57:26 +02:00
29c69b1dbc
add send mail plain/text
2017-11-07 11:43:46 +01: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
bf2485ec25
fixed errors send email text-plain
2017-04-26 12:00:08 +02:00
1f1023db92
Added new fields to alert macros (snmp as well). Ticket #233
2017-02-07 10:41:48 +01:00
8b06931715
Ticket 3462: Provided snmp help/std help based on referer
2016-07-29 15:46:27 +02: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
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
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
3c08c32482
Fixed an ajax error
2015-07-14 18:34:16 +02:00
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +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
c7b3104224
In alert command preview is not array but contain data, create textarea instead of select
2015-03-26 15:33:37 +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
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
a3783f70e1
Now the alert action command fields can have a HTML wysiwyg editor
2015-02-04 16:52:28 +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
f799be11bd
2014-03-27 Vanessa Gil <vanessa.gil@artica.es>
...
* godmode/alerts/alert_commands.php
godmode/snmpconsole/snmp_alert.php: Fixed
bug:load recovery fields of alert actions.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-27 13:02:34 +00:00
db9b118bdb
2014-03-05 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/pandora.css
include/javascript/pandora_alerts.js
extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql
extras/pandoradb_migrate_4.1_to_5.0.oracle.sql
extras/pandoradb_migrate_4.1_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
extras/check_other_languages.sh
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
extras/network_components.postgreSQL.sql
extras/network_components.oracle.sql
extras/network_components.mysql.sql
godmode/alerts/alert_actions.php
godmode/alerts/alert_commands.php
godmode/alerts/alert_view.php
godmode/alerts/configure_alert_template.php
godmode/alerts/alert_templates.php
godmode/alerts/configure_alert_action.php: Clean sql scripts,
reorganise the alert template creation interface, add field1
to template recovery fields and add action recovery fields.
Ticket #501
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 11:34:05 +00:00
0fec0e80e7
2013-10-13 Junichi Satoh <junichi@rworks.jp>
...
* godmode/alerts/alert_commands.php, include/functions_io.php: Fixed
that unexpected fields descriptions are set when multi-byte characters
are entered.
It is caused by json_encode(). It escapes unicode used by multi-byte
characters. I've created io_json_mb_encode(), replacement of
json_encode() for multi-byte characters.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8902 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-13 23:13:23 +00:00
20e0859b7d
2013-06-19 Mario Pulido <mario.pulido@artica.es>
...
*godmode/alerts/alert_list.php,
godmode/alerts/configure_alert_template.php,
godmode/alerts/alert_templates.php,
godmode/alerts/configure_alert_action.php,
godmode/alerts/configure_alert_command.php,
godmode/alerts/alert_actions.php,
godmode/alerts/alert_commands.php,
include/help/en/help_event_alert.php,
include/help/en/help_alerts_config.php,
include/help/es/help_event_alert.php,
include/help/es/help_alerts_config.php,
include/help/ja/help_event_alert.php,
images/help/alert01.png,
images/help/alert02.png,
images/help/alert03.png,
images/help/alert04.png,
images/help/alert05.png,
images/help/alert06.png,
images/help/alert07.png,
images/help/alert08.png,
images/help/alert09.png,
images/help/event01.png,
images/help/event02.png,
images/help/event03.png,
images/help/event04.png,
images/help/alert10.png,
images/help/alert11.png,
images/help/alert12.png,
images/help/alert13.png,
images/help/alert14.png,
images/help/alert15.png,
images/help/alert16.png: Added new helps
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-19 16:28:30 +00:00
fe53f75f60
2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/alerts/configure_alert_action.php,
godmode/alerts/alert_commands.php: fixed the duplicated the rows
and did'nt hide the macros field rows.
Fixes : #2294
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-17 12:33:34 +00:00
1a11c002cb
2013-05-20 Sergio Martin <sergio.martin@artica.es>
...
* include/functions_html.php
include/styles/pandora.css
include/functions_visual_map.php
include/functions_agents.php
include/languages/util-bzr-update
include/languages/util-generate-tarball
include/languages/util-all
include/languages/util-create-po
include/languages/util-README
include/languages/util-update-po
include/languages/util-create-template
include/languages/util-compile-mo
include/constants.php
operation/tree.php
operation/visual_console/render_view.php
operation/users/user_edit.php
operation/events/events.build_table.php
operation/events/events_list.php
operation/events/events.php
operation/agentes/status_monitor.php
images/status_sets/faces/severity_warning_pixel.png
images/status_sets/faces/agent_critical_ball.png
images/status_sets/faces/severity_major_pixel.png
images/status_sets/faces/module_warning_ball.png
images/status_sets/faces/module_ok_ball.png
images/status_sets/faces/agent_no_data_ball.png
images/status_sets/faces/severity_minor_pixel.png
images/status_sets/faces/agent_ok_ball.png
images/status_sets/faces/severity_normal_pixel.png
images/status_sets/faces/server_down_ball.png
images/status_sets/faces/alert_not_fired_ball.png
images/status_sets/faces/severity_informational_pixel.png
images/status_sets/faces/agent_down_ball.png.png
images/status_sets/faces/module_no_data_ball.png
images/status_sets/faces/alert_fired_ball.png
images/status_sets/faces/agent_warning_ball.png
images/status_sets/faces/severity_maintenance_pixel.png
images/status_sets/faces/agent_no_monitors_ball.png
images/status_sets/faces/agent_down_ball.png
images/status_sets/faces/severity_critical_pixel.png
images/status_sets/faces/alert_disabled_ball.png
images/status_sets/faces/module_critical_ball.png
images/status_sets/faces/server_ok_ball.png
images/status_sets/color_text/severity_informational.png
images/status_sets/color_text/module_critical.png
images/status_sets/color_text/server_ok.png
images/status_sets/color_text/alert_not_fired.png
images/status_sets/color_text/severity_warning_pixel.png
images/status_sets/color_text/agent_critical_ball.png
images/status_sets/color_text/severity_major_pixel.png
images/status_sets/color_text/module_warning_ball.png
images/status_sets/color_text/module_unknown.png
images/status_sets/color_text/module_ok_ball.png
images/status_sets/color_text/module_alertsfired.png
images/status_sets/color_text/module_no_data.png
images/status_sets/color_text/severity_maintenance.png
images/status_sets/color_text/agent_no_data_ball.png
images/status_sets/color_text/severity_minor_pixel.png
images/status_sets/color_text/alert_fired.png
images/status_sets/color_text/agent_ok_ball.png
images/status_sets/color_text/severity_normal_pixel.png
images/status_sets/color_text/agent_no_data.png
images/status_sets/color_text/severity_critical.png
images/status_sets/color_text/agent_no_monitors.png
images/status_sets/color_text/agent_ok.png
images/status_sets/color_text/server_down_ball.png
images/status_sets/color_text/alert_not_fired_ball.png
images/status_sets/color_text/severity_informational_pixel.png
images/status_sets/color_text/server_down.png
images/status_sets/color_text/alert_disabled.png
images/status_sets/color_text/module_unknown_ball.png
images/status_sets/color_text/severity_warning.png
images/status_sets/color_text/severity_major.png
images/status_sets/color_text/module_no_data_ball.png
images/status_sets/color_text/agent_critical.png
images/status_sets/color_text/module_warning.png
images/status_sets/color_text/alert_fired_ball.png
images/status_sets/color_text/agent_warning_ball.png
images/status_sets/color_text/severity_maintenance_pixel.png
images/status_sets/color_text/module_ok.png
images/status_sets/color_text/agent_no_monitors_ball.png
images/status_sets/color_text/severity_minor.png
images/status_sets/color_text/agent_down_ball.png
images/status_sets/color_text/severity_normal.png
images/status_sets/color_text/agent_warning.png
images/status_sets/color_text/agent_down.png
images/status_sets/color_text/severity_critical_pixel.png
images/status_sets/color_text/alert_disabled_ball.png
images/status_sets/color_text/module_critical_ball.png
images/status_sets/color_text/server_ok_ball.png
images/status_sets/default/severity_informational.png
images/status_sets/default/module_critical.png
images/status_sets/default/server_ok.png
images/status_sets/default/alert_not_fired.png
images/status_sets/default/severity_warning_pixel.png
images/status_sets/default/agent_critical_ball.png
images/status_sets/default/severity_major_pixel.png
images/status_sets/default/module_warning_ball.png
images/status_sets/default/module_unknown.png
images/status_sets/default/module_ok_ball.png
images/status_sets/default/module_alertsfired.png
images/status_sets/default/module_no_data.png
images/status_sets/default/severity_maintenance.png
images/status_sets/default/agent_no_data_ball.png
images/status_sets/default/severity_minor_pixel.png
images/status_sets/default/alert_fired.png
images/status_sets/default/agent_ok_ball.png
images/status_sets/default/severity_normal_pixel.png
images/status_sets/default/agent_no_data.png
images/status_sets/default/severity_critical.png
images/status_sets/default/agent_no_monitors.png
images/status_sets/default/agent_ok.png
images/status_sets/default/server_down_ball.png
images/status_sets/default/alert_not_fired_ball.png
images/status_sets/default/severity_informational_pixel.png
images/status_sets/default/server_down.png
images/status_sets/default/alert_disabled.png
images/status_sets/default/severity_warning.png
images/status_sets/default/severity_major.png
images/status_sets/default/module_no_data_ball.png
images/status_sets/default/agent_critical.png
images/status_sets/default/module_warning.png
images/status_sets/default/alert_fired_ball.png
images/status_sets/default/agent_warning_ball.png
images/status_sets/default/severity_maintenance_pixel.png
images/status_sets/default/module_ok.png
images/status_sets/default/agent_no_monitors_ball.png
images/status_sets/default/alert_disabled_square.png
images/status_sets/default/severity_minor.png
images/status_sets/default/agent_down_ball.png
images/status_sets/default/severity_normal.png
images/status_sets/default/agent_warning.png
images/status_sets/default/agent_down.png
images/status_sets/default/severity_critical_pixel.png
images/status_sets/default/alert_disabled_ball.png
images/status_sets/default/module_critical_ball.png
images/status_sets/default/server_ok_ball.png
godmode/groups/configure_group.php
godmode/groups/group_list.php
godmode/servers/plugin.php
godmode/alerts/configure_alert_template.php
godmode/alerts/alert_templates.php
godmode/alerts/configure_alert_action.php
godmode/alerts/configure_alert_command.php
godmode/alerts/alert_actions.php
godmode/alerts/alert_commands.php
godmode/users/user_list.php
godmode/users/profile_list.php
godmode/users/configure_user.php
godmode/users/configure_profile.php
godmode/modules/manage_network_components_form_common.php
godmode/modules/manage_network_components.php
godmode/modules/manage_nc_groups.php
godmode/reporting/visual_console_builder.php
godmode/reporting/visual_console_builder.data.php
godmode/reporting/reporting_builder.php
godmode/reporting/visual_console_builder.editor.php
godmode/tag/tag.php
godmode/category/category.php: Visual changes in icons
and colors. Add visual layers for metaconsole
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8160 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-20 08:42:02 +00:00
4819aaed2f
2013-05-14 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/alerts/alert_commands.php: fixed the ajax of
"get_alert_command".
Fixes : #2214
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8133 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-14 15:23:57 +00:00
vgilc
Tatiana Llorente
manuel
Luis Calvo
alejandro-campos
artica
fermin831
danielmaya
daniel
Arturo Gonzalez
fbsanchez
m-lopez-f
Alejandro Gallardo Escobar
mdtrooper
Alejandro Gallardo Escobar
zarzuelo
jsatoh
mariopulido