Commit Graph

4721 Commits

Author SHA1 Message Date
vgilc 89a27d4ad1 2012-01-02 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php
	  include/functions_graph.php
	  include/functions_netflow.php: changed the way to collect netflow
	parameters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-02 14:36:55 +00:00
vgilc 9f20795bc2 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_item_list.php
	  operation/netflow/nf_view: Changed the report date and interval.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 15:16:07 +00:00
vgilc a0ff9838d8 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php: Cascade delete filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 10:06:56 +00:00
zarzuelo 7046167095 2011-12-29 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	util/pandora_manage.pl: Added two new options to CLI:
	Create group and add agent to policy



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5308 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-29 17:12:13 +00:00
zarzuelo f3f0db3c02 2011-12-29 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor.php: Fixe module editor when the
	data configuration textarea is empty or is a module plugin



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-29 13:20:38 +00:00
Ramon Novoa edd00a8f88 2011-12-26 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Discard inc data when a second value
	  with the same timestamp arrives. Thanks to eXXon.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5305 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-26 11:45:19 +00:00
Ramon Novoa afdc15e750 2011-12-23 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf: Added Netflow server configuration
	  tokens.

	* lib/PandoraFMS/Core.pm: Added the netflow server type.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 10:20:43 +00:00
Ramon Novoa 6491cd2057 2011-12-23 Ramon Novoa <rnovoa@artica.es>
* include/functions_servers.php: Added Netflow server information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 10:04:36 +00:00
vgilc b755a39527 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_manage.php
	  godmode/netflow/nf_edit.php
	  include/functions_netflow.php: changed netflow setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 08:37:36 +00:00
slerena 05358082d8 2011-12-22 Sancho Lerena <slerena@artica.es>
* netflow/nf_report_form.php: Fixed problem in report
        creation due unused fields in the SQL table.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 20:07:05 +00:00
slerena 8857902df4 2011-12-22 Sancho Lerena <slerena@artica.es>
* pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Added migration
        script for 4.1 version. Added netflow tables.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 19:26:17 +00:00
zarzuelo 684d204b39 column of the global modules search
2011-12-22  Sergio Martin <sergio.martin@artica.es>

	* include/functions_graph.php: Fixed Date formats in graph
	axis to avoid loss data
	
	* include/functions_custom_graphs.php: Fixed number of hours of
	a week in the graphs combo




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 18:42:50 +00:00
Ramon Novoa 2fbb104851 2011-12-22 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm: Added netflow server configuration
	  tokens.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5297 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 16:21:09 +00:00
juanmanuelr 7a90d81607 2011-12-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/search_alerts.php: Added semicolon at end of a line.
	
	Fixes: #3453610



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 12:57:35 +00:00
zarzuelo 0e85fedb88 2011-12-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed Date formats in graph
	axis to avoid loss data
	
	* include/functions_custom_graphs.php: Fixed number of hours of
	a week in the graphs combo



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5294 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 10:08:00 +00:00
vgilc bef7daca71 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_report.php: Allow repeat filters
	  in reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 17:14:41 +00:00
vgilc 0936a761a2 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php
	  include/functions_graph.php
	  operation/netflow/nf_view.php: remove some warning. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 16:07:15 +00:00
vgilc 4380251694 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql: added mysql tables for traffic netflow.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 15:28:01 +00:00
vgilc 130694abae 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_netflow.php
	  include/help/en/help_aggregate_by.php: added files to netflow
	traffic monitoring.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5290 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 14:39:50 +00:00
vgilc bb016c2674 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php
	  include/functions_graph.php
	  include/styles/menu.css
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
  	  pandoradb.data.sql: Netflow traffic monitoring.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5289 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 13:09:26 +00:00
vgilc aa8c4cd276 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/menu.php
	  godmode/setup/setup.php
	  include/functions_config.php
	  include/functions_graph.php
	  include/styles/menu.css
 	  operation/menu.php
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
  	  pandoradb.data.sql
	  added files:
	  operation/netflow/nf_reporting.php
	  operation/netflow/nf_view.php
	  godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_manage.php
	  godmode/netflow/nf_option_form.php
	  images/networkmap/so_cisco_new.png: Netflow traffic monitoring.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 13:00:38 +00:00
Ramon Novoa fee8107acf 2011-12-21 Ramon Novoa <rnovoa@artica.es>
* build_vars.sh: Added to repository. Defines environment variables
	  needed to build Pandora FMS.

	* build_src.sh, build_windows_agent.sh,
	  build_deb.sh, pandora_update_version.sh,
	  build_rpm.sh: Source build_vars.sh.
	
	* build_rpm_redhat.sh: Added to repository. Script to build
	  RPM for Red Hat.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 11:38:57 +00:00
jsatoh 9ca552f17b 2011-12-21 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/status_monitor.php: Fixed that long module names
	cannot be seen. (Added title.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5285 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 04:05:18 +00:00
Ramon Novoa df857c0402 2011-12-19 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from 4.0 branch. Empty the broker PID array.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-19 15:45:38 +00:00
Ramon Novoa 72800f281a 2011-12-19 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Wait for broker childs instead of ignoring
	  SIGCHLD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5282 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-19 15:40:22 +00:00
Ramon Novoa 0efa0526f1 2011-12-19 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Ignore SIGCHLD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5278 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-19 11:26:05 +00:00
jsatoh 9ee8f13d68 2011-12-19 Junichi Satoh <junichi@rworks.jp>
* include/languages/ja.po, include/languages/ja.mo: Updated translation
	files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-19 05:26:47 +00:00
Ramon Novoa e3c87c9640 2011-12-16 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Empty modules, plugins and collections before
	  running a broker agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5274 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-16 13:38:22 +00:00
jsatoh 05515f6a1c 2011-12-16 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_ff_threshold.php: Fixed Japanese word
	translations.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5272 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-16 08:41:47 +00:00
jsatoh dee1cef885 2011-12-16 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/module_manager.php: Fixed wrong pagination links
	after updating modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5270 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-16 04:12:29 +00:00
juanmanuelr e63045e0b7 2011-12-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/servers/manage_recontask_form.php: Deleted notice due to 
	a non init variable.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 16:27:09 +00:00
juanmanuelr 56cab1cb60 2011-12-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_forecast.php
	include/functions_reporting.php: Added CSV functionality for 
	projection and prediction reports.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5267 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 15:27:32 +00:00
Aldrioth 3c36dfe98d 2011-12-15 Tomas Palacios <tomas.palacios@artica.es>
* include/languages: Updated template, .po and .mo files.
        Updated template in Launchpad and completed
        Spanish and English translations.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5266 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 14:54:55 +00:00
juanmanuelr 662a678dab 2011-12-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	include/functions_reporting.php: Projection graphs are static now.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5265 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 12:58:48 +00:00
zarzuelo 3f7ce37e86 2011-12-15 Sergio Martin <sergio.martin@artica.es>
* include/functions_forecast.php: Changed the kind of graph 
	for projection to static



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 11:40:40 +00:00
juanmanuelr c6b4659e4b 2011-12-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php
	operation/events/events.php: Added new option for display all 
	events in event viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 11:08:16 +00:00
zarzuelo 2223d7e629 2011-12-15 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/setup.php: Fixed bad use of __() function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 10:18:05 +00:00
Ramon Novoa 4743e2d7aa 2011-12-14 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl, util/pandora_manage.pl: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5261 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 14:13:29 +00:00
Ramon Novoa 6aaad1deb7 2011-12-14 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update CLI and DB maintenance scripts
	  version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 14:12:27 +00:00
juanmanuelr 324aa65402 2011-12-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_events.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/module_manager.php: Some corrections over this 
	views.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 13:52:46 +00:00
Ramon Novoa bc2253420b 2011-12-14 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Do not display a warning if the output of a
	  pre-condition is not numeric.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5258 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 11:43:24 +00:00
Ramon Novoa becd47d5fa 2011-12-14 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_perfcounter.cc,
	  modules/pandora_module_perfcounter.h: Use MinrGW's pdh.h
	  instead of our own definitions.

	* modules/pandora_module.cc: Fixed a bug in pre-conditions that led to an
	  infinite loop.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5257 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 10:38:53 +00:00
jsatoh 8a19c14f5d 2011-12-14 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/configure_alert_compound.php: Improved that actions
	can be removed in step 2. (Added delete button.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 04:11:34 +00:00
Ramon Novoa 78dbed93a6 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  include/config_process.php,
	  install.php,
	  pandora_console.spec: Fixed version strings (were wrong
	  in the previous commit).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5255 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:39:46 +00:00
Ramon Novoa 75116f7eba 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/installer/pandora.mpi,
	  win32/pandora_windows_service.cc,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Fixed version strings (were wrong
	  in the previous commit).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:37:32 +00:00
Ramon Novoa cda5a230d4 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  pandora_server.spec,
	  lib/PandoraFMS/Config.pm: Fixed version strings (were wrong
	  in the previous commit).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5253 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:34:48 +00:00
Ramon Novoa b58d8925ea 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  pandora_server.spec,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5252 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:13:29 +00:00
Ramon Novoa 9aaf58de26 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  include/config_process.php,
	  install.php,
	  pandora_console.spec: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5251 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:12:25 +00:00
Ramon Novoa 181c11c711 2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/pandora_windows_service.cc: Brokers do not need to
	  modify the path.

	* win32/installer/pandora.mpi,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5250 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 14:10:51 +00:00
zarzuelo 8c6069f213 2011-12-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php: Change the get user groups
	to return the groups orderer by name



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5249 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-13 13:11:39 +00:00