Commit Graph

399 Commits

Author SHA1 Message Date
danielmaya 3a3de49802 Fixed text/html option in alert action 2018-01-15 11:04:53 +01:00
vgilc 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
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
enriquecd 47c7f23208 Change manage alerts list enabled / disabled select text - #1410 2017-10-25 16:40:21 +02:00
vgilc 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
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
Daniel Maya 4bdc0df5c4 Changed agent name by alias in alerts details 2017-06-08 17:55:04 +02:00
vgilc 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
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
vgilc 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
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
m-lopez-f fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
Daniel Maya a1978e93b1 Inserted alias in pandora audit 2017-02-22 16:52:42 +01:00
Arturo Gonzalez 83776e46d1 Changed some texts in pandora. Ticket #347 2017-02-22 12:36:30 +01:00
Daniel Maya 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
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
Arturo Gonzalez 3e0b0f231b Added more fields to alert macro fields. Ticket #233 2017-02-06 16:20:39 +01:00
enriquecd 0fec55fd82 Timethreshold_alert_edition_fix - #25 2017-01-23 15:27:22 +01:00
Junichi Satoh 34f4b434c2 Set default module action threshold to 0. 2017-01-18 10:56:08 +09:00
Junichi Satoh 5ec7e1ae0f Fixed broken header of alert list. 2016-10-11 12:28:58 +09:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
daniel e48e1ddd7e ticket: 4069 add actions for defect in templates html #4069 2016-09-29 14:30:07 +02:00
enriquecd 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
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
m-lopez-f e914b3c87c Feature to update action assignate a alert and module. Internal Ticket: #3994 2016-09-01 09:09:03 +02:00
fbsanchez 8b06931715 Ticket 3462: Provided snmp help/std help based on referer 2016-07-29 15:46:27 +02:00
Junichi Satoh 2882c320a9 Fixed wrong privileges for special days creation. 2016-07-15 16:16:17 +09:00
Junichi Satoh 73775b09dc Removed an unnecessary argument for users_can_manage_group_all(). 2016-07-12 16:46:27 +09:00
m-lopez-f 04c1304a5d Fixed help of action alerts. Tiquet: #3889 2016-06-27 13:09:23 +02:00
Daniel Maya b40f0848e0 Fixed help alert command. Ticket #3415. 2016-06-15 15:52:29 +02:00
Junichi Satoh 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
Junichi Satoh 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
m-lopez-f 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
m-lopez-f 13b480ec92 Fixed width of field in alerts template. Tiquet: #2951
(cherry picked from commit 005da0e3e2)
2015-11-04 11:12:51 +01:00
Arturo Gonzalez Diaz fdff5ca98b Changed alerts list table 2015-10-26 12:46:26 +01:00
Arturo Gonzalez Diaz 5fb981377d Fixed lost filter in alerts list. Ticket#2919 2015-10-26 12:21:54 +01:00
Arturo Gonzalez Diaz d3339c95c3 Fixed alert list table 2015-10-22 11:13:06 +02:00
Arturo Gonzalez Diaz 01ac115a29 Fixed alert list table 2015-10-22 10:20:48 +02:00
Arturo Gonzalez Diaz 7aed427a7a Fixed special days in oracle. Ticket#2904 2015-10-21 13:31:17 +02:00
Arturo Gonzalez Diaz 2b7c74f1d9 Changed bad help message in alert macros. Ticket#2863 2015-10-21 10:05:56 +02:00
m-lopez-f 1f99733ac8 Fixed problems with data from database when db is oracle 2015-10-19 08:32:37 +02:00
m-lopez-f 523cb7bf65 Add break to switch to last commit 2015-10-14 11:16:10 +02:00
m-lopez-f e94618db62 Fixed problems with data when database is in Oracle. Tiquet: #2864 2015-10-14 11:10:44 +02:00
m-lopez-f 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
Arturo Gonzalez Diaz 72c5a47fcc Solved nonexistent help message in the field 1, alerts section. Ticket #2799 2015-09-23 09:11:01 +02:00
Arturo Gonzalez Diaz e9d61ab644 Fixed error in snmp alerts whit PandoraFMS event. Ticket#1592 2015-09-14 13:41:54 +02:00
m-lopez-f be7e8aa567 Change form of search data in orcle 2015-09-11 12:58:13 +02:00
m-lopez-f 0e090c27c5 Fixed list of alerts when dbengine is Oracle. Tiquet: #2699 2015-09-07 11:50:35 +02:00