Commit Graph

797 Commits

Author SHA1 Message Date
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
#   pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
Luis Calvo 702926cf85 solved merge conflict mr 28.sql
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
Daniel Barbero Martin 79701bba60 Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
Conflicts:
	pandora_console/extras/mr/28.sql


Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
2019-05-14 12:34:40 +02:00
Luis Calvo 860a4cdbf2 Updated pandoradb and migrate
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
2019-05-13 17:57:21 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
Conflicts:
pandora_console/extras/mr/28.sql


Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
Daniel Maya f186cd6201 Added cache_expiration in mr, pandoradb and migrate 2019-05-09 17:37:01 +02:00
Daniel Barbero c5884f1ac9 add changes sql for mr 28
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
2019-05-03 14:09:23 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
2019-05-03 13:46:52 +02:00
manuel 8dc3beaaa9 changed in pandoradb
Former-commit-id: 8a9ccee718b24455fa21c7bfb38cf704c1aa2a0a
2019-04-29 15:07:39 +02:00
manuel 9e0748e718 Added changes in pandoradb.sql
Former-commit-id: 30f4d7bdc303c6ddd2ac6933872faa5f05de58b5
2019-04-24 11:19:27 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
marcos.alconada 1b5786aedb Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
2019-04-12 10:32:07 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
fbsanchez 798a2aad16 WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
fbsanchez 11b2fbc245 WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
marcos.alconada b3c7a9fb4d change
Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
2019-03-29 13:38:36 +01:00
marcos.alconada 7412a7cef0 change
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
2019-03-29 13:37:12 +01:00
marcos.alconada 3f41561628 Added pandoradb.sql without output column in tnetflow_filter
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
2019-03-29 09:23:38 +01:00
Daniel Barbero Martin e3222626dc fixed error in bbdd
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +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
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 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
alejandro-campos 9d29af2af5 add new field for table treport_content
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
2019-03-05 15:15:48 +01:00
fbsanchez 41138fbfbb discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +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
fbsanchez 5816320eff new token. autoconfiguration_enabled. discovery tasks
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
2019-02-18 14:00:38 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
fbsanchez 6e7369d672 Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
Ent 3381 eventos extendidos

See merge request artica/pandorafms!2169

Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
2019-02-14 10:51:04 +01:00
fbsanchez 10a37c313c DB schema update native WMI scan
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
2019-02-13 15:05:21 +01:00
fbsanchez 738443445c minor fix in tevento db script
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
2019-02-11 20:20:23 +01:00
fbsanchez 332c53b098 change behaviour to avoid mr slow updates. Event extended
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
fbsanchez a3a1bbb778 added missed new field extended_info for events
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
2019-02-08 17:30:13 +01:00
fbsanchez 348a10cfe4 Added tevent_extended to db scripts
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
2019-02-08 13:59:48 +01:00
fbsanchez cf5716e569 supervisor added subtype to tmensajes
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
2019-02-07 12:56:48 +01:00
fermin831 95f3c063a5 Added tnotification_source_group_user table
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
2019-01-31 16:27:55 +01:00
fbsanchez dc3d7cc5e2 notifications, first approach db schema
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
2019-01-30 11:56:21 +01:00
fermin831 e0180aeebe Added tnetwork_matrix data structure
Former-commit-id: e42bd0f0a78aab5cc9068270269262cfe7465c7b
2019-01-21 18:49:13 +01:00
fermin831 923c8ee0b8 Revert "Added tnetwork_matrix data structure"
This reverts commit 5328a0e239 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d].


Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a
2019-01-21 18:43:35 +01:00
fermin831 5328a0e239 Added tnetwork_matrix data structure
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
2019-01-21 17:42:41 +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 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 8c49b26a91 php7 version 2018-10-19 11:37:11 +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 299868cfd5 meta_db* added to tmetaconsole_setup 2018-10-10 14:35:09 +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
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
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 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +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 58d092ec03 Delete unwanted column 2018-07-18 19:21:58 +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 ff934e28fa fixed minor error 2018-06-25 15:09:01 +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 04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
danielmaya 7dfd3fcfa1 changes in tdatabase 2018-06-08 13:21:33 +02:00
danielmaya e9b2514b33 Update HA, pandoradb 2018-05-16 15:26:28 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
fermin831 f493583fee [Secondary Groups] Added tagent_secondary_group table and tusuario_perfil.is_secondary field 2018-03-20 13:29:17 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
fermin831 ff2098bb7f [Autoprovision] Removed agents_count column from tprovisioning 2018-03-13 17:29:39 +01:00
fbsanchez ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
fermin831 9b60d94d59 [Autoprovision] Changed hostname by alias in database 2018-03-13 13:39:30 +01:00
fbsanchez 7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
daniel 2605064c02 minor change 2018-03-09 15:33:51 +01:00
fermin831 f0dbb78950 [Autoprovision] Added order and removed type from tprovisioning 2018-03-08 14:22:10 +01:00
daniel 1f3b95f6d1 check problems migration 2018-03-08 12:09:03 +01:00
fermin831 cd74015b95 [Autoprovision] Create tprovisioning and tprovisioining rules tables 2018-03-05 12:39:56 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
vgilc acd1d97a94 Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop'
Db changes for clocks in visual console - #1403

See merge request artica/pandorafms!1150
2018-02-06 11:01:45 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
enriquecd a149b3119e Final Wizard without js, view list, cluster creation - #1748 2018-01-23 15:34:44 +01:00
enriquecd 099cd3bbe8 Wizard first and second step, clusters functions - #1478 2018-01-17 18:56:44 +01:00
enriquecd cce92cc961 Clusters creator main page, fix pandoradb - #1748 2018-01-16 19:24:58 +01:00
enriquecd 749bc20018 Add db changes to pandora_migrate - #1748 2018-01-16 16:02:20 +01:00
enriquecd 5ab43d8106 Add menu section, new db tables and two new module types in pandoradb 2018-01-16 15:41:35 +01:00
Ramon Novoa 934ab8ed91 Add support for periodically updating the status of unknown modules. 2018-01-11 16:00:22 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
enriquecd 9a0438bc36 Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat
Conflicts:
	pandora_console/extras/mr/10.sql
2018-01-02 16:56:48 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd d0d0f8b229 Fix custom graph builder order bar - #1382 2017-12-13 13:08:41 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
enriquecd afcd03658e Fix sending mails for reports an templates reports by cronjobs - #1611 2017-12-05 11:40:41 +01:00
enriquecd 236012bdd8 Db changes for clocks in visual console - #1403 2017-12-01 12:56:32 +01:00
nramon ac06725d99 Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop'
Apply db changes to hide no data field event template reports - #1326

See merge request artica/pandorafms!941
2017-11-30 13:31:48 +01:00
nramon 3390dc7c24 Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop'
Db changes for tgraph_source field order - #1382

See merge request artica/pandorafms!965
2017-11-30 13:12:31 +01:00
enriquecd 688736288c Change treport_content_template fileds order - #1326 2017-11-30 12:46:29 +01:00
enriquecd 097bc39d74 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
2017-11-30 12:28:21 +01:00
vgilc 89c08ede12 Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev

See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
danielmaya 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +01:00
danielmaya ede677f07c Added safe_mode_module in metaconsole 2017-11-16 13:38:59 +01:00
Alejandro Gallardo Escobar ec48829c71 [DB] Added a missing coma 2017-11-16 10:55:01 +01:00
Alejandro Gallardo Escobar f2ad76636c Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
Conflicts resolved:
	pandora_console/extras/mr/9.sql
2017-11-16 09:49:11 +01:00
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
Enrique Camargo 8d42f7fec1 Update pandoradb.sql 2017-11-15 16:08:38 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
vgilc b12d529578 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
1276 cascade protection a nivel de módulo dev

See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
enriquecd 96b3ebc67a Change pandoradb treport_content_template and treport_content fields - #654 2017-10-30 17:27:37 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
This reverts merge request !871
2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
nramon 49a1f7d872 Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop'
Added time autorefresh

See merge request artica/pandorafms!945
2017-10-30 10:58:07 +01:00
Arturo Gonzalez 7bd6f5e05d Added code to snmp filters form 2017-10-25 15:45:19 +02:00
enriquecd 7e6adb5d40 Db changes for tgraph_source field order - #1382 2017-10-24 19:02:16 +02:00
enriquecd ea51df8b20 Add show on top option to all visual console elements - #1313 2017-10-23 18:54:57 +02:00
Daniel Maya f6e012e0fa Added time autorefresh 2017-10-23 13:17:06 +02:00
Ramon Novoa cb7390371c Replace the index data_index1 on tagente_datos with a composite index.
Agent data is always searched by agent id and utimestamp. A composite
index makes queries on tagente_datos a lot faster. pandora_db.pl can
still use the existing index on utimestamp. Ref pandora_enterprise#1485.
2017-10-23 09:21:57 +02:00
enriquecd c9ff9e77a3 Apply db changes to hide no data field event template reports - #1326 2017-10-18 18:22:00 +02:00
Alejandro Gallardo Escobar b641323eed [artica/pandora_enterprise#1462] Added the DB changes needed by the dashboard items slideshow feature 2017-10-18 17:29:06 +02:00
Daniel Maya 74308ae42b Created Safe operation mode 2017-10-17 16:58:05 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
enriquecd 8ce6920e44 DB changes for visual console group elements - #1245 2017-09-07 12:11:13 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
fbsanchez 4d1be92150 DB changes (text => mediumtext) ONLY NEW INSTALLATIONS 2017-08-31 19:14:31 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 3291526195 Added new fields to server table 2017-08-23 12:41:36 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop'
Added some fixes to reset pass feature

See merge request !677
2017-07-28 10:23:31 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts:
#   pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop'
Change tserver_export_data to varchar 600 - #1015

See merge request !600
2017-07-17 15:41:45 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
enriquecd 7e383262bb Change tserver_export_data to varchar 600 - #1015 2017-06-20 13:56:20 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop'
539 encrypt agent custom fields in pandora console dev

See merge request !520
2017-06-14 11:42:51 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00
vgilc 62f96b16a0 Merge branch '822-wizard-SNMP-wrong-postprocess-dev' into 'develop'
Changed default value to post process in tpolicy modules

See merge request !457
2017-05-31 17:28:40 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 1e0af6ec26 Added field to db 2017-05-29 11:58:42 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
vgilc b21e09deef Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop'
635 reset or recover password in pandora node and meta dev

See merge request !389
2017-05-23 10:14:43 +02:00
Arturo Gonzalez 1ae79eba01 Changed default value to post process in tpolicy modules 2017-05-10 15:19:03 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez a6209c15ca Added event filter field to user in creation and edition 2017-04-05 17:44:24 +02:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
daniel 631a4d0777 fixed minor error in table metaconsole_agent 2017-03-06 16:19:03 +01:00
daniel 8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
daniel c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
Arturo Gonzalez bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Arturo Gonzalez 7452fe5dda Added missing value in tagente. 2017-02-17 11:06:21 +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 46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +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 6447189606 Improve visual console - #110 2017-01-16 13:31:56 +01:00
daniel 4e1dcc5aba add new field in tgraph 2016-12-27 13:35:18 +01:00
fbsanchez 881261c518 Revert "Fixed #4304 pandoradb.sql"
This reverts commit 41333772ce.
2016-12-23 12:58:06 +01:00
fbsanchez 41333772ce Fixed #4304 pandoradb.sql 2016-12-23 12:09:28 +01:00
Ramon Novoa 01217fe3b2 Add support to link modules via XML data files. 2016-12-14 12:59:31 +01:00
Arturo Gonzalez 751b73adcb Added session coocki to users. Ticket GitLab #120 2016-11-23 10:13:02 +01:00
enriquecd 534b7eb05a Visual console improvements - Update database - #110 2016-11-16 18:55:36 +01:00
enriquecd 9523557145 Add remote agent filter in manage agent, add remote field in database #4121 2016-11-02 16:58:53 +01:00
Arturo Gonzalez e974516b77 New value to transactional agents in db table 2016-10-27 12:50:50 +02:00
Arturo Gonzalez b090047640 New networkmaps (Added new data to relations db) 2016-10-19 10:22:09 +02:00
Arturo Gonzalez f52bf2f2da Data precision... (Adapt db to new precision) 2016-10-18 12:27:53 +02:00
Arturo Gonzalez fc0d83cc46 Added rows in db to new networkmaps 2016-10-17 13:14:51 +02:00
daniel d5d1727fe7 add new field for modules 2016-10-14 10:16:21 +02:00
Daniel Maya 21dd508e53 Changed name by alias. Ticket #74. 2016-09-22 10:27:35 +02:00
Daniel Maya 392779d703 Changes in pandoradb. Ticket #3930. 2016-09-01 10:37:03 +02:00
Daniel Maya b6181de25c Fixed foreign key. Ticket #3930. 2016-08-31 17:35:33 +02:00
Daniel Maya 58f0ccae77 Added default event filter. Ticket #3930. 2016-08-31 11:13:37 +02:00
Daniel Maya e32c606fb0 Added new date filters. Ticket #3946. 2016-08-19 11:23:09 +02:00
Ramon Novoa 798fa8e952 Merge branch 'handle-unknown-properly' of https://github.com/uchida/pandorafms into uchida-handle-unknown-properly 2016-07-28 12:50:58 +02:00
Daniel Maya e9e5520ea9 Exclude disabled agents scheduled stops. Ticket #3878. 2016-07-04 15:46:56 +02:00
mdtrooper 04c6bd9c88 Merge branch 'develop' into feature/new_networkmap 2016-05-13 11:39:18 +02:00
Ramon Novoa 567d45cdc4 Added new columns to tagente_modulo for dynamic critical interval
calculation.
2016-05-12 13:37:18 +02:00
mdtrooper 30f806f41c Merge branch 'develop' into feature/new_networkmap
Conflicts:
	pandora_console/include/functions_modules.php
2016-04-25 15:25:16 +02:00
mdtrooper 9347892a02 Fixed the positions of new networkmap in the sql of installation. 2016-04-22 12:24:32 +02:00
Akihiro Uchida 1da312b8a5 use last_known_status/known_status column to handle unknown properly 2016-04-22 16:36:26 +09:00
Junichi Satoh 582b4abb35 Changed column type of 'tagente_estado.status_changes' to unsigned.
(Fixed ff_threshold evaluation.)

Because of column type difference bettween 'tagente_estado.status_changes'
and 'tagente_modulo.min_ff_event', it didn't work correctly with over 127.
2016-04-01 12:46:47 +09:00
mdtrooper 16812b55b5 Merge branch 'develop' into feature/new_networkmap 2016-03-29 13:46:59 +02:00
fermin831 f397b657f1 Added new server_keepalive column to have individual keepalive TICKETS #3273 2016-03-15 16:02:27 +01:00
mdtrooper aefff3041f Merge branch 'develop' into feature/new_networkmap
Conflicts:
	pandora_console/include/constants.php
2016-03-09 11:15:17 +01: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
mdtrooper 9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54:08 +01:00
mdtrooper 8d54a6762a Added the 'automatic custom graphs' in the template reports in metaconsole. 2016-02-02 14:55:03 +01:00
mdtrooper 8602d9eb4b Working in the new networkmaps. 2016-02-01 16:02:43 +01:00
mdtrooper d74a22aecf Added two field lost in the table tmap 2016-02-01 15:10:30 +01:00
mdtrooper 751ec58fb7 Added the new tables. 2016-02-01 09:58:35 +01:00
m-lopez-f 063c89008a Add new columns for a new features. 2015-10-08 10:37:13 +02:00
Ramon Novoa 9863da5aa5 Added columns for future 6.x features and fixed an error. 2015-10-08 10:21:43 +02:00
Arturo Gonzalez Diaz 2d36697db8 Fixed module relationships. Ticket#2766 2015-10-07 14:01:49 +02:00
m-lopez-f 7d6f03c3c8 Fixed problems with save event filters and dont save agent and module. Tiquet: #2794 2015-09-30 09:26:19 +02:00
Ramon Novoa dde702b2ee Added columns for future 6.x features. 2015-09-22 15:32:35 +02:00
Alejandro Gallardo Escobar 58891bf50a Moved a table to fix an error and added the change to the migrate and the oracle and postgres files 2015-07-02 12:05:02 +02:00
Ramon Novoa 91ffd584b9 Added back a column that was accidentally removed. 2015-06-30 16:34:07 +02:00
Alejandro Gallardo Escobar 390db6c06c Lot of fixes for oracle databases 2015-06-18 19:17:59 +02:00
Alejandro Gallardo Escobar 7c96bb7ce0 Added some missing columns 2015-04-30 20:12:05 +02:00