Commit Graph

132 Commits

Author SHA1 Message Date
manuel 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
Ramon Novoa 92e2262440 Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
Ramon Novoa 2626605030 Validate alerts at the time agents/modules are modified.
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
vgilc b97a9e2989 Merge branch '2927-Error-en-vista-de-alertas-lanzadas' into 'develop'
Fixed bug in alert details

See merge request artica/pandorafms!1887
2018-11-30 13:07:41 +01:00
fermin831 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
manuel.montes ca75cff3f7 Fixed bug in alert details 2018-10-24 10:25:45 +02:00
fermin831 f537dbb961 Validate the group command on action creation 2018-10-22 16:19:29 +02:00
fermin831 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
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
alejandro-campos 0c899f5078 Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta
Conflicts:
	pandora_console/include/functions_ui.php
2018-10-01 14:03:30 +02:00
vgilc 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
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
vgilc 9f0271c0b8 Merge branch '1920_Informe_de_alertas_2' into 'develop'
Fixed module/agent/group alert report

See merge request artica/pandorafms!1772
2018-09-18 08:37:03 +02:00
samucarc 8daca7d220 Fixed module/agent/group alert report 2018-09-17 18:57:29 +02:00
fermin831 a25d4ed166 Fixed alerts_get_alerts function 2018-09-12 17:27:09 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
alejandro-campos c70475cd38 Added new funcionality to cluster alert configuration: update alert 2018-07-26 10:24:45 +02:00
alejandro-campos b5c378d589 fixed bug in meta alert view: action field (other than default) not showing 2018-07-19 13:55:16 +02:00
Alejandro Gallardo Escobar 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
enriquecd 064a9d58b9 Show all alerts when select all tags filter - #1676 2018-02-05 15:30:28 +01:00
fermin831 bff2213e45 Update fired alert when delete it 2017-11-07 14:47:34 +01:00
enriquecd 22af4e703a Alert in sound console with snmp alerts events - #38 2017-03-23 10:31:04 +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
enriquecd 5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - #38 2017-02-02 17:46:59 +01:00
daniel 4afaf5190a fixed errors in reports alerts
(cherry picked from commit 85dddf0b56)
2017-01-03 19:33:11 +01:00
Arturo Gonzalez e9eb60a718 Changed events sound styles and added new filters. Ticket #109 Gitlab 2016-12-05 15:23:17 +01:00
Daniel Maya 2014f51410 sort by alias. 2016-09-27 10:31:42 +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
Daniel Maya 2f5457d938 Fixed issue. Ticket #3844. 2016-06-28 16:10:09 +02:00
Daniel Maya ec073eb8b4 New filter actions. Ticket #3893. 2016-06-28 14:55:13 +02:00
m-lopez-f 053d0298a1 Fixed search in alert templates, when DB is Oracle. Tiquet: #3231 2016-01-20 12:47:26 +01:00
Arturo Gonzalez Diaz 7aed427a7a Fixed special days in oracle. Ticket#2904 2015-10-21 13:31:17 +02:00
Alejandro Gallardo Escobar 3e2391a7c3 Fixed the alert info retrieving for oracle databases 2015-06-16 17:54:20 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs"
This reverts commit 3d251fd035.
2015-01-15 15:11:26 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
zarzuelo 75543f9149 2014-01-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fixed the group of the 
	event generated when validate an alert manually



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-27 11:02:15 +00:00
zarzuelo a9a239b5b3 2014-01-24 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fix forgotten cases on
	actions escalation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-24 12:45:09 +00:00
zarzuelo 2b23793949 2014-01-24 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php
	godmode/alerts/alert_view.php
	include/styles/pandora.css
	include/functions_alerts.php: Fix some bugs when 
	doesnt exist an action with min-infinite situation.
	Some visual fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-24 10:17:23 +00:00
zarzuelo a5e9847b29 2014-01-23 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_view.php
	include/styles/pandora.css
	include/functions_alerts.php: Fix escalation errors, added action
	threshold information, encapsulate code to avoid future headaches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-23 19:49:16 +00:00
Ramon Novoa 176a3b3009 2014-01-16 Ramon Novoa <rnovoa@artica.es>
* godmode/alerts/alert_list.list.php,
	  include/functions.php,
	  include/functions_alerts.php: Changes to the alert view to make it more
	  compact.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9327 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-16 16:07:03 +00:00
mdtrooper 3516271674 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php,
	include/functions_network_components.php,
	include/functions_alerts.php: fixed the name of items to duplicate,
	now they have a html entities for whitespaces.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8926 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 12:00:58 +00:00
zarzuelo fd540f5880 2013-10-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	include/functions_alerts.php
	operation/agentes/status_monitor.php
	operation/agentes/status_events.php
	mobile/operation/modules.php: Fixed several calls
	to acl tags with same fixes of Juanma in previous commits



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8887 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-10 16:11:39 +00:00
zarzuelo 090b2e7fb3 2013-10-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php
	include/javascript/jquery.pandora.controls.js
	include/functions_treeview.php
	operation/tree.php
	operation/agentes/ver_agente.php
	godmode/groups/group_list.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_delete_modules.php
	godmode/massive/massive_delete_alerts.php
	godmode/massive/massive_edit_modules.php
	godmode/reporting/graph_builder.graph_editor.php: Add sorting
	in many agents list retrieved by ajax and tree view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8868 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-08 09:48:26 +00:00
zarzuelo 1b53588375 2013-10-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fixed group filter in
	alerts view for incident #218



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8850 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-04 08:24:42 +00:00
mdtrooper faa29e0c03 2013-08-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php, include/functions_alerts.php,
	operation/agentes/alerts_status.php: improved the function
	"get_group_alerts" to use in the places that there were a foreach
	loop with all agents for any group.
	
	Fixes: #2060




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8641 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-08 09:00:34 +00:00
mdtrooper d08ef0febc 2013-04-09 Miguel de Dios <miguel.dedios@artica.es>
* mobile/index.php, mobile/operation/groups.php,
	mobile/operation/agents.php, mobile/operation/alerts.php,
	mobile/operation/agent.php, mobile/operation/events.php,
	mobile/operation/modules.php, mobile/include/style/main.css: 
	
	* include/functions_alerts.php include/functions_groups.php: some
	changes for the mobile.
	
	* operation/agentes/ver_agente.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7945 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-09 09:29:03 +00:00