tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,294 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

254 Commits

Author SHA1 Message Date
fbsanchez 66b2102052 Merge remote-tracking branch 'origin/develop' into fix/mr 
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
 2019-03-27 17:09:46 +01:00
fbsanchez 6ebbe54448 minor fix 
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
 2019-03-27 17:06:14 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
alejandro-campos d1bd5fbb1a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2 
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
 2019-03-26 13:06:12 +01:00
fbsanchez 1238f15190 discovery task advanced summary support 
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
 2019-03-25 17:32:18 +01:00
fermin831 2711eb59ea Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql

Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
 2019-03-25 09:20:06 +01:00
fermin831 a0f4163c1d Fix netflow filters on database 
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
 2019-03-20 17:19:56 +01:00
alejandro-campos 791a3ccfc6 Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2 
Former-commit-id: 4ac64c1af6d4487f6a5d1ad1a55400b1879bb730
 2019-03-20 15:48:37 +01:00
alejandro-campos 67d24860d1 Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2 
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
 2019-03-20 15:46:33 +01:00
fermin831 bc9192b98a [Netflow] Merge three reports in one 
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
 2019-03-19 17:33:39 +01:00
manuel 6121c2a32b Added types reports to send email 
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
 2019-03-19 17:16:31 +01:00
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
 2019-03-14 10:49:16 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
 2019-03-13 09:52:00 +01:00
manuel c41c9d10e0 Changed sql files 
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
 2019-03-08 10:01:55 +01:00
manuel d4f5482e99 Added custom field combo values in agent custom field 
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
 2019-03-07 13:37:36 +01:00
alejandro-campos 09897591c3 Add extended events to event reporting tables 
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
 2019-03-05 15:03:05 +01:00
Fermin 287ce78260 Move tnetwork_matrix to mr 26 
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
 2019-02-28 18:18:20 +01:00
Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/25.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/install.php
	pandora_server/util/pandora_db.pl

Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
 2019-02-28 17:13:48 +01:00
Daniel Rodriguez 11106f9b86 Merge branch 'ent-2835-revision-visor-de-logs' into 'develop' 
Added models in tlog_graph_models

See merge request artica/pandorafms!2200

Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
 2019-02-25 19:37:49 +01:00
Alejandro Campos 7f47a4504b Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets' 
# Conflicts:
#   pandora_console/extras/mr/25.sql

Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
 2019-02-25 18:47:28 +01:00
alejandro-campos 4bf7469565 change mr and migrate for table twidget 
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
 2019-02-25 18:42:52 +01:00
alejandro-campos 13cbc78fdd change mr and migrate for table twidget 
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
 2019-02-25 18:41:24 +01:00
Daniel Maya 16f1474691 Added models in tlog_graph_models 
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
 2019-02-25 17:45:37 +01:00
fbsanchez d8ee90c285 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery 
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
 2019-02-25 14:42:48 +01:00
fbsanchez e65d128b25 minor fix db schema 
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
 2019-02-22 12:40:02 +01:00
fbsanchez 42448cf0d8 Updated path for discovery plugins 
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
 2019-02-22 10:41:54 +01:00
fermin831 2e9322515d Move network matrix mr 
Former-commit-id: 18227212ce8961c9dae24939fa364c03e6f7dff8
 2019-02-22 08:45:05 +01:00
fermin831 50155dd10b Added tnetwork_matrix table 
Former-commit-id: c933f5c00d68dd459ca15176dbc1a914f2b7ea32
 2019-02-21 18:44:40 +01:00
fbsanchez e856969a59 Minor fix changed vmware_plugin reference to vmware-plugin 
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
 2019-02-21 15:13:27 +01:00
fbsanchez 8fb84e910a Minor SQL fixes discovery 
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
 2019-02-21 14:29:59 +01:00
fbsanchez 1167cfcafc Minor SQL fixes discovery 
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
 2019-02-21 14:27:09 +01:00
fbsanchez c12ba3b12e Minor MR and sql updates - presets 
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
 2019-02-21 13:58:29 +01:00
fbsanchez 698451ee98 MR25 Discovery 
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
 2019-02-21 13:38:58 +01:00
alejandro-campos acf3c94642 fix bad solved conflict and added changes in bd to migrate and mr 
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
 2019-02-21 13:16:32 +01:00
alejandro-campos a1ba6fdf07 Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado 
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
 2018-12-19 19:15:43 +01:00
fermin831 386eeec7ef Added group_recursion as tevent_rule column 
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
 2018-12-11 16:07:13 +01:00
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +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
alejandro-campos ef90536152 added new field in treport table 2018-11-02 16:31:54 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
manuel.montes 9d7f063ef2 Changed tlayout_template name table to varchar 600 2018-10-24 12:39:58 +02:00
manuel.montes f4add9a7f8 Changed tlayout_template name table to varchar 600 2018-10-24 11:49:18 +02:00
fermin831 3946124cc7 Inaugurate the 22 mr with an alter table in talert_commands 2018-10-22 09:49:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
daniel a7918a1816 delete field flash chart php7 2018-10-19 11:56:49 +02:00
daniel e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
fermin831 aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos 
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2018-10-16 11:35:14 +02:00
fbsanchez 42caddeadd Modified query to match MR requirements 2018-10-10 14:32:43 +02:00
fbsanchez 9b7ae31344 MR change 2018-10-09 16:09:44 +02:00
enriquecd c1af14b90e Change tlayou name table to varchar 600 - #2823 2018-10-05 12:25:15 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8979890964 Added is_favourite to tservice table 2018-09-18 19:05:20 +02:00
fermin831 8196ed21df New mr 21.sql commit 2018-09-18 18:55:53 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2018-09-17 14:44:24 +02:00
danielmaya 50a3e43bd4 Insert apache log model in tlog_graph_models 2018-09-17 12:43:51 +02:00
fermin831 c9af020d91 Remove unwanted git traces on 20.sql 2018-09-17 10:16:12 +02:00
manuel.montes 19645f0550 Modified trecon_task table 2018-09-13 18:17:28 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
danielmaya 816b969741 Added table tlog_graph_models 2018-09-06 16:48:18 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
danielmaya 19f7a5180c Added default value in parent_module_id 2018-09-04 12:48:58 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +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
fermin831 4678c0df53 Fixed copy is_secondary to no_hierarchy in mr 19 2018-08-14 14:16:40 +02:00
fermin831 3daea977b0 Fixed migration rebranding Event commands 2018-08-13 14:10:19 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
fbsanchez f10058428f Added backend functions to create vconsole template 2018-08-01 12:22:13 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
danielmaya c09a91b284 Added server-name in tautoconfig_rules 2018-07-19 08:35:33 +02:00
fermin831 b6347072c5 Migrate sql meta policies (add id_node) 2018-07-18 19:19:57 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
daniel 78f17b9970 fixed error bbdd new field CPS in tpolicy_modules 2018-07-12 09:48:51 +02:00
fbsanchez 23a9cf7842 Minor fixes 2018-07-04 19:59:31 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
fbsanchez f430b8998f Added DB changes to support ProvisioningServer 2 2018-07-03 12:01:37 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00
daniel 17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +02:00
Alejandro Gallardo Escobar faccbec12d Added a new inventory module to the database 2018-06-19 15:55:33 +02:00
Alejandro Gallardo Escobar 04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
danielmaya 6f689f0d0e Added mr 17 and update migrate 2018-06-13 15:39:31 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
enriquecd d76f8f6c76 Fix MR - #2007 2018-04-30 14:59:35 +02:00
enriquecd 6affae9872 drop agents foreign keys in tcluster tables - #2007 2018-04-30 13:06:08 +02:00
fermin831 1f79326e97 [Secondary groups] Added SQL changes to migrate scripts 2018-04-10 09:38:00 +02:00
danielmaya 364daa8579 Added group_id in cron job(mr and migrate) 2018-03-21 16:51:08 +01:00
enriquecd 19b566d4c2 Fix cluster id_os bug - #2090 2018-03-20 15:42:37 +01:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00