Commit Graph

7989 Commits

Author SHA1 Message Date
zarzuelo d5a72a3ebf 2014-03-05 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Add action recovery fields to the
	recovery logic in alerts.
	Ticket #501



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9506 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 11:39:27 +00:00
zarzuelo 00e6745ed2 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
pandora-release 8232595caf Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 00:32:33 +00:00
slerena f2c84e53d5 2014-03-04 Sancho Lerena <slerena@artica.es>
* en/help_ipam.php: Added translation for IPAM help.

        * e?/help_pcap_filter.php: Added small sample.

        * es/help_ipam.php: Some adittions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9502 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 18:10:38 +00:00
mdtrooper 15b15c091a 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "get_module_name".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9501 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 16:51:30 +00:00
zarzuelo 9ef8390fea 2014-03-04 Sergio Martin <sergio.martin@artica.es>
* include/help/es/help_ipam.php: Typo fix in ipam text



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 15:17:46 +00:00
zarzuelo 376805372f 2014-03-04 Sergio Martin <sergio.martin@artica.es>
* include/help/es/help_ipam.php: Added spanish IPAM help

	* include/styles/pandora.css: Little fix on help 
	styles changing size to h3 tag



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 14:49:56 +00:00
mdtrooper bb7346eb47 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "api_get_policies".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 14:39:19 +00:00
mdtrooper 8710d7713c 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function
	"api_get_tactical_view". Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 10:53:09 +00:00
mdtrooper 57268d0a38 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "api_get_gis_agent".
	Thanks Cucumber.
	
	* include/functions_io.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9491 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 09:57:31 +00:00
pandora-release e7477b3e96 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 00:33:04 +00:00
mdtrooper 77b6fc03df git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2014-03-03 17:08:35 +00:00
mdtrooper 63581a2097 2014-03-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the call "get_total_modules" now
	it does not count the pending delete modules. And thanks Cucumber for
	to the advise.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-03 17:06:31 +00:00
pandora-release 0235a37059 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9483 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-03 00:32:09 +00:00
pandora-release 6f90dcbb8b Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9480 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-02 00:32:14 +00:00
pandora-release 497805d903 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-01 00:32:03 +00:00
pandora-release d68c712094 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-28 00:31:54 +00:00
pandora-release c32d01d126 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-27 00:35:09 +00:00
pandora-release 024199277f Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9471 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-26 10:19:31 +00:00
zarzuelo 743ce1742b 2014-02-25 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_events.js
	include/ajax/events.php: Change command timeouts in responses
	from 10 to 9 seconds to avoid problems in certain systems. Add
	little feedback when command reach timeout time



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-25 12:38:53 +00:00
pandora-release bd0dd80e5c Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-25 00:50:54 +00:00
pandora-release a5d1c739f1 Updated version string.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 15:25:36 +00:00
pandora-release b1f4c8f217 Reverted the previous commit. This changes belong into the 5.0 branch.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 14:59:25 +00:00
pandora-release 2df07acbbc Updated to build the 5.0 branch.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 14:54:30 +00:00
slerena 8c59df9e43 2014-02-24 Sancho Lerena <slerena@artica.es>
* pandorafms-agent.spec: Lots of changes to adapt spec to fedora standards.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 01:08:19 +00:00
pandora-release 264ce748d4 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 00:50:30 +00:00
pandora-release 300f0edc3f Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9456 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-23 00:50:29 +00:00
pandora-release 1af0bd14e0 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-22 00:50:29 +00:00
pandora-release bab0aab15e Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-21 00:50:59 +00:00
mdtrooper 795d1b5eef 2014-02-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/fields_manager.php: added the id column in the
	list of fields because it is needed in some api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-20 15:01:23 +00:00
pandora-release 24da3324e7 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-20 00:50:21 +00:00
mdtrooper 499a117319 2014-02-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: added lost id
	of module, because the user needs for example the api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-19 10:29:45 +00:00
juanmanuelr 79f2d4191c 2014-02-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php: Fixed agent tooltip
        for metaconsole networkmap. Now check ACL tags are checked.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-18 11:56:24 +00:00
juanmanuelr 89b294667f 2014-02-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/status_monitor.php: Fixed tag combo,
        now only shows user tags not all.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-17 16:51:15 +00:00
pandora-release 2b6995b697 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-17 00:50:04 +00:00
pandora-release 264a61567c Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-16 00:50:01 +00:00
pandora-release 2196b3ebaf Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9439 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-15 00:49:59 +00:00
juanmanuelr f5e48d06f6 2014-02-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_tags.php: Fixed several bugs with
        ACL propagation and ACL tags.

        * include/functions_graph.php: Implemented ACL tags in
        graph_event_module function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-14 13:20:38 +00:00
pandora-release 0c571c953f Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-14 00:49:55 +00:00
pandora-release 086872c20b Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9434 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-13 00:49:58 +00:00
mdtrooper 347b3023e8 2014-02-12 Miguel de Dios <miguel.dedios@artica.es>
* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: fixed
	the access with passwords or users with non-ascii characters.
	
	* AndroidManifest.xml: update the version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9433 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 15:42:17 +00:00
zarzuelo 9b0807da45 2014-02-12 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Fix order of the event 
	list on mobile console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 12:07:58 +00:00
pandora-release d41d1af0c2 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9430 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 00:52:53 +00:00
zarzuelo 402469f279 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Inverse the order
	of the shown events to show them from newer to older



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 16:59:30 +00:00
zarzuelo ec88e1a399 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/index.php
	mobile/operation/tactical.php
	mobile/operation/home.php: Change the tactical 
	view to load dinamically the graph to be adapted
	to the layout when change device orientation. Fix
	id_user info on title



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 13:03:31 +00:00
zarzuelo 32f32096e0 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/agent.php
	mobile/operation/events.php
	mobile/operation/home.php
	mobile/operation/modules.php
	mobile/operation/alerts.php
	mobile/include/style/main.css: Improve user feedback
	with warnings when no modules or events found, and
	drawing in the header the id user logged (only in home
	screen)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9427 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 10:37:30 +00:00
pandora-release dc55c473ea Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 00:49:56 +00:00
zarzuelo 59a92980d6 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css: Fix ugly close dialog
	button



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 17:08:23 +00:00
zarzuelo aed0179436 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css
	mobile/index.php
	mobile/operation/visualmap.php
	mobile/operation/tactical.php
	mobile/operation/module_graph.php
	mobile/operation/modules.php
	mobile/operation/agent.php: More improvements on
	visual styles in mobile console. Layouts, adaption
	of graphs dinamically to the screen using ajax, etc.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 17:03:08 +00:00
zarzuelo 0f0e513135 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/agents.php
	mobile/operation/events.php
	mobile/include/style/main.css
	mobile/include/ui.class.php: More visual improvements
	on mobile console



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 14:16:04 +00:00