Commit Graph

452 Commits

Author SHA1 Message Date
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
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
Alejandro Gallardo Escobar 3c08c32482 Fixed an ajax error 2015-07-14 18:34:16 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +02:00
Alejandro Gallardo Escobar 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
m-lopez-f 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
Alejandro Gallardo Escobar 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
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
mdtrooper 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
m-lopez-f 50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f 514ab2556b Change visual of agents detail and admin agent 2015-04-21 17:41:33 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
mdtrooper 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
m-lopez-f 0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
mdtrooper db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944
(cherry picked from commit b7264f61c3)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
2015-03-10 15:38:56 +01:00
mdtrooper 7883e08af5 Working in the files for the next cherry pick. 2015-03-10 15:36:23 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper d2accaae68 Fixed the update of alert command usability.
(cherry picked from commit f475dc80bd)

Conflicts:
	pandora_console/godmode/alerts/configure_alert_command.php
2015-03-09 16:25:58 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
Alejandro Gallardo Escobar a3783f70e1 Now the alert action command fields can have a HTML wysiwyg editor 2015-02-04 16:52:28 +01:00
Alejandro Gallardo Escobar 0023caf6ea Fixed an error that prevented the creation of a template when a template was selected 2015-02-02 19:53:08 +01:00
m-lopez-f 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
m-lopez-f 82c794a14e add links in agent name and alert name 2015-01-23 12:21:57 +01:00
mdtrooper d01b82bc3b Fixed the english message of my last commit. Thanks Sancho. 2014-09-10 18:04:59 +02:00
mdtrooper 5655a7d16f Fixed the templates with equal min and max as 0. TICKETS #1245 2014-09-10 16:33:19 +02:00
mdtrooper 09958981c0 some changes in the clippy
2014-09-02  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/godmode/alerts/configure_alert_action.php,
	pandora_console/include/functions_clippy.php,
	pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php,
	pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php,
	pandora_console/include/help/clippy/homepage.php,
	pandora_console/include/help/clippy/operation_agentes_ver_agente.php:
	some changes in the clippy.
2014-09-02 16:42:59 +02:00
mdtrooper 66a9c59ddb 2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/module_unknow.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/help/clippy/godmode_alerts_alert_actions.php,
	include/help/clippy/operation_agentes_ver_agente.php,
	include/help/clippy/godmode_alerts_configure_alert_action.php,
	include/help/clippy/operation_agentes_status_monitor.php,
	include/help/en/help_context_pandora_server_email.php,
	include/functions_clippy.php, operation/menu.php,
	operation/agentes/status_monitor.php: some changes suggested by
	Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-26 11:22:06 +00:00
mdtrooper a6197fccb2 2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
mdtrooper ab110f04ad 2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_template.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
	include/ajax/module.php, include/functions.php,
	include/functions_ui.php, extensions/insert_data.php,
	operation/netflow/nf_live_view.php,
	operation/reporting/reporting_viewer.php,
	operation/reporting/graph_viewer.php, operation/tree.php,
	operation/agentes/datos_agente.php,
	operation/agentes/estado_monitores.php: fixed the i18n of the
	timepicker.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 15:57:36 +00:00
zarzuelo 6cd21beca0 2014-05-30 Sergio Martin <sergio.martin@artica.es>
* general/news_dialog.php: Missed file in last commit

	* godmode/alerts/configure_alert_action.php
	godmode/alerts/configure_alert_command.php
	include/javascript/pandora_alerts.js: fixed preview
	of commands in action configuration and changed the 
	text input by a textarea in command configuration for
	ticket: #852



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10046 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 10:34:21 +00:00
alexhigh 5f7feb75aa 2014-05-07 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/agentes/planned_downtime.editor.php,
	  godmode/alerts/configure_alert_template.php,
	  godmode/reporting/reporting_builder.item_editor.php,
	  operation/netflow/nf_live_view.php: Changed the maximum
	character length of the time inputs from 7 to 8.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 14:14:23 +00:00