7412a7cef0
change
...
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
2019-03-29 13:37:12 +01:00
3f41561628
Added pandoradb.sql without output column in tnetflow_filter
...
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
2019-03-29 09:23:38 +01:00
e3222626dc
fixed error in bbdd
...
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
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
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
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
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
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
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
9d29af2af5
add new field for table treport_content
...
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
2019-03-05 15:15:48 +01:00
41138fbfbb
discovery tasks assimilate cron
...
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
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
5816320eff
new token. autoconfiguration_enabled. discovery tasks
...
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
2019-02-18 14:00:38 +01:00
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
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
10a37c313c
DB schema update native WMI scan
...
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
2019-02-13 15:05:21 +01:00
738443445c
minor fix in tevento db script
...
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
2019-02-11 20:20:23 +01:00
332c53b098
change behaviour to avoid mr slow updates. Event extended
...
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
a3a1bbb778
added missed new field extended_info for events
...
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
2019-02-08 17:30:13 +01:00
348a10cfe4
Added tevent_extended to db scripts
...
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
2019-02-08 13:59:48 +01:00
cf5716e569
supervisor added subtype to tmensajes
...
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
2019-02-07 12:56:48 +01:00
95f3c063a5
Added tnotification_source_group_user table
...
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
2019-01-31 16:27:55 +01:00
dc3d7cc5e2
notifications, first approach db schema
...
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
2019-01-30 11:56:21 +01:00
e0180aeebe
Added tnetwork_matrix data structure
...
Former-commit-id: e42bd0f0a78aab5cc9068270269262cfe7465c7b
2019-01-21 18:49:13 +01:00
923c8ee0b8
Revert "Added tnetwork_matrix data structure"
...
This reverts commit 5328a0e239
2019-01-21 18:43:35 +01:00
5328a0e239
Added tnetwork_matrix data structure
...
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
2019-01-21 17:42:41 +01:00
a1ba6fdf07
Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
...
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
2018-12-19 19:15:43 +01:00
386eeec7ef
Added group_recursion as tevent_rule column
...
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
01a9621eb5
Custom fields view add new filters
2018-12-03 11:36:34 +01:00
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
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
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
ef90536152
added new field in treport table
2018-11-02 16:31:54 +01:00
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
f4add9a7f8
Changed tlayout_template name table to varchar 600
2018-10-24 11:49:18 +02:00
3946124cc7
Inaugurate the 22 mr with an alter table in talert_commands
2018-10-22 09:49:06 +02:00
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
8c49b26a91
php7 version
2018-10-19 11:37:11 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
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
299868cfd5
meta_db* added to tmetaconsole_setup
2018-10-10 14:35:09 +02:00
c1af14b90e
Change tlayou name table to varchar 600 - #2823
2018-10-05 12:25:15 +02:00
896ba6051b
fixed issue with string data in visual map
2018-09-26 11:00:44 +02:00
8979890964
Added is_favourite to tservice table
2018-09-18 19:05:20 +02:00
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
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
19645f0550
Modified trecon_task table
2018-09-13 18:17:28 +02:00
e9752e790e
Added columns for a policy feature
2018-09-13 16:57:13 +02:00
a2b3d6e07f
Deleted reports from cron
2018-09-12 13:43:23 +02:00
40ff7b9042
Now is possible to link visual consoles from different nodes to the visual console elements
2018-09-10 11:25:44 +02:00
816b969741
Added table tlog_graph_models
2018-09-06 16:48:18 +02:00
36247d391f
Merge branch 'develop' into ent-2588-service-like-visual-console-status
2018-09-04 17:25:23 +02:00
22696a0fc6
Added new modes to calculate the status of the linked visual maps
2018-09-04 17:23:42 +02:00
19f7a5180c
Added default value in parent_module_id
2018-09-04 12:48:58 +02:00
5b30aa5560
Added source, comment and id_extra in event filter
2018-08-31 16:25:12 +02:00
5f4d76f3a7
fixed recursion option in custom report's item editor
2018-08-28 16:38:32 +02:00
7da4557abc
Added the feature of the new map items (groups) and fixed more bugs
2018-08-17 11:07:42 +02:00
188733962f
Changed is_secondary by no_hierarchy on tusuario_perfil table
2018-08-07 08:31:40 +02:00
f10058428f
Added backend functions to create vconsole template
2018-08-01 12:22:13 +02:00
cb77a299bb
add templates console visual
2018-08-01 09:58:48 +02:00
079b2437b6
Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes
2018-07-23 18:06:02 +02:00
b922066a72
Add items to the view events
2018-07-19 18:04:50 +02:00
c09a91b284
Added server-name in tautoconfig_rules
2018-07-19 08:35:33 +02:00
58d092ec03
Delete unwanted column
2018-07-18 19:21:58 +02:00
b6347072c5
Migrate sql meta policies (add id_node)
2018-07-18 19:19:57 +02:00
86c21aea5d
merge develop
2018-07-12 13:37:46 +02:00
78f17b9970
fixed error bbdd new field CPS in tpolicy_modules
2018-07-12 09:48:51 +02:00
23a9cf7842
Minor fixes
2018-07-04 19:59:31 +02:00
c800061bc2
Autoconfiguration v1
2018-07-04 18:39:06 +02:00
f430b8998f
Added DB changes to support ProvisioningServer 2
2018-07-03 12:01:37 +02:00
1b1bc4aa2e
add new column evaluate_sla into table tservice
2018-06-28 13:34:55 +02:00
ff934e28fa
fixed minor error
2018-06-25 15:09:01 +02:00
17b726d7a0
changes bd for mr, schema and migrate and update tocken mr
2018-06-21 14:15:27 +02:00
04aad98871
Added the database changes for the custom fields of the remote inventory modules
2018-06-19 13:49:36 +02:00
7dfd3fcfa1
changes in tdatabase
2018-06-08 13:21:33 +02:00
e9b2514b33
Update HA, pandoradb
2018-05-16 15:26:28 +02:00
d92dc1a2b0
Change API and flags in cluster manager - #2007
2018-04-27 11:06:29 +02:00
e2d61d5794
[Secondary groups] Added update cache on server
2018-04-03 15:36:33 +02:00
f493583fee
[Secondary Groups] Added tagent_secondary_group table and tusuario_perfil.is_secondary field
2018-03-20 13:29:17 +01:00
42107017bf
Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes
2018-03-13 18:40:51 +01:00
ff2098bb7f
[Autoprovision] Removed agents_count column from tprovisioning
2018-03-13 17:29:39 +01:00
ed282c6a9b
1923 Added required methods for migrationserver
2018-03-13 16:35:13 +01:00
9b60d94d59
[Autoprovision] Changed hostname by alias in database
2018-03-13 13:39:30 +01:00
7d58734ef2
MigrationServer aux util
2018-03-12 19:39:28 +01:00
2605064c02
minor change
2018-03-09 15:33:51 +01:00
f0dbb78950
[Autoprovision] Added order and removed type from tprovisioning
2018-03-08 14:22:10 +01:00
1f3b95f6d1
check problems migration
2018-03-08 12:09:03 +01:00
cd74015b95
[Autoprovision] Create tprovisioning and tprovisioining rules tables
2018-03-05 12:39:56 +01:00
ae471bb9f2
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
2018-02-07 13:52:44 +01:00
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
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
a149b3119e
Final Wizard without js, view list, cluster creation - #1748
2018-01-23 15:34:44 +01:00
099cd3bbe8
Wizard first and second step, clusters functions - #1478
2018-01-17 18:56:44 +01:00
cce92cc961
Clusters creator main page, fix pandoradb - #1748
2018-01-16 19:24:58 +01:00
749bc20018
Add db changes to pandora_migrate - #1748
2018-01-16 16:02:20 +01:00
5ab43d8106
Add menu section, new db tables and two new module types in pandoradb
2018-01-16 15:41:35 +01:00
934ab8ed91
Add support for periodically updating the status of unknown modules.
2018-01-11 16:00:22 +01:00
e2ee8a555d
add fullscale container graph
2018-01-03 15:53:49 +01:00
ead1161e0b
add fullscale combined and custom graph
2018-01-03 12:13:00 +01:00
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
0b5678fba6
add new funtionality view favourite console visual
2017-12-28 15:13:06 +01:00
d0d0f8b229
Fix custom graph builder order bar - #1382
2017-12-13 13:08:41 +01:00
61b33221bf
Added check modules and series
2017-12-13 10:37:23 +01:00
afcd03658e
Fix sending mails for reports an templates reports by cronjobs - #1611
2017-12-05 11:40:41 +01:00
236012bdd8
Db changes for clocks in visual console - #1403
2017-12-01 12:56:32 +01:00
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
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
688736288c
Change treport_content_template fileds order - #1326
2017-11-30 12:46:29 +01:00
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
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
897d7bf258
Added type graph selection in container graph
2017-11-23 18:01:32 +01:00
ede677f07c
Added safe_mode_module in metaconsole
2017-11-16 13:38:59 +01:00
ec48829c71
[DB] Added a missing coma
2017-11-16 10:55:01 +01:00
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
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
8d42f7fec1
Update pandoradb.sql
2017-11-15 16:08:38 +01:00
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
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
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
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
fac066debd
Added groups acl in all visual console elements
2017-11-08 15:01:44 +01:00
c9d1fab036
Added new system of calculate status if user set a parent weight
2017-11-08 12:49:03 +01:00
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
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
96b3ebc67a
Change pandoradb treport_content_template and treport_content fields - #654
2017-10-30 17:27:37 +01:00
f608c686b8
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-30 17:23:59 +01:00
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
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
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
7bd6f5e05d
Added code to snmp filters form
2017-10-25 15:45:19 +02:00
7e6adb5d40
Db changes for tgraph_source field order - #1382
2017-10-24 19:02:16 +02:00
ea51df8b20
Add show on top option to all visual console elements - #1313
2017-10-23 18:54:57 +02:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
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
c9ff9e77a3
Apply db changes to hide no data field event template reports - #1326
2017-10-18 18:22:00 +02:00
b641323eed
[ artica/pandora_enterprise#1462 ] Added the DB changes needed by the dashboard items slideshow feature
2017-10-18 17:29:06 +02:00
74308ae42b
Created Safe operation mode
2017-10-17 16:58:05 +02:00
788265713e
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-02 18:23:26 +02:00
7a8135f36d
fixed error merge dani
2017-09-25 09:45:58 +02:00
8ce6920e44
DB changes for visual console group elements - #1245
2017-09-07 12:11:13 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
4d1be92150
DB changes (text => mediumtext) ONLY NEW INSTALLATIONS
2017-08-31 19:14:31 +02:00
f021bedb5c
Added proxy servers to events response form
2017-08-24 12:34:06 +02:00
3291526195
Added new fields to server table
2017-08-23 12:41:36 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
3ef3679f10
Fixed issue with cascade_protection_module
2017-08-08 10:38:30 +02:00
590bfbfe84
mr-5 add queries
2017-08-07 13:57:04 +02:00
ea06ba213b
Added registration method to reset pass
2017-08-03 13:05:57 +02:00
marcos.alconada
Daniel Barbero Martin
fermin831
fbsanchez
manuel
alejandro-campos
vgilc
enriquecd
danielmaya
manuel.montes
Alejandro Gallardo Escobar
Ramon Novoa
daniel
Alejandro Gallardo Escobar
Enrique Camargo
Arturo Gonzalez